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 /** \file
andrewbonney 0:ec559500a63f 25 HTTP Server header file
andrewbonney 0:ec559500a63f 26 */
andrewbonney 0:ec559500a63f 27
andrewbonney 0:ec559500a63f 28 #ifndef HTTP_SERVER_H
andrewbonney 0:ec559500a63f 29 #define HTTP_SERVER_H
andrewbonney 0:ec559500a63f 30
andrewbonney 0:ec559500a63f 31 class HTTPRequestHandler;
andrewbonney 0:ec559500a63f 32 class HTTPRequestDispatcher;
andrewbonney 0:ec559500a63f 33
andrewbonney 0:ec559500a63f 34 #include "core/net.h"
andrewbonney 0:ec559500a63f 35 #include "HTTPRequestHandler.h"
andrewbonney 0:ec559500a63f 36 #include "HTTPRequestDispatcher.h"
andrewbonney 0:ec559500a63f 37
andrewbonney 0:ec559500a63f 38 #include <string>
andrewbonney 0:ec559500a63f 39 using std::string;
andrewbonney 0:ec559500a63f 40
andrewbonney 0:ec559500a63f 41 #include <map>
andrewbonney 0:ec559500a63f 42 using std::map;
andrewbonney 0:ec559500a63f 43
andrewbonney 0:ec559500a63f 44 ///A simple HTTP server implementation
andrewbonney 0:ec559500a63f 45 /**
andrewbonney 0:ec559500a63f 46 The HTTPServer is composed of:
andrewbonney 0:ec559500a63f 47 - The actual server (HTTPServer)
andrewbonney 0:ec559500a63f 48 - A request dispatcher, instanciated on each request (HTTPRequestDispatcher)
andrewbonney 0:ec559500a63f 49 - Request handlers instanciated by the dispatcher(deriving from HTTPRequestHandler)
andrewbonney 0:ec559500a63f 50 */
andrewbonney 0:ec559500a63f 51 class HTTPServer
andrewbonney 0:ec559500a63f 52 {
andrewbonney 0:ec559500a63f 53 public:
andrewbonney 0:ec559500a63f 54 ///Instantiates the HTTP Server
andrewbonney 0:ec559500a63f 55 HTTPServer();
andrewbonney 0:ec559500a63f 56 ~HTTPServer();
andrewbonney 0:ec559500a63f 57
andrewbonney 0:ec559500a63f 58 struct handlersComp //Used to order handlers in the right way
andrewbonney 0:ec559500a63f 59 {
andrewbonney 0:ec559500a63f 60 bool operator() (const string& handler1, const string& handler2) const
andrewbonney 0:ec559500a63f 61 {
andrewbonney 0:ec559500a63f 62 //The first handler is longer than the second one
andrewbonney 0:ec559500a63f 63 if (handler1.length() > handler2.length())
andrewbonney 0:ec559500a63f 64 return true; //Returns true if handler1 is to appear before handler2
andrewbonney 0:ec559500a63f 65 else if (handler1.length() < handler2.length())
andrewbonney 0:ec559500a63f 66 return false;
andrewbonney 0:ec559500a63f 67 else //To avoid the == case, sort now by address
andrewbonney 0:ec559500a63f 68 return ((&handler1)>(&handler2));
andrewbonney 0:ec559500a63f 69 }
andrewbonney 0:ec559500a63f 70 };
andrewbonney 0:ec559500a63f 71
andrewbonney 0:ec559500a63f 72 ///Adds a handler
andrewbonney 0:ec559500a63f 73 /**
andrewbonney 0:ec559500a63f 74 Appends a handler to the handlers list
andrewbonney 0:ec559500a63f 75 @param T : class which will be instanciated to serve these requests
andrewbonney 0:ec559500a63f 76 @param path : requests starting with this path will be served using this handler
andrewbonney 0:ec559500a63f 77 */
andrewbonney 0:ec559500a63f 78 template<typename T>
andrewbonney 0:ec559500a63f 79 void addHandler(const char* path) //Template decl in header
andrewbonney 0:ec559500a63f 80 { m_lpHandlers[path] = &T::inst; }
andrewbonney 0:ec559500a63f 81
andrewbonney 0:ec559500a63f 82 ///Starts listening
andrewbonney 0:ec559500a63f 83 /**
andrewbonney 0:ec559500a63f 84 Binds server to a specific port and starts listening
andrewbonney 0:ec559500a63f 85 @param port : port on which to listen for incoming connections
andrewbonney 0:ec559500a63f 86 */
andrewbonney 0:ec559500a63f 87 void bind(int port = 80);
andrewbonney 0:ec559500a63f 88
andrewbonney 0:ec559500a63f 89 private:
andrewbonney 0:ec559500a63f 90 friend class HTTPRequestDispatcher;
andrewbonney 0:ec559500a63f 91
andrewbonney 0:ec559500a63f 92 void onTCPSocketEvent(TCPSocketEvent e);
andrewbonney 0:ec559500a63f 93
andrewbonney 0:ec559500a63f 94 TCPSocket* m_pTCPSocket;
andrewbonney 0:ec559500a63f 95 map< string, HTTPRequestHandler*(*)(const char*, const char*, TCPSocket*), handlersComp > m_lpHandlers;
andrewbonney 0:ec559500a63f 96
andrewbonney 0:ec559500a63f 97 };
andrewbonney 0:ec559500a63f 98
andrewbonney 0:ec559500a63f 99 //Including handlers here for more convenience
andrewbonney 0:ec559500a63f 100 #include "impl/RPCHandler.h"
andrewbonney 0:ec559500a63f 101 #include "impl/FSHandler.h"
andrewbonney 0:ec559500a63f 102 #include "impl/SimpleHandler.h"
andrewbonney 0:ec559500a63f 103
andrewbonney 0:ec559500a63f 104 #endif