Andrew Bonney
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.
services/http/server/HTTPServer.cpp@0:ec559500a63f, 2011-04-08 (annotated)
- Committer:
- andrewbonney
- Date:
- Fri Apr 08 14:39:41 2011 +0000
- Revision:
- 0:ec559500a63f
Who changed what in which revision?
| User | Revision | Line number | New 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 | #include "HTTPServer.h" |
| andrewbonney | 0:ec559500a63f | 25 | |
| andrewbonney | 0:ec559500a63f | 26 | //#define __DEBUG |
| andrewbonney | 0:ec559500a63f | 27 | #include "dbg/dbg.h" |
| andrewbonney | 0:ec559500a63f | 28 | |
| andrewbonney | 0:ec559500a63f | 29 | HTTPServer::HTTPServer() |
| andrewbonney | 0:ec559500a63f | 30 | { |
| andrewbonney | 0:ec559500a63f | 31 | m_pTCPSocket = new TCPSocket; |
| andrewbonney | 0:ec559500a63f | 32 | m_pTCPSocket->setOnEvent(this, &HTTPServer::onTCPSocketEvent); |
| andrewbonney | 0:ec559500a63f | 33 | } |
| andrewbonney | 0:ec559500a63f | 34 | |
| andrewbonney | 0:ec559500a63f | 35 | HTTPServer::~HTTPServer() |
| andrewbonney | 0:ec559500a63f | 36 | { |
| andrewbonney | 0:ec559500a63f | 37 | delete m_pTCPSocket; |
| andrewbonney | 0:ec559500a63f | 38 | } |
| andrewbonney | 0:ec559500a63f | 39 | |
| andrewbonney | 0:ec559500a63f | 40 | void HTTPServer::bind(int port /*= 80*/) |
| andrewbonney | 0:ec559500a63f | 41 | { |
| andrewbonney | 0:ec559500a63f | 42 | Host h(IpAddr(127,0,0,1), port, "localhost"); |
| andrewbonney | 0:ec559500a63f | 43 | m_pTCPSocket->bind(h); |
| andrewbonney | 0:ec559500a63f | 44 | m_pTCPSocket->listen(); //Listen |
| andrewbonney | 0:ec559500a63f | 45 | } |
| andrewbonney | 0:ec559500a63f | 46 | |
| andrewbonney | 0:ec559500a63f | 47 | #if 0 //Just for clarity |
| andrewbonney | 0:ec559500a63f | 48 | template<typename T> |
| andrewbonney | 0:ec559500a63f | 49 | void HTTPServer::addHandler(const char* path) |
| andrewbonney | 0:ec559500a63f | 50 | { |
| andrewbonney | 0:ec559500a63f | 51 | m_lpHandlers[path] = &T::inst; |
| andrewbonney | 0:ec559500a63f | 52 | |
| andrewbonney | 0:ec559500a63f | 53 | } |
| andrewbonney | 0:ec559500a63f | 54 | #endif |
| andrewbonney | 0:ec559500a63f | 55 | |
| andrewbonney | 0:ec559500a63f | 56 | void HTTPServer::onTCPSocketEvent(TCPSocketEvent e) |
| andrewbonney | 0:ec559500a63f | 57 | { |
| andrewbonney | 0:ec559500a63f | 58 | |
| andrewbonney | 0:ec559500a63f | 59 | DBG("\r\nHTTPServer::onTCPSocketEvent : Event %d\r\n", e); |
| andrewbonney | 0:ec559500a63f | 60 | |
| andrewbonney | 0:ec559500a63f | 61 | if(e==TCPSOCKET_ACCEPT) |
| andrewbonney | 0:ec559500a63f | 62 | { |
| andrewbonney | 0:ec559500a63f | 63 | TCPSocket* pTCPSocket; |
| andrewbonney | 0:ec559500a63f | 64 | Host client; |
| andrewbonney | 0:ec559500a63f | 65 | |
| andrewbonney | 0:ec559500a63f | 66 | if( !!m_pTCPSocket->accept(&client, &pTCPSocket) ) |
| andrewbonney | 0:ec559500a63f | 67 | { |
| andrewbonney | 0:ec559500a63f | 68 | DBG("\r\nHTTPServer::onTCPSocketEvent : Could not accept connection.\r\n"); |
| andrewbonney | 0:ec559500a63f | 69 | return; //Error in accept, discard connection |
| andrewbonney | 0:ec559500a63f | 70 | } |
| andrewbonney | 0:ec559500a63f | 71 | |
| andrewbonney | 0:ec559500a63f | 72 | HTTPRequestDispatcher* pDispatcher = new HTTPRequestDispatcher(this, pTCPSocket); //TCPSocket ownership is passed to dispatcher |
| andrewbonney | 0:ec559500a63f | 73 | //The dispatcher object will destroy itself when done, or will be destroyed on Server destruction |
| andrewbonney | 0:ec559500a63f | 74 | |
| andrewbonney | 0:ec559500a63f | 75 | } |
| andrewbonney | 0:ec559500a63f | 76 | |
| andrewbonney | 0:ec559500a63f | 77 | } |