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.
api/UDPSocket.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 "UDPSocket.h" |
| andrewbonney | 0:ec559500a63f | 25 | #include "if/net/netudpsocket.h" |
| andrewbonney | 0:ec559500a63f | 26 | |
| andrewbonney | 0:ec559500a63f | 27 | UDPSocket::UDPSocket() : m_pNetUdpSocket(NULL), m_pCbItem(NULL), m_pCbMeth(NULL), m_pCb(NULL) |
| andrewbonney | 0:ec559500a63f | 28 | { |
| andrewbonney | 0:ec559500a63f | 29 | |
| andrewbonney | 0:ec559500a63f | 30 | } |
| andrewbonney | 0:ec559500a63f | 31 | |
| andrewbonney | 0:ec559500a63f | 32 | UDPSocket::~UDPSocket() //close() |
| andrewbonney | 0:ec559500a63f | 33 | { |
| andrewbonney | 0:ec559500a63f | 34 | close(); |
| andrewbonney | 0:ec559500a63f | 35 | } |
| andrewbonney | 0:ec559500a63f | 36 | |
| andrewbonney | 0:ec559500a63f | 37 | UDPSocketErr UDPSocket::bind(const Host& me) |
| andrewbonney | 0:ec559500a63f | 38 | { |
| andrewbonney | 0:ec559500a63f | 39 | UDPSocketErr udpSocketErr = checkInst(); |
| andrewbonney | 0:ec559500a63f | 40 | if(udpSocketErr) |
| andrewbonney | 0:ec559500a63f | 41 | return udpSocketErr; |
| andrewbonney | 0:ec559500a63f | 42 | return (UDPSocketErr) m_pNetUdpSocket->bind(me); |
| andrewbonney | 0:ec559500a63f | 43 | } |
| andrewbonney | 0:ec559500a63f | 44 | |
| andrewbonney | 0:ec559500a63f | 45 | int /*if < 0 : UDPSocketErr*/ UDPSocket::sendto(const char* buf, int len, Host* pHost) |
| andrewbonney | 0:ec559500a63f | 46 | { |
| andrewbonney | 0:ec559500a63f | 47 | UDPSocketErr udpSocketErr = checkInst(); |
| andrewbonney | 0:ec559500a63f | 48 | if(udpSocketErr) |
| andrewbonney | 0:ec559500a63f | 49 | return udpSocketErr; |
| andrewbonney | 0:ec559500a63f | 50 | return m_pNetUdpSocket->sendto(buf, len, pHost); |
| andrewbonney | 0:ec559500a63f | 51 | } |
| andrewbonney | 0:ec559500a63f | 52 | |
| andrewbonney | 0:ec559500a63f | 53 | int /*if < 0 : UDPSocketErr*/ UDPSocket::recvfrom(char* buf, int len, Host* pHost) |
| andrewbonney | 0:ec559500a63f | 54 | { |
| andrewbonney | 0:ec559500a63f | 55 | UDPSocketErr udpSocketErr = checkInst(); |
| andrewbonney | 0:ec559500a63f | 56 | if(udpSocketErr) |
| andrewbonney | 0:ec559500a63f | 57 | return udpSocketErr; |
| andrewbonney | 0:ec559500a63f | 58 | return m_pNetUdpSocket->recvfrom(buf, len, pHost); |
| andrewbonney | 0:ec559500a63f | 59 | } |
| andrewbonney | 0:ec559500a63f | 60 | |
| andrewbonney | 0:ec559500a63f | 61 | UDPSocketErr UDPSocket::close() |
| andrewbonney | 0:ec559500a63f | 62 | { |
| andrewbonney | 0:ec559500a63f | 63 | if(!m_pNetUdpSocket) |
| andrewbonney | 0:ec559500a63f | 64 | return UDPSOCKET_SETUP; |
| andrewbonney | 0:ec559500a63f | 65 | m_pNetUdpSocket->resetOnEvent(); |
| andrewbonney | 0:ec559500a63f | 66 | UDPSocketErr udpSocketErr = (UDPSocketErr) m_pNetUdpSocket->close(); //Close (can already be closed) |
| andrewbonney | 0:ec559500a63f | 67 | Net::releaseUdpSocket(m_pNetUdpSocket); //And release it so it can be freed when properly removed |
| andrewbonney | 0:ec559500a63f | 68 | m_pNetUdpSocket = NULL; |
| andrewbonney | 0:ec559500a63f | 69 | return udpSocketErr; |
| andrewbonney | 0:ec559500a63f | 70 | } |
| andrewbonney | 0:ec559500a63f | 71 | |
| andrewbonney | 0:ec559500a63f | 72 | //Callbacks |
| andrewbonney | 0:ec559500a63f | 73 | void UDPSocket::setOnEvent( void (*pMethod)(UDPSocketEvent) ) |
| andrewbonney | 0:ec559500a63f | 74 | { |
| andrewbonney | 0:ec559500a63f | 75 | m_pCb = pMethod; |
| andrewbonney | 0:ec559500a63f | 76 | } |
| andrewbonney | 0:ec559500a63f | 77 | |
| andrewbonney | 0:ec559500a63f | 78 | #if 0 //For info only |
| andrewbonney | 0:ec559500a63f | 79 | template<class T> |
| andrewbonney | 0:ec559500a63f | 80 | void UDPSocket::setOnEvent( T* pItem, void (T::*pMethod)(UDPSocketEvent) ) |
| andrewbonney | 0:ec559500a63f | 81 | { |
| andrewbonney | 0:ec559500a63f | 82 | m_pCbItem = (CDummy*) pItem; |
| andrewbonney | 0:ec559500a63f | 83 | m_pCbMeth = (void (CDummy::*)(UDPSocketEvent)) pMethod; |
| andrewbonney | 0:ec559500a63f | 84 | } |
| andrewbonney | 0:ec559500a63f | 85 | #endif |
| andrewbonney | 0:ec559500a63f | 86 | |
| andrewbonney | 0:ec559500a63f | 87 | void UDPSocket::resetOnEvent() //Disable callback |
| andrewbonney | 0:ec559500a63f | 88 | { |
| andrewbonney | 0:ec559500a63f | 89 | m_pCb = NULL; |
| andrewbonney | 0:ec559500a63f | 90 | m_pCbItem = NULL; |
| andrewbonney | 0:ec559500a63f | 91 | m_pCbMeth = NULL; |
| andrewbonney | 0:ec559500a63f | 92 | } |
| andrewbonney | 0:ec559500a63f | 93 | |
| andrewbonney | 0:ec559500a63f | 94 | void UDPSocket::onNetUdpSocketEvent(NetUdpSocketEvent e) |
| andrewbonney | 0:ec559500a63f | 95 | { |
| andrewbonney | 0:ec559500a63f | 96 | if(m_pCbItem && m_pCbMeth) |
| andrewbonney | 0:ec559500a63f | 97 | (m_pCbItem->*m_pCbMeth)((UDPSocketEvent) e); |
| andrewbonney | 0:ec559500a63f | 98 | else if(m_pCb) |
| andrewbonney | 0:ec559500a63f | 99 | m_pCb((UDPSocketEvent) e); |
| andrewbonney | 0:ec559500a63f | 100 | } |
| andrewbonney | 0:ec559500a63f | 101 | |
| andrewbonney | 0:ec559500a63f | 102 | UDPSocketErr UDPSocket::checkInst() |
| andrewbonney | 0:ec559500a63f | 103 | { |
| andrewbonney | 0:ec559500a63f | 104 | if(!m_pNetUdpSocket) |
| andrewbonney | 0:ec559500a63f | 105 | { |
| andrewbonney | 0:ec559500a63f | 106 | m_pNetUdpSocket = Net::udpSocket(); |
| andrewbonney | 0:ec559500a63f | 107 | if(!m_pNetUdpSocket) |
| andrewbonney | 0:ec559500a63f | 108 | { |
| andrewbonney | 0:ec559500a63f | 109 | return UDPSOCKET_IF; //Interface did not return a socket (usually because a default interface does not exist) |
| andrewbonney | 0:ec559500a63f | 110 | } |
| andrewbonney | 0:ec559500a63f | 111 | m_pNetUdpSocket->setOnEvent(this, &UDPSocket::onNetUdpSocketEvent); |
| andrewbonney | 0:ec559500a63f | 112 | } |
| andrewbonney | 0:ec559500a63f | 113 | return UDPSOCKET_OK; |
| andrewbonney | 0:ec559500a63f | 114 | } |