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.
if/net/nettcpsocket.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 "nettcpsocket.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 | NetTcpSocket::NetTcpSocket() : m_host(), m_client(), m_refs(0), m_closed(false), m_removed(false), m_pCbItem(NULL), m_pCbMeth(NULL), m_events() |
| andrewbonney | 0:ec559500a63f | 30 | { |
| andrewbonney | 0:ec559500a63f | 31 | Net::registerNetTcpSocket(this); |
| andrewbonney | 0:ec559500a63f | 32 | } |
| andrewbonney | 0:ec559500a63f | 33 | |
| andrewbonney | 0:ec559500a63f | 34 | NetTcpSocket::~NetTcpSocket() //close() |
| andrewbonney | 0:ec559500a63f | 35 | { |
| andrewbonney | 0:ec559500a63f | 36 | Net::unregisterNetTcpSocket(this); |
| andrewbonney | 0:ec559500a63f | 37 | } |
| andrewbonney | 0:ec559500a63f | 38 | |
| andrewbonney | 0:ec559500a63f | 39 | |
| andrewbonney | 0:ec559500a63f | 40 | //Callbacks |
| andrewbonney | 0:ec559500a63f | 41 | #ifdef __LINKER_BUG_SOLVED__ |
| andrewbonney | 0:ec559500a63f | 42 | void NetTcpSocket::setOnEvent() |
| andrewbonney | 0:ec559500a63f | 43 | { |
| andrewbonney | 0:ec559500a63f | 44 | m_pCbItem = (CDummy*) pItem; |
| andrewbonney | 0:ec559500a63f | 45 | m_pCbMeth = (void (CDummy::*)(NetTcpSocketEvent)) pMethod; |
| andrewbonney | 0:ec559500a63f | 46 | } |
| andrewbonney | 0:ec559500a63f | 47 | #endif |
| andrewbonney | 0:ec559500a63f | 48 | |
| andrewbonney | 0:ec559500a63f | 49 | void NetTcpSocket::resetOnEvent() |
| andrewbonney | 0:ec559500a63f | 50 | { |
| andrewbonney | 0:ec559500a63f | 51 | m_pCbItem = NULL; |
| andrewbonney | 0:ec559500a63f | 52 | m_pCbMeth = NULL; |
| andrewbonney | 0:ec559500a63f | 53 | } |
| andrewbonney | 0:ec559500a63f | 54 | |
| andrewbonney | 0:ec559500a63f | 55 | void NetTcpSocket::queueEvent(NetTcpSocketEvent e) |
| andrewbonney | 0:ec559500a63f | 56 | { |
| andrewbonney | 0:ec559500a63f | 57 | m_events.push(e); |
| andrewbonney | 0:ec559500a63f | 58 | } |
| andrewbonney | 0:ec559500a63f | 59 | |
| andrewbonney | 0:ec559500a63f | 60 | void NetTcpSocket::discardEvents() |
| andrewbonney | 0:ec559500a63f | 61 | { |
| andrewbonney | 0:ec559500a63f | 62 | while( !m_events.empty() ) |
| andrewbonney | 0:ec559500a63f | 63 | { |
| andrewbonney | 0:ec559500a63f | 64 | m_events.pop(); |
| andrewbonney | 0:ec559500a63f | 65 | } |
| andrewbonney | 0:ec559500a63f | 66 | } |
| andrewbonney | 0:ec559500a63f | 67 | |
| andrewbonney | 0:ec559500a63f | 68 | void NetTcpSocket::flushEvents() //To be called during polling |
| andrewbonney | 0:ec559500a63f | 69 | { |
| andrewbonney | 0:ec559500a63f | 70 | while( !m_events.empty() ) |
| andrewbonney | 0:ec559500a63f | 71 | { |
| andrewbonney | 0:ec559500a63f | 72 | onEvent(m_events.front()); |
| andrewbonney | 0:ec559500a63f | 73 | m_events.pop(); |
| andrewbonney | 0:ec559500a63f | 74 | } |
| andrewbonney | 0:ec559500a63f | 75 | } |
| andrewbonney | 0:ec559500a63f | 76 | |
| andrewbonney | 0:ec559500a63f | 77 | void NetTcpSocket::onEvent(NetTcpSocketEvent e) //To be called during polling |
| andrewbonney | 0:ec559500a63f | 78 | { |
| andrewbonney | 0:ec559500a63f | 79 | if(m_pCbItem && m_pCbMeth) |
| andrewbonney | 0:ec559500a63f | 80 | (m_pCbItem->*m_pCbMeth)(e); |
| andrewbonney | 0:ec559500a63f | 81 | } |
| andrewbonney | 0:ec559500a63f | 82 |