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/net.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 "net.h" |
| andrewbonney | 0:ec559500a63f | 25 | |
| andrewbonney | 0:ec559500a63f | 26 | #include "host.h" |
| andrewbonney | 0:ec559500a63f | 27 | #include "ipaddr.h" |
| andrewbonney | 0:ec559500a63f | 28 | #include "netservice.h" |
| andrewbonney | 0:ec559500a63f | 29 | #include "if/net/netif.h" |
| andrewbonney | 0:ec559500a63f | 30 | #include "if/net/nettcpsocket.h" |
| andrewbonney | 0:ec559500a63f | 31 | #include "if/net/netudpsocket.h" |
| andrewbonney | 0:ec559500a63f | 32 | #include "if/net/netdnsrequest.h" |
| andrewbonney | 0:ec559500a63f | 33 | |
| andrewbonney | 0:ec559500a63f | 34 | //#define __DEBUG |
| andrewbonney | 0:ec559500a63f | 35 | #include "dbg/dbg.h" |
| andrewbonney | 0:ec559500a63f | 36 | |
| andrewbonney | 0:ec559500a63f | 37 | Net::Net() : m_defaultIf(NULL), m_lpIf(), m_lpNetTcpSocket(), m_lpNetUdpSocket() |
| andrewbonney | 0:ec559500a63f | 38 | { |
| andrewbonney | 0:ec559500a63f | 39 | |
| andrewbonney | 0:ec559500a63f | 40 | } |
| andrewbonney | 0:ec559500a63f | 41 | |
| andrewbonney | 0:ec559500a63f | 42 | Net::~Net() |
| andrewbonney | 0:ec559500a63f | 43 | { |
| andrewbonney | 0:ec559500a63f | 44 | |
| andrewbonney | 0:ec559500a63f | 45 | } |
| andrewbonney | 0:ec559500a63f | 46 | |
| andrewbonney | 0:ec559500a63f | 47 | |
| andrewbonney | 0:ec559500a63f | 48 | void Net::poll() |
| andrewbonney | 0:ec559500a63f | 49 | { |
| andrewbonney | 0:ec559500a63f | 50 | //DBG("\r\nNet : Services polling\r\n"); |
| andrewbonney | 0:ec559500a63f | 51 | |
| andrewbonney | 0:ec559500a63f | 52 | //Poll Services |
| andrewbonney | 0:ec559500a63f | 53 | NetService::servicesPoll(); |
| andrewbonney | 0:ec559500a63f | 54 | |
| andrewbonney | 0:ec559500a63f | 55 | //DBG("\r\nNet : Interfaces polling\r\n"); |
| andrewbonney | 0:ec559500a63f | 56 | |
| andrewbonney | 0:ec559500a63f | 57 | //Poll Interfaces |
| andrewbonney | 0:ec559500a63f | 58 | list<NetIf*>::iterator pIfIt; |
| andrewbonney | 0:ec559500a63f | 59 | |
| andrewbonney | 0:ec559500a63f | 60 | for ( pIfIt = net().m_lpIf.begin() ; pIfIt != net().m_lpIf.end(); pIfIt++ ) |
| andrewbonney | 0:ec559500a63f | 61 | { |
| andrewbonney | 0:ec559500a63f | 62 | (*pIfIt)->poll(); |
| andrewbonney | 0:ec559500a63f | 63 | } |
| andrewbonney | 0:ec559500a63f | 64 | |
| andrewbonney | 0:ec559500a63f | 65 | //DBG("\r\nNet : Sockets polling\r\n"); |
| andrewbonney | 0:ec559500a63f | 66 | |
| andrewbonney | 0:ec559500a63f | 67 | //Poll Tcp Sockets |
| andrewbonney | 0:ec559500a63f | 68 | list<NetTcpSocket*>::iterator pNetTcpSocketIt; |
| andrewbonney | 0:ec559500a63f | 69 | |
| andrewbonney | 0:ec559500a63f | 70 | for ( pNetTcpSocketIt = net().m_lpNetTcpSocket.begin() ; pNetTcpSocketIt != net().m_lpNetTcpSocket.end(); ) |
| andrewbonney | 0:ec559500a63f | 71 | { |
| andrewbonney | 0:ec559500a63f | 72 | (*pNetTcpSocketIt)->poll(); |
| andrewbonney | 0:ec559500a63f | 73 | |
| andrewbonney | 0:ec559500a63f | 74 | if( (*pNetTcpSocketIt)->m_closed && !((*pNetTcpSocketIt)->m_refs) ) |
| andrewbonney | 0:ec559500a63f | 75 | { |
| andrewbonney | 0:ec559500a63f | 76 | (*pNetTcpSocketIt)->m_removed = true; |
| andrewbonney | 0:ec559500a63f | 77 | delete (*pNetTcpSocketIt); |
| andrewbonney | 0:ec559500a63f | 78 | (*pNetTcpSocketIt) = NULL; |
| andrewbonney | 0:ec559500a63f | 79 | pNetTcpSocketIt = net().m_lpNetTcpSocket.erase(pNetTcpSocketIt); |
| andrewbonney | 0:ec559500a63f | 80 | } |
| andrewbonney | 0:ec559500a63f | 81 | else |
| andrewbonney | 0:ec559500a63f | 82 | { |
| andrewbonney | 0:ec559500a63f | 83 | pNetTcpSocketIt++; |
| andrewbonney | 0:ec559500a63f | 84 | } |
| andrewbonney | 0:ec559500a63f | 85 | } |
| andrewbonney | 0:ec559500a63f | 86 | |
| andrewbonney | 0:ec559500a63f | 87 | //Poll Udp Sockets |
| andrewbonney | 0:ec559500a63f | 88 | list<NetUdpSocket*>::iterator pNetUdpSocketIt; |
| andrewbonney | 0:ec559500a63f | 89 | |
| andrewbonney | 0:ec559500a63f | 90 | for ( pNetUdpSocketIt = net().m_lpNetUdpSocket.begin() ; pNetUdpSocketIt != net().m_lpNetUdpSocket.end(); ) |
| andrewbonney | 0:ec559500a63f | 91 | { |
| andrewbonney | 0:ec559500a63f | 92 | (*pNetUdpSocketIt)->poll(); |
| andrewbonney | 0:ec559500a63f | 93 | |
| andrewbonney | 0:ec559500a63f | 94 | if( (*pNetUdpSocketIt)->m_closed && !((*pNetUdpSocketIt)->m_refs) ) |
| andrewbonney | 0:ec559500a63f | 95 | { |
| andrewbonney | 0:ec559500a63f | 96 | (*pNetUdpSocketIt)->m_removed = true; |
| andrewbonney | 0:ec559500a63f | 97 | delete (*pNetUdpSocketIt); |
| andrewbonney | 0:ec559500a63f | 98 | (*pNetUdpSocketIt) = NULL; |
| andrewbonney | 0:ec559500a63f | 99 | pNetUdpSocketIt = net().m_lpNetUdpSocket.erase(pNetUdpSocketIt); |
| andrewbonney | 0:ec559500a63f | 100 | } |
| andrewbonney | 0:ec559500a63f | 101 | else |
| andrewbonney | 0:ec559500a63f | 102 | { |
| andrewbonney | 0:ec559500a63f | 103 | pNetUdpSocketIt++; |
| andrewbonney | 0:ec559500a63f | 104 | } |
| andrewbonney | 0:ec559500a63f | 105 | } |
| andrewbonney | 0:ec559500a63f | 106 | |
| andrewbonney | 0:ec559500a63f | 107 | |
| andrewbonney | 0:ec559500a63f | 108 | } |
| andrewbonney | 0:ec559500a63f | 109 | |
| andrewbonney | 0:ec559500a63f | 110 | NetTcpSocket* Net::tcpSocket(NetIf& netif) { |
| andrewbonney | 0:ec559500a63f | 111 | NetTcpSocket* pNetTcpSocket = netif.tcpSocket(); |
| andrewbonney | 0:ec559500a63f | 112 | pNetTcpSocket->m_refs++; |
| andrewbonney | 0:ec559500a63f | 113 | return pNetTcpSocket; |
| andrewbonney | 0:ec559500a63f | 114 | } |
| andrewbonney | 0:ec559500a63f | 115 | |
| andrewbonney | 0:ec559500a63f | 116 | NetTcpSocket* Net::tcpSocket() { //NetTcpSocket on default if |
| andrewbonney | 0:ec559500a63f | 117 | if ( net().m_defaultIf == NULL ) |
| andrewbonney | 0:ec559500a63f | 118 | return NULL; |
| andrewbonney | 0:ec559500a63f | 119 | NetTcpSocket* pNetTcpSocket = net().m_defaultIf->tcpSocket(); |
| andrewbonney | 0:ec559500a63f | 120 | pNetTcpSocket->m_refs++; |
| andrewbonney | 0:ec559500a63f | 121 | return pNetTcpSocket; |
| andrewbonney | 0:ec559500a63f | 122 | } |
| andrewbonney | 0:ec559500a63f | 123 | |
| andrewbonney | 0:ec559500a63f | 124 | void Net::releaseTcpSocket(NetTcpSocket* pNetTcpSocket) |
| andrewbonney | 0:ec559500a63f | 125 | { |
| andrewbonney | 0:ec559500a63f | 126 | pNetTcpSocket->m_refs--; |
| andrewbonney | 0:ec559500a63f | 127 | if(!pNetTcpSocket->m_closed && !pNetTcpSocket->m_refs) |
| andrewbonney | 0:ec559500a63f | 128 | pNetTcpSocket->close(); |
| andrewbonney | 0:ec559500a63f | 129 | } |
| andrewbonney | 0:ec559500a63f | 130 | |
| andrewbonney | 0:ec559500a63f | 131 | NetUdpSocket* Net::udpSocket(NetIf& netif) { |
| andrewbonney | 0:ec559500a63f | 132 | NetUdpSocket* pNetUdpSocket = netif.udpSocket(); |
| andrewbonney | 0:ec559500a63f | 133 | pNetUdpSocket->m_refs++; |
| andrewbonney | 0:ec559500a63f | 134 | return pNetUdpSocket; |
| andrewbonney | 0:ec559500a63f | 135 | } |
| andrewbonney | 0:ec559500a63f | 136 | |
| andrewbonney | 0:ec559500a63f | 137 | NetUdpSocket* Net::udpSocket() { //NetTcpSocket on default if |
| andrewbonney | 0:ec559500a63f | 138 | if ( net().m_defaultIf == NULL ) |
| andrewbonney | 0:ec559500a63f | 139 | return NULL; |
| andrewbonney | 0:ec559500a63f | 140 | NetUdpSocket* pNetUdpSocket = net().m_defaultIf->udpSocket(); |
| andrewbonney | 0:ec559500a63f | 141 | pNetUdpSocket->m_refs++; |
| andrewbonney | 0:ec559500a63f | 142 | return pNetUdpSocket; |
| andrewbonney | 0:ec559500a63f | 143 | } |
| andrewbonney | 0:ec559500a63f | 144 | |
| andrewbonney | 0:ec559500a63f | 145 | void Net::releaseUdpSocket(NetUdpSocket* pNetUdpSocket) |
| andrewbonney | 0:ec559500a63f | 146 | { |
| andrewbonney | 0:ec559500a63f | 147 | pNetUdpSocket->m_refs--; |
| andrewbonney | 0:ec559500a63f | 148 | if(!pNetUdpSocket->m_closed && !pNetUdpSocket->m_refs) |
| andrewbonney | 0:ec559500a63f | 149 | pNetUdpSocket->close(); |
| andrewbonney | 0:ec559500a63f | 150 | } |
| andrewbonney | 0:ec559500a63f | 151 | |
| andrewbonney | 0:ec559500a63f | 152 | NetDnsRequest* Net::dnsRequest(const char* hostname, NetIf& netif) { |
| andrewbonney | 0:ec559500a63f | 153 | return netif.dnsRequest(hostname); |
| andrewbonney | 0:ec559500a63f | 154 | } |
| andrewbonney | 0:ec559500a63f | 155 | |
| andrewbonney | 0:ec559500a63f | 156 | NetDnsRequest* Net::dnsRequest(const char* hostname) { //Create a new NetDnsRequest object from default if |
| andrewbonney | 0:ec559500a63f | 157 | if ( net().m_defaultIf == NULL ) |
| andrewbonney | 0:ec559500a63f | 158 | return NULL; |
| andrewbonney | 0:ec559500a63f | 159 | return net().m_defaultIf->dnsRequest(hostname); |
| andrewbonney | 0:ec559500a63f | 160 | } |
| andrewbonney | 0:ec559500a63f | 161 | |
| andrewbonney | 0:ec559500a63f | 162 | NetDnsRequest* Net::dnsRequest(Host* pHost, NetIf& netif) |
| andrewbonney | 0:ec559500a63f | 163 | { |
| andrewbonney | 0:ec559500a63f | 164 | return netif.dnsRequest(pHost); |
| andrewbonney | 0:ec559500a63f | 165 | } |
| andrewbonney | 0:ec559500a63f | 166 | |
| andrewbonney | 0:ec559500a63f | 167 | NetDnsRequest* Net::dnsRequest(Host* pHost) //Creats a new NetDnsRequest object from default if |
| andrewbonney | 0:ec559500a63f | 168 | { |
| andrewbonney | 0:ec559500a63f | 169 | if ( net().m_defaultIf == NULL ) |
| andrewbonney | 0:ec559500a63f | 170 | return NULL; |
| andrewbonney | 0:ec559500a63f | 171 | return net().m_defaultIf->dnsRequest(pHost); |
| andrewbonney | 0:ec559500a63f | 172 | } |
| andrewbonney | 0:ec559500a63f | 173 | |
| andrewbonney | 0:ec559500a63f | 174 | void Net::setDefaultIf(NetIf& netif) { |
| andrewbonney | 0:ec559500a63f | 175 | net().m_defaultIf = &netif; |
| andrewbonney | 0:ec559500a63f | 176 | } |
| andrewbonney | 0:ec559500a63f | 177 | |
| andrewbonney | 0:ec559500a63f | 178 | void Net::setDefaultIf(NetIf* pIf) |
| andrewbonney | 0:ec559500a63f | 179 | { |
| andrewbonney | 0:ec559500a63f | 180 | net().m_defaultIf = pIf; |
| andrewbonney | 0:ec559500a63f | 181 | } |
| andrewbonney | 0:ec559500a63f | 182 | |
| andrewbonney | 0:ec559500a63f | 183 | NetIf* Net::getDefaultIf() { |
| andrewbonney | 0:ec559500a63f | 184 | return net().m_defaultIf; |
| andrewbonney | 0:ec559500a63f | 185 | } |
| andrewbonney | 0:ec559500a63f | 186 | |
| andrewbonney | 0:ec559500a63f | 187 | void Net::registerIf(NetIf* pIf) |
| andrewbonney | 0:ec559500a63f | 188 | { |
| andrewbonney | 0:ec559500a63f | 189 | net().m_lpIf.push_back(pIf); |
| andrewbonney | 0:ec559500a63f | 190 | } |
| andrewbonney | 0:ec559500a63f | 191 | |
| andrewbonney | 0:ec559500a63f | 192 | void Net::unregisterIf(NetIf* pIf) |
| andrewbonney | 0:ec559500a63f | 193 | { |
| andrewbonney | 0:ec559500a63f | 194 | if( net().m_defaultIf == pIf ) |
| andrewbonney | 0:ec559500a63f | 195 | net().m_defaultIf = NULL; |
| andrewbonney | 0:ec559500a63f | 196 | net().m_lpIf.remove(pIf); |
| andrewbonney | 0:ec559500a63f | 197 | } |
| andrewbonney | 0:ec559500a63f | 198 | |
| andrewbonney | 0:ec559500a63f | 199 | void Net::registerNetTcpSocket(NetTcpSocket* pNetTcpSocket) |
| andrewbonney | 0:ec559500a63f | 200 | { |
| andrewbonney | 0:ec559500a63f | 201 | net().m_lpNetTcpSocket.push_back(pNetTcpSocket); |
| andrewbonney | 0:ec559500a63f | 202 | DBG("\r\nNetTcpSocket [ + %p ] %d\r\n", (void*)pNetTcpSocket, net().m_lpNetTcpSocket.size()); |
| andrewbonney | 0:ec559500a63f | 203 | } |
| andrewbonney | 0:ec559500a63f | 204 | |
| andrewbonney | 0:ec559500a63f | 205 | void Net::unregisterNetTcpSocket(NetTcpSocket* pNetTcpSocket) |
| andrewbonney | 0:ec559500a63f | 206 | { |
| andrewbonney | 0:ec559500a63f | 207 | DBG("\r\nNetTcpSocket [ - %p ] %d\r\n", (void*)pNetTcpSocket, net().m_lpNetTcpSocket.size() - 1); |
| andrewbonney | 0:ec559500a63f | 208 | if(!pNetTcpSocket->m_removed) |
| andrewbonney | 0:ec559500a63f | 209 | net().m_lpNetTcpSocket.remove(pNetTcpSocket); |
| andrewbonney | 0:ec559500a63f | 210 | } |
| andrewbonney | 0:ec559500a63f | 211 | |
| andrewbonney | 0:ec559500a63f | 212 | void Net::registerNetUdpSocket(NetUdpSocket* pNetUdpSocket) |
| andrewbonney | 0:ec559500a63f | 213 | { |
| andrewbonney | 0:ec559500a63f | 214 | net().m_lpNetUdpSocket.push_back(pNetUdpSocket); |
| andrewbonney | 0:ec559500a63f | 215 | DBG("\r\nNetUdpSocket [ + %p ] %d\r\n", (void*)pNetUdpSocket, net().m_lpNetUdpSocket.size()); |
| andrewbonney | 0:ec559500a63f | 216 | } |
| andrewbonney | 0:ec559500a63f | 217 | |
| andrewbonney | 0:ec559500a63f | 218 | void Net::unregisterNetUdpSocket(NetUdpSocket* pNetUdpSocket) |
| andrewbonney | 0:ec559500a63f | 219 | { |
| andrewbonney | 0:ec559500a63f | 220 | DBG("\r\nNetUdpSocket [ - %p ] %d\r\n", (void*)pNetUdpSocket, net().m_lpNetUdpSocket.size() - 1); |
| andrewbonney | 0:ec559500a63f | 221 | if(!pNetUdpSocket->m_removed) |
| andrewbonney | 0:ec559500a63f | 222 | net().m_lpNetUdpSocket.remove(pNetUdpSocket); |
| andrewbonney | 0:ec559500a63f | 223 | } |
| andrewbonney | 0:ec559500a63f | 224 | |
| andrewbonney | 0:ec559500a63f | 225 | Net& Net::net() |
| andrewbonney | 0:ec559500a63f | 226 | { |
| andrewbonney | 0:ec559500a63f | 227 | static Net* pInst = new Net(); //Called only once |
| andrewbonney | 0:ec559500a63f | 228 | return *pInst; |
| andrewbonney | 0:ec559500a63f | 229 | } |