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.
core/netservice.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 "netservice.h" |
| andrewbonney | 0:ec559500a63f | 25 | #include "net.h" |
| andrewbonney | 0:ec559500a63f | 26 | |
| andrewbonney | 0:ec559500a63f | 27 | //#define __DEBUG |
| andrewbonney | 0:ec559500a63f | 28 | #include "dbg/dbg.h" |
| andrewbonney | 0:ec559500a63f | 29 | |
| andrewbonney | 0:ec559500a63f | 30 | NetService::NetService(bool owned /*= true*/) : m_closed(false), m_removed(false), m_owned(owned) |
| andrewbonney | 0:ec559500a63f | 31 | { |
| andrewbonney | 0:ec559500a63f | 32 | NetService::lpServices().push_back(this); |
| andrewbonney | 0:ec559500a63f | 33 | DBG("\r\n[ + %p ] %d\r\n", (void*)this, lpServices().size()); |
| andrewbonney | 0:ec559500a63f | 34 | } |
| andrewbonney | 0:ec559500a63f | 35 | |
| andrewbonney | 0:ec559500a63f | 36 | NetService::~NetService() |
| andrewbonney | 0:ec559500a63f | 37 | { |
| andrewbonney | 0:ec559500a63f | 38 | // DBG("\r\nService removed\r\n"); |
| andrewbonney | 0:ec559500a63f | 39 | // DBG("\r\nNow %d services running\r\n", lpServices().size()-1); |
| andrewbonney | 0:ec559500a63f | 40 | DBG("\r\n[ - %p ] %d\r\n", (void*)this, lpServices().size()-1); |
| andrewbonney | 0:ec559500a63f | 41 | if((!m_owned) || (!m_removed)) //Destructor was not called by servicesPoll() |
| andrewbonney | 0:ec559500a63f | 42 | { |
| andrewbonney | 0:ec559500a63f | 43 | if(m_owned) |
| andrewbonney | 0:ec559500a63f | 44 | DBG("\r\nWARN!!!Service removed in dtor!!!\r\n"); |
| andrewbonney | 0:ec559500a63f | 45 | NetService::lpServices().remove(this); |
| andrewbonney | 0:ec559500a63f | 46 | } |
| andrewbonney | 0:ec559500a63f | 47 | } |
| andrewbonney | 0:ec559500a63f | 48 | |
| andrewbonney | 0:ec559500a63f | 49 | void NetService::poll() |
| andrewbonney | 0:ec559500a63f | 50 | { |
| andrewbonney | 0:ec559500a63f | 51 | |
| andrewbonney | 0:ec559500a63f | 52 | } |
| andrewbonney | 0:ec559500a63f | 53 | |
| andrewbonney | 0:ec559500a63f | 54 | void NetService::servicesPoll() //Poll all registered services & destroy closed ones |
| andrewbonney | 0:ec559500a63f | 55 | { |
| andrewbonney | 0:ec559500a63f | 56 | list<NetService*>::iterator it; |
| andrewbonney | 0:ec559500a63f | 57 | DBG("\r\nServices polling over %d services\r\n", lpServices().size()); |
| andrewbonney | 0:ec559500a63f | 58 | for( it = lpServices().begin(); it != lpServices().end(); ) |
| andrewbonney | 0:ec559500a63f | 59 | { |
| andrewbonney | 0:ec559500a63f | 60 | if( (*it)->m_owned && (*it)->m_closed ) |
| andrewbonney | 0:ec559500a63f | 61 | { |
| andrewbonney | 0:ec559500a63f | 62 | DBG("\r\nService %p is flagged as closed\r\n", (*it)); |
| andrewbonney | 0:ec559500a63f | 63 | (*it)->m_removed = true; |
| andrewbonney | 0:ec559500a63f | 64 | delete (*it); |
| andrewbonney | 0:ec559500a63f | 65 | it = lpServices().erase(it); |
| andrewbonney | 0:ec559500a63f | 66 | } |
| andrewbonney | 0:ec559500a63f | 67 | else |
| andrewbonney | 0:ec559500a63f | 68 | { |
| andrewbonney | 0:ec559500a63f | 69 | //DBG("Service %p polling start\n", (*it)); |
| andrewbonney | 0:ec559500a63f | 70 | (*it)->poll(); |
| andrewbonney | 0:ec559500a63f | 71 | //DBG("Service %p polling end\n", (*it)); |
| andrewbonney | 0:ec559500a63f | 72 | it++; |
| andrewbonney | 0:ec559500a63f | 73 | } |
| andrewbonney | 0:ec559500a63f | 74 | } |
| andrewbonney | 0:ec559500a63f | 75 | |
| andrewbonney | 0:ec559500a63f | 76 | } |
| andrewbonney | 0:ec559500a63f | 77 | |
| andrewbonney | 0:ec559500a63f | 78 | void NetService::close() |
| andrewbonney | 0:ec559500a63f | 79 | { |
| andrewbonney | 0:ec559500a63f | 80 | DBG("\r\nService %p to be closed (owned = %d)\r\n", this, m_owned); |
| andrewbonney | 0:ec559500a63f | 81 | m_closed = true; |
| andrewbonney | 0:ec559500a63f | 82 | } |
| andrewbonney | 0:ec559500a63f | 83 | |
| andrewbonney | 0:ec559500a63f | 84 | list<NetService*>& NetService::lpServices() |
| andrewbonney | 0:ec559500a63f | 85 | { |
| andrewbonney | 0:ec559500a63f | 86 | static list<NetService*>* pInst = new list<NetService*>(); //Called only once |
| andrewbonney | 0:ec559500a63f | 87 | return *pInst; |
| andrewbonney | 0:ec559500a63f | 88 | } |