Modified version of NetServices. Fixes an issue where connections failed should the HTTP response status line be received in a packet on its own prior to any further headers. Changes are made to the HTTPClient.cpp file's readHeaders method.

Committer:
andrewbonney
Date:
Fri Apr 08 14:39:41 2011 +0000
Revision:
0:ec559500a63f

        

Who changed what in which revision?

UserRevisionLine numberNew contents of line
andrewbonney 0:ec559500a63f 1
andrewbonney 0:ec559500a63f 2 /*
andrewbonney 0:ec559500a63f 3 Copyright (c) 2010 Donatien Garnier (donatiengar [at] gmail [dot] com)
andrewbonney 0:ec559500a63f 4
andrewbonney 0:ec559500a63f 5 Permission is hereby granted, free of charge, to any person obtaining a copy
andrewbonney 0:ec559500a63f 6 of this software and associated documentation files (the "Software"), to deal
andrewbonney 0:ec559500a63f 7 in the Software without restriction, including without limitation the rights
andrewbonney 0:ec559500a63f 8 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
andrewbonney 0:ec559500a63f 9 copies of the Software, and to permit persons to whom the Software is
andrewbonney 0:ec559500a63f 10 furnished to do so, subject to the following conditions:
andrewbonney 0:ec559500a63f 11
andrewbonney 0:ec559500a63f 12 The above copyright notice and this permission notice shall be included in
andrewbonney 0:ec559500a63f 13 all copies or substantial portions of the Software.
andrewbonney 0:ec559500a63f 14
andrewbonney 0:ec559500a63f 15 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
andrewbonney 0:ec559500a63f 16 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
andrewbonney 0:ec559500a63f 17 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
andrewbonney 0:ec559500a63f 18 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
andrewbonney 0:ec559500a63f 19 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
andrewbonney 0:ec559500a63f 20 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
andrewbonney 0:ec559500a63f 21 THE SOFTWARE.
andrewbonney 0:ec559500a63f 22 */
andrewbonney 0:ec559500a63f 23
andrewbonney 0:ec559500a63f 24 /**
andrewbonney 0:ec559500a63f 25 HTTP Request Handler header file.
andrewbonney 0:ec559500a63f 26 */
andrewbonney 0:ec559500a63f 27
andrewbonney 0:ec559500a63f 28 #ifndef HTTP_REQUEST_HANDLER_H
andrewbonney 0:ec559500a63f 29 #define HTTP_REQUEST_HANDLER_H
andrewbonney 0:ec559500a63f 30
andrewbonney 0:ec559500a63f 31 #include "api/TCPSocket.h"
andrewbonney 0:ec559500a63f 32 //#include "HTTPServer.h"
andrewbonney 0:ec559500a63f 33
andrewbonney 0:ec559500a63f 34 #include "mbed.h"
andrewbonney 0:ec559500a63f 35 #include "core/netservice.h"
andrewbonney 0:ec559500a63f 36
andrewbonney 0:ec559500a63f 37 #include <string>
andrewbonney 0:ec559500a63f 38 using std::string;
andrewbonney 0:ec559500a63f 39
andrewbonney 0:ec559500a63f 40 #include <map>
andrewbonney 0:ec559500a63f 41 using std::map;
andrewbonney 0:ec559500a63f 42
andrewbonney 0:ec559500a63f 43 ///HTTP Server's generic request handler
andrewbonney 0:ec559500a63f 44 class HTTPRequestHandler : public NetService
andrewbonney 0:ec559500a63f 45 {
andrewbonney 0:ec559500a63f 46 public:
andrewbonney 0:ec559500a63f 47 ///Instantiated by the HTTP Server
andrewbonney 0:ec559500a63f 48 HTTPRequestHandler(const char* rootPath, const char* path, TCPSocket* pTCPSocket);
andrewbonney 0:ec559500a63f 49 virtual ~HTTPRequestHandler();
andrewbonney 0:ec559500a63f 50
andrewbonney 0:ec559500a63f 51 //protected:
andrewbonney 0:ec559500a63f 52 virtual void doGet() = 0;
andrewbonney 0:ec559500a63f 53 virtual void doPost() = 0;
andrewbonney 0:ec559500a63f 54 virtual void doHead() = 0;
andrewbonney 0:ec559500a63f 55
andrewbonney 0:ec559500a63f 56 virtual void onReadable() = 0; //Data has been read
andrewbonney 0:ec559500a63f 57 virtual void onWriteable() = 0; //Data has been written & buf is free
andrewbonney 0:ec559500a63f 58 virtual void onTimeout(); //Connection has timed out
andrewbonney 0:ec559500a63f 59 virtual void onClose() = 0; //Connection is closing
andrewbonney 0:ec559500a63f 60
andrewbonney 0:ec559500a63f 61 virtual void close(); //Close socket and destroy data
andrewbonney 0:ec559500a63f 62
andrewbonney 0:ec559500a63f 63 protected:
andrewbonney 0:ec559500a63f 64 map<string, string>& reqHeaders() /*const*/;
andrewbonney 0:ec559500a63f 65 string& path() /*const*/;
andrewbonney 0:ec559500a63f 66 int dataLen() const;
andrewbonney 0:ec559500a63f 67 int readData(char* buf, int len);
andrewbonney 0:ec559500a63f 68 string& rootPath() /*const*/;
andrewbonney 0:ec559500a63f 69
andrewbonney 0:ec559500a63f 70 void setErrCode(int errc);
andrewbonney 0:ec559500a63f 71 void setContentLen(int len);
andrewbonney 0:ec559500a63f 72
andrewbonney 0:ec559500a63f 73 map<string, string>& respHeaders();
andrewbonney 0:ec559500a63f 74 int writeData(const char* buf, int len);
andrewbonney 0:ec559500a63f 75
andrewbonney 0:ec559500a63f 76 void setTimeout(int ms);
andrewbonney 0:ec559500a63f 77 void resetTimeout();
andrewbonney 0:ec559500a63f 78
andrewbonney 0:ec559500a63f 79 private:
andrewbonney 0:ec559500a63f 80 void readHeaders(); //Called at instanciation
andrewbonney 0:ec559500a63f 81 void writeHeaders(); //Called at the first writeData call
andrewbonney 0:ec559500a63f 82 void onTCPSocketEvent(TCPSocketEvent e);
andrewbonney 0:ec559500a63f 83
andrewbonney 0:ec559500a63f 84 TCPSocket* m_pTCPSocket;
andrewbonney 0:ec559500a63f 85 map<string, string> m_reqHeaders;
andrewbonney 0:ec559500a63f 86 map<string, string> m_respHeaders;
andrewbonney 0:ec559500a63f 87 string m_rootPath;
andrewbonney 0:ec559500a63f 88 string m_path;
andrewbonney 0:ec559500a63f 89 int m_errc; //Response code
andrewbonney 0:ec559500a63f 90
andrewbonney 0:ec559500a63f 91 Timeout m_watchdog;
andrewbonney 0:ec559500a63f 92 int m_timeout;
andrewbonney 0:ec559500a63f 93
andrewbonney 0:ec559500a63f 94 bool m_closed;
andrewbonney 0:ec559500a63f 95 bool m_headersSent;
andrewbonney 0:ec559500a63f 96
andrewbonney 0:ec559500a63f 97 int readLine(char* str, int maxLen);
andrewbonney 0:ec559500a63f 98
andrewbonney 0:ec559500a63f 99 };
andrewbonney 0:ec559500a63f 100
andrewbonney 0:ec559500a63f 101 #endif