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.
if/net/nettcpsocket.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 | #ifndef NETTCPSOCKET_H |
| andrewbonney | 0:ec559500a63f | 25 | #define NETTCPSOCKET_H |
| andrewbonney | 0:ec559500a63f | 26 | |
| andrewbonney | 0:ec559500a63f | 27 | #include "net.h" |
| andrewbonney | 0:ec559500a63f | 28 | #include "host.h" |
| andrewbonney | 0:ec559500a63f | 29 | |
| andrewbonney | 0:ec559500a63f | 30 | #include <queue> |
| andrewbonney | 0:ec559500a63f | 31 | using std::queue; |
| andrewbonney | 0:ec559500a63f | 32 | |
| andrewbonney | 0:ec559500a63f | 33 | //Implements a Berkeley-like socket if |
| andrewbonney | 0:ec559500a63f | 34 | //Can be interfaced either to lwip or a Telit module |
| andrewbonney | 0:ec559500a63f | 35 | |
| andrewbonney | 0:ec559500a63f | 36 | enum NetTcpSocketErr |
| andrewbonney | 0:ec559500a63f | 37 | { |
| andrewbonney | 0:ec559500a63f | 38 | __NETTCPSOCKET_MIN = -0xFFFF, |
| andrewbonney | 0:ec559500a63f | 39 | NETTCPSOCKET_SETUP, //NetTcpSocket not properly configured |
| andrewbonney | 0:ec559500a63f | 40 | NETTCPSOCKET_TIMEOUT, |
| andrewbonney | 0:ec559500a63f | 41 | NETTCPSOCKET_IF, //If has problems |
| andrewbonney | 0:ec559500a63f | 42 | NETTCPSOCKET_MEM, //Not enough mem |
| andrewbonney | 0:ec559500a63f | 43 | NETTCPSOCKET_INUSE, //If/Port is in use |
| andrewbonney | 0:ec559500a63f | 44 | NETTCPSOCKET_EMPTY, //Connections queue is empty |
| andrewbonney | 0:ec559500a63f | 45 | NETTCPSOCKET_RST, // Connection was reset by remote host |
| andrewbonney | 0:ec559500a63f | 46 | //... |
| andrewbonney | 0:ec559500a63f | 47 | NETTCPSOCKET_OK = 0 |
| andrewbonney | 0:ec559500a63f | 48 | }; |
| andrewbonney | 0:ec559500a63f | 49 | |
| andrewbonney | 0:ec559500a63f | 50 | enum NetTcpSocketEvent |
| andrewbonney | 0:ec559500a63f | 51 | { |
| andrewbonney | 0:ec559500a63f | 52 | NETTCPSOCKET_CONNECTED, //Connected to host, must call accept() if we were listening |
| andrewbonney | 0:ec559500a63f | 53 | NETTCPSOCKET_ACCEPT, //Connected to client |
| andrewbonney | 0:ec559500a63f | 54 | NETTCPSOCKET_READABLE, //Data in buf |
| andrewbonney | 0:ec559500a63f | 55 | NETTCPSOCKET_WRITEABLE, //Can write data to buf |
| andrewbonney | 0:ec559500a63f | 56 | NETTCPSOCKET_CONTIMEOUT, |
| andrewbonney | 0:ec559500a63f | 57 | NETTCPSOCKET_CONRST, |
| andrewbonney | 0:ec559500a63f | 58 | NETTCPSOCKET_CONABRT, |
| andrewbonney | 0:ec559500a63f | 59 | NETTCPSOCKET_ERROR, |
| andrewbonney | 0:ec559500a63f | 60 | NETTCPSOCKET_DISCONNECTED |
| andrewbonney | 0:ec559500a63f | 61 | }; |
| andrewbonney | 0:ec559500a63f | 62 | |
| andrewbonney | 0:ec559500a63f | 63 | |
| andrewbonney | 0:ec559500a63f | 64 | class NetTcpSocket |
| andrewbonney | 0:ec559500a63f | 65 | { |
| andrewbonney | 0:ec559500a63f | 66 | public: |
| andrewbonney | 0:ec559500a63f | 67 | NetTcpSocket(); |
| andrewbonney | 0:ec559500a63f | 68 | virtual ~NetTcpSocket(); //close() |
| andrewbonney | 0:ec559500a63f | 69 | |
| andrewbonney | 0:ec559500a63f | 70 | virtual NetTcpSocketErr bind(const Host& me) = 0; |
| andrewbonney | 0:ec559500a63f | 71 | virtual NetTcpSocketErr listen() = 0; |
| andrewbonney | 0:ec559500a63f | 72 | virtual NetTcpSocketErr connect(const Host& host) = 0; |
| andrewbonney | 0:ec559500a63f | 73 | virtual NetTcpSocketErr accept(Host* pClient, NetTcpSocket** ppNewNetTcpSocket) = 0; |
| andrewbonney | 0:ec559500a63f | 74 | |
| andrewbonney | 0:ec559500a63f | 75 | virtual int /*if < 0 : NetTcpSocketErr*/ send(const char* buf, int len) = 0; |
| andrewbonney | 0:ec559500a63f | 76 | virtual int /*if < 0 : NetTcpSocketErr*/ recv(char* buf, int len) = 0; |
| andrewbonney | 0:ec559500a63f | 77 | |
| andrewbonney | 0:ec559500a63f | 78 | virtual NetTcpSocketErr close() = 0; |
| andrewbonney | 0:ec559500a63f | 79 | |
| andrewbonney | 0:ec559500a63f | 80 | virtual NetTcpSocketErr poll() = 0; |
| andrewbonney | 0:ec559500a63f | 81 | |
| andrewbonney | 0:ec559500a63f | 82 | class CDummy; |
| andrewbonney | 0:ec559500a63f | 83 | //Callbacks |
| andrewbonney | 0:ec559500a63f | 84 | template<class T> |
| andrewbonney | 0:ec559500a63f | 85 | //Linker bug : Must be defined here :( |
| andrewbonney | 0:ec559500a63f | 86 | void setOnEvent( T* pItem, void (T::*pMethod)(NetTcpSocketEvent) ) |
| andrewbonney | 0:ec559500a63f | 87 | { |
| andrewbonney | 0:ec559500a63f | 88 | m_pCbItem = (CDummy*) pItem; |
| andrewbonney | 0:ec559500a63f | 89 | m_pCbMeth = (void (CDummy::*)(NetTcpSocketEvent)) pMethod; |
| andrewbonney | 0:ec559500a63f | 90 | } |
| andrewbonney | 0:ec559500a63f | 91 | |
| andrewbonney | 0:ec559500a63f | 92 | void resetOnEvent(); //Disable callback |
| andrewbonney | 0:ec559500a63f | 93 | |
| andrewbonney | 0:ec559500a63f | 94 | protected: |
| andrewbonney | 0:ec559500a63f | 95 | void queueEvent(NetTcpSocketEvent e); |
| andrewbonney | 0:ec559500a63f | 96 | void discardEvents(); |
| andrewbonney | 0:ec559500a63f | 97 | void flushEvents(); //to be called during polling |
| andrewbonney | 0:ec559500a63f | 98 | |
| andrewbonney | 0:ec559500a63f | 99 | Host m_host; |
| andrewbonney | 0:ec559500a63f | 100 | Host m_client; |
| andrewbonney | 0:ec559500a63f | 101 | |
| andrewbonney | 0:ec559500a63f | 102 | friend class Net; |
| andrewbonney | 0:ec559500a63f | 103 | int m_refs; |
| andrewbonney | 0:ec559500a63f | 104 | |
| andrewbonney | 0:ec559500a63f | 105 | bool m_closed; |
| andrewbonney | 0:ec559500a63f | 106 | bool m_removed; |
| andrewbonney | 0:ec559500a63f | 107 | |
| andrewbonney | 0:ec559500a63f | 108 | private: |
| andrewbonney | 0:ec559500a63f | 109 | //We do not want to execute user code in interrupt routines, so we queue events until the server is polled |
| andrewbonney | 0:ec559500a63f | 110 | //If we port this to a multithreaded OS, we could avoid this (however some functions here are not thread-safe, so beware ;) ) |
| andrewbonney | 0:ec559500a63f | 111 | void onEvent(NetTcpSocketEvent e); //To be called on poll |
| andrewbonney | 0:ec559500a63f | 112 | CDummy* m_pCbItem; |
| andrewbonney | 0:ec559500a63f | 113 | void (CDummy::*m_pCbMeth)(NetTcpSocketEvent); |
| andrewbonney | 0:ec559500a63f | 114 | queue<NetTcpSocketEvent> m_events; |
| andrewbonney | 0:ec559500a63f | 115 | |
| andrewbonney | 0:ec559500a63f | 116 | }; |
| andrewbonney | 0:ec559500a63f | 117 | |
| andrewbonney | 0:ec559500a63f | 118 | #endif |