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/TCPSocket.h@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 | /** \file |
| andrewbonney | 0:ec559500a63f | 25 | TCP Socket header file |
| andrewbonney | 0:ec559500a63f | 26 | */ |
| andrewbonney | 0:ec559500a63f | 27 | |
| andrewbonney | 0:ec559500a63f | 28 | #ifndef TCPSOCKET_H |
| andrewbonney | 0:ec559500a63f | 29 | #define TCPSOCKET_H |
| andrewbonney | 0:ec559500a63f | 30 | |
| andrewbonney | 0:ec559500a63f | 31 | #include "core/net.h" |
| andrewbonney | 0:ec559500a63f | 32 | #include "core/host.h" |
| andrewbonney | 0:ec559500a63f | 33 | //Essentially it is a safe interface to NetTcpSocket |
| andrewbonney | 0:ec559500a63f | 34 | |
| andrewbonney | 0:ec559500a63f | 35 | ///TCP Socket error codes |
| andrewbonney | 0:ec559500a63f | 36 | enum TCPSocketErr |
| andrewbonney | 0:ec559500a63f | 37 | { |
| andrewbonney | 0:ec559500a63f | 38 | __TCPSOCKET_MIN = -0xFFFF, |
| andrewbonney | 0:ec559500a63f | 39 | TCPSOCKET_SETUP, ///<TCPSocket not properly configured |
| andrewbonney | 0:ec559500a63f | 40 | TCPSOCKET_TIMEOUT, ///<Connection timed out |
| andrewbonney | 0:ec559500a63f | 41 | TCPSOCKET_IF, ///<Interface has problems, does not exist or is not initialized |
| andrewbonney | 0:ec559500a63f | 42 | TCPSOCKET_MEM, ///<Not enough mem |
| andrewbonney | 0:ec559500a63f | 43 | TCPSOCKET_INUSE, ///<Interface / Port is in use |
| andrewbonney | 0:ec559500a63f | 44 | TCPSOCKET_EMPTY, ///<Connections queue is empty |
| andrewbonney | 0:ec559500a63f | 45 | TCPSOCKET_RST, ///<Connection was reset by remote host |
| andrewbonney | 0:ec559500a63f | 46 | //... |
| andrewbonney | 0:ec559500a63f | 47 | TCPSOCKET_OK = 0 ///<Success |
| andrewbonney | 0:ec559500a63f | 48 | }; |
| andrewbonney | 0:ec559500a63f | 49 | |
| andrewbonney | 0:ec559500a63f | 50 | ///TCP Socket Events |
| andrewbonney | 0:ec559500a63f | 51 | enum TCPSocketEvent |
| andrewbonney | 0:ec559500a63f | 52 | { |
| andrewbonney | 0:ec559500a63f | 53 | TCPSOCKET_CONNECTED, ///<Connected to host |
| andrewbonney | 0:ec559500a63f | 54 | TCPSOCKET_ACCEPT, ///<Client is connected, must call accept() to get a new Socket |
| andrewbonney | 0:ec559500a63f | 55 | TCPSOCKET_READABLE, ///<Data in buf |
| andrewbonney | 0:ec559500a63f | 56 | TCPSOCKET_WRITEABLE, ///<Can write data to buf |
| andrewbonney | 0:ec559500a63f | 57 | TCPSOCKET_CONTIMEOUT, ///<Connection timed out |
| andrewbonney | 0:ec559500a63f | 58 | TCPSOCKET_CONRST, ///<Connection was reset by remote host |
| andrewbonney | 0:ec559500a63f | 59 | TCPSOCKET_CONABRT, ///<Connection was aborted |
| andrewbonney | 0:ec559500a63f | 60 | TCPSOCKET_ERROR, ///<Unknown error |
| andrewbonney | 0:ec559500a63f | 61 | TCPSOCKET_DISCONNECTED ///<Disconnected |
| andrewbonney | 0:ec559500a63f | 62 | }; |
| andrewbonney | 0:ec559500a63f | 63 | |
| andrewbonney | 0:ec559500a63f | 64 | class NetTcpSocket; |
| andrewbonney | 0:ec559500a63f | 65 | enum NetTcpSocketEvent; |
| andrewbonney | 0:ec559500a63f | 66 | |
| andrewbonney | 0:ec559500a63f | 67 | ///This is a simple TCP Socket class |
| andrewbonney | 0:ec559500a63f | 68 | /** |
| andrewbonney | 0:ec559500a63f | 69 | This class exposes an API to deal with TCP Sockets |
| andrewbonney | 0:ec559500a63f | 70 | */ |
| andrewbonney | 0:ec559500a63f | 71 | class TCPSocket |
| andrewbonney | 0:ec559500a63f | 72 | { |
| andrewbonney | 0:ec559500a63f | 73 | public: |
| andrewbonney | 0:ec559500a63f | 74 | ///Creates a new socket |
| andrewbonney | 0:ec559500a63f | 75 | TCPSocket(); |
| andrewbonney | 0:ec559500a63f | 76 | protected: |
| andrewbonney | 0:ec559500a63f | 77 | TCPSocket(NetTcpSocket* pNetTcpSocket); |
| andrewbonney | 0:ec559500a63f | 78 | public: |
| andrewbonney | 0:ec559500a63f | 79 | ///Closes if needed and destroys the socket |
| andrewbonney | 0:ec559500a63f | 80 | ~TCPSocket(); //close() |
| andrewbonney | 0:ec559500a63f | 81 | |
| andrewbonney | 0:ec559500a63f | 82 | ///Binds the socket to (local) host |
| andrewbonney | 0:ec559500a63f | 83 | TCPSocketErr bind(const Host& me); |
| andrewbonney | 0:ec559500a63f | 84 | |
| andrewbonney | 0:ec559500a63f | 85 | ///Starts listening |
| andrewbonney | 0:ec559500a63f | 86 | TCPSocketErr listen(); |
| andrewbonney | 0:ec559500a63f | 87 | |
| andrewbonney | 0:ec559500a63f | 88 | ///Connects socket to host |
| andrewbonney | 0:ec559500a63f | 89 | TCPSocketErr connect(const Host& host); |
| andrewbonney | 0:ec559500a63f | 90 | |
| andrewbonney | 0:ec559500a63f | 91 | ///Accepts connection from client and gets connected socket |
| andrewbonney | 0:ec559500a63f | 92 | TCPSocketErr accept(Host* pClient, TCPSocket** ppNewTcpSocket); |
| andrewbonney | 0:ec559500a63f | 93 | |
| andrewbonney | 0:ec559500a63f | 94 | ///Sends data |
| andrewbonney | 0:ec559500a63f | 95 | /* |
| andrewbonney | 0:ec559500a63f | 96 | @return a negative error code or the number of bytes transmitted |
| andrewbonney | 0:ec559500a63f | 97 | */ |
| andrewbonney | 0:ec559500a63f | 98 | int /*if < 0 : TCPSocketErr*/ send(const char* buf, int len); |
| andrewbonney | 0:ec559500a63f | 99 | |
| andrewbonney | 0:ec559500a63f | 100 | ///Receives data |
| andrewbonney | 0:ec559500a63f | 101 | /* |
| andrewbonney | 0:ec559500a63f | 102 | @return a negative error code or the number of bytes received |
| andrewbonney | 0:ec559500a63f | 103 | */ |
| andrewbonney | 0:ec559500a63f | 104 | int /*if < 0 : TCPSocketErr*/ recv(char* buf, int len); |
| andrewbonney | 0:ec559500a63f | 105 | |
| andrewbonney | 0:ec559500a63f | 106 | /* TODO NTH : printf / scanf helpers that call send/recv */ |
| andrewbonney | 0:ec559500a63f | 107 | |
| andrewbonney | 0:ec559500a63f | 108 | ///Closes socket |
| andrewbonney | 0:ec559500a63f | 109 | TCPSocketErr close(); |
| andrewbonney | 0:ec559500a63f | 110 | |
| andrewbonney | 0:ec559500a63f | 111 | //Callbacks |
| andrewbonney | 0:ec559500a63f | 112 | ///Setups callback |
| andrewbonney | 0:ec559500a63f | 113 | /** |
| andrewbonney | 0:ec559500a63f | 114 | @param pMethod : callback function |
| andrewbonney | 0:ec559500a63f | 115 | */ |
| andrewbonney | 0:ec559500a63f | 116 | void setOnEvent( void (*pMethod)(TCPSocketEvent) ); |
| andrewbonney | 0:ec559500a63f | 117 | |
| andrewbonney | 0:ec559500a63f | 118 | class CDummy; |
| andrewbonney | 0:ec559500a63f | 119 | ///Setups callback |
| andrewbonney | 0:ec559500a63f | 120 | /** |
| andrewbonney | 0:ec559500a63f | 121 | @param pItem : instance of class on which to execute the callback method |
| andrewbonney | 0:ec559500a63f | 122 | @param pMethod : callback method |
| andrewbonney | 0:ec559500a63f | 123 | */ |
| andrewbonney | 0:ec559500a63f | 124 | template<class T> |
| andrewbonney | 0:ec559500a63f | 125 | void setOnEvent( T* pItem, void (T::*pMethod)(TCPSocketEvent) ) |
| andrewbonney | 0:ec559500a63f | 126 | { |
| andrewbonney | 0:ec559500a63f | 127 | m_pCbItem = (CDummy*) pItem; |
| andrewbonney | 0:ec559500a63f | 128 | m_pCbMeth = (void (CDummy::*)(TCPSocketEvent)) pMethod; |
| andrewbonney | 0:ec559500a63f | 129 | } |
| andrewbonney | 0:ec559500a63f | 130 | |
| andrewbonney | 0:ec559500a63f | 131 | ///Disables callback |
| andrewbonney | 0:ec559500a63f | 132 | void resetOnEvent(); |
| andrewbonney | 0:ec559500a63f | 133 | |
| andrewbonney | 0:ec559500a63f | 134 | protected: |
| andrewbonney | 0:ec559500a63f | 135 | void onNetTcpSocketEvent(NetTcpSocketEvent e); |
| andrewbonney | 0:ec559500a63f | 136 | TCPSocketErr checkInst(); |
| andrewbonney | 0:ec559500a63f | 137 | |
| andrewbonney | 0:ec559500a63f | 138 | private: |
| andrewbonney | 0:ec559500a63f | 139 | NetTcpSocket* m_pNetTcpSocket; |
| andrewbonney | 0:ec559500a63f | 140 | |
| andrewbonney | 0:ec559500a63f | 141 | CDummy* m_pCbItem; |
| andrewbonney | 0:ec559500a63f | 142 | void (CDummy::*m_pCbMeth)(TCPSocketEvent); |
| andrewbonney | 0:ec559500a63f | 143 | |
| andrewbonney | 0:ec559500a63f | 144 | void (*m_pCb)(TCPSocketEvent); |
| andrewbonney | 0:ec559500a63f | 145 | |
| andrewbonney | 0:ec559500a63f | 146 | }; |
| andrewbonney | 0:ec559500a63f | 147 | |
| andrewbonney | 0:ec559500a63f | 148 | #endif |