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.
Diff: if/net/nettcpsocket.cpp
- Revision:
- 0:ec559500a63f
diff -r 000000000000 -r ec559500a63f if/net/nettcpsocket.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/if/net/nettcpsocket.cpp Fri Apr 08 14:39:41 2011 +0000 @@ -0,0 +1,82 @@ + +/* +Copyright (c) 2010 Donatien Garnier (donatiengar [at] gmail [dot] com) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +*/ + +#include "nettcpsocket.h" + +//#define __DEBUG +#include "dbg/dbg.h" + +NetTcpSocket::NetTcpSocket() : m_host(), m_client(), m_refs(0), m_closed(false), m_removed(false), m_pCbItem(NULL), m_pCbMeth(NULL), m_events() +{ + Net::registerNetTcpSocket(this); +} + +NetTcpSocket::~NetTcpSocket() //close() +{ + Net::unregisterNetTcpSocket(this); +} + + +//Callbacks +#ifdef __LINKER_BUG_SOLVED__ +void NetTcpSocket::setOnEvent() +{ + m_pCbItem = (CDummy*) pItem; + m_pCbMeth = (void (CDummy::*)(NetTcpSocketEvent)) pMethod; +} +#endif + +void NetTcpSocket::resetOnEvent() +{ + m_pCbItem = NULL; + m_pCbMeth = NULL; +} + +void NetTcpSocket::queueEvent(NetTcpSocketEvent e) +{ + m_events.push(e); +} + +void NetTcpSocket::discardEvents() +{ + while( !m_events.empty() ) + { + m_events.pop(); + } +} + +void NetTcpSocket::flushEvents() //To be called during polling +{ + while( !m_events.empty() ) + { + onEvent(m_events.front()); + m_events.pop(); + } +} + +void NetTcpSocket::onEvent(NetTcpSocketEvent e) //To be called during polling +{ + if(m_pCbItem && m_pCbMeth) + (m_pCbItem->*m_pCbMeth)(e); +} +