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/lwip/lwipNetTcpSocket.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 LWIPNETTCPSOCKET_H |
| andrewbonney | 0:ec559500a63f | 25 | #define LWIPNETTCPSOCKET_H |
| andrewbonney | 0:ec559500a63f | 26 | |
| andrewbonney | 0:ec559500a63f | 27 | #define NET_LWIP_STACK 1 |
| andrewbonney | 0:ec559500a63f | 28 | #include "if/net/nettcpsocket.h" |
| andrewbonney | 0:ec559500a63f | 29 | #include "LwipNetIf.h" |
| andrewbonney | 0:ec559500a63f | 30 | |
| andrewbonney | 0:ec559500a63f | 31 | #include "stdint.h" |
| andrewbonney | 0:ec559500a63f | 32 | |
| andrewbonney | 0:ec559500a63f | 33 | //Implements NetTcpSockets over lwIP raw API |
| andrewbonney | 0:ec559500a63f | 34 | |
| andrewbonney | 0:ec559500a63f | 35 | struct tcp_pcb; //Represents a Tcp Connection, "Protocol Control Block", see rawapi.txt & tcp.h |
| andrewbonney | 0:ec559500a63f | 36 | struct pbuf; //Lwip Buffer Container |
| andrewbonney | 0:ec559500a63f | 37 | |
| andrewbonney | 0:ec559500a63f | 38 | typedef signed char err_t; |
| andrewbonney | 0:ec559500a63f | 39 | typedef uint16_t u16_t; |
| andrewbonney | 0:ec559500a63f | 40 | |
| andrewbonney | 0:ec559500a63f | 41 | class LwipNetTcpSocket: public NetTcpSocket |
| andrewbonney | 0:ec559500a63f | 42 | { |
| andrewbonney | 0:ec559500a63f | 43 | public: |
| andrewbonney | 0:ec559500a63f | 44 | LwipNetTcpSocket(tcp_pcb* pPcb = NULL); //Passes a pcb if already created (by an accept req for instance), in that case transfers ownership |
| andrewbonney | 0:ec559500a63f | 45 | virtual ~LwipNetTcpSocket(); |
| andrewbonney | 0:ec559500a63f | 46 | |
| andrewbonney | 0:ec559500a63f | 47 | virtual NetTcpSocketErr bind(const Host& me); |
| andrewbonney | 0:ec559500a63f | 48 | virtual NetTcpSocketErr listen(); |
| andrewbonney | 0:ec559500a63f | 49 | virtual NetTcpSocketErr connect(const Host& host); |
| andrewbonney | 0:ec559500a63f | 50 | virtual NetTcpSocketErr accept(Host* pClient, NetTcpSocket** ppNewNetTcpSocket); |
| andrewbonney | 0:ec559500a63f | 51 | |
| andrewbonney | 0:ec559500a63f | 52 | virtual int /*if < 0 : NetTcpSocketErr*/ send(const char* buf, int len); |
| andrewbonney | 0:ec559500a63f | 53 | virtual int /*if < 0 : NetTcpSocketErr*/ recv(char* buf, int len); |
| andrewbonney | 0:ec559500a63f | 54 | |
| andrewbonney | 0:ec559500a63f | 55 | virtual NetTcpSocketErr close(); |
| andrewbonney | 0:ec559500a63f | 56 | |
| andrewbonney | 0:ec559500a63f | 57 | virtual NetTcpSocketErr poll(); |
| andrewbonney | 0:ec559500a63f | 58 | |
| andrewbonney | 0:ec559500a63f | 59 | protected: |
| andrewbonney | 0:ec559500a63f | 60 | volatile tcp_pcb* m_pPcb; |
| andrewbonney | 0:ec559500a63f | 61 | |
| andrewbonney | 0:ec559500a63f | 62 | //Events callbacks from lwIp |
| andrewbonney | 0:ec559500a63f | 63 | err_t acceptCb(tcp_pcb* newpcb, err_t err); |
| andrewbonney | 0:ec559500a63f | 64 | err_t connectedCb(tcp_pcb* tpcb, err_t err); |
| andrewbonney | 0:ec559500a63f | 65 | |
| andrewbonney | 0:ec559500a63f | 66 | void errCb(err_t err); |
| andrewbonney | 0:ec559500a63f | 67 | |
| andrewbonney | 0:ec559500a63f | 68 | err_t sentCb(tcp_pcb* tpcb, u16_t len); |
| andrewbonney | 0:ec559500a63f | 69 | err_t recvCb(tcp_pcb* tpcb, pbuf *p, err_t err); |
| andrewbonney | 0:ec559500a63f | 70 | |
| andrewbonney | 0:ec559500a63f | 71 | private: |
| andrewbonney | 0:ec559500a63f | 72 | void cleanUp(); //Flush input buffer |
| andrewbonney | 0:ec559500a63f | 73 | |
| andrewbonney | 0:ec559500a63f | 74 | // queue<tcp_pcb*> m_lpInPcb; //Incoming connections that have not been accepted yet |
| andrewbonney | 0:ec559500a63f | 75 | queue<LwipNetTcpSocket*> m_lpInNetTcpSocket; //Incoming connections that have not been accepted yet |
| andrewbonney | 0:ec559500a63f | 76 | |
| andrewbonney | 0:ec559500a63f | 77 | volatile pbuf* m_pReadPbuf; //Ptr to read buffer |
| andrewbonney | 0:ec559500a63f | 78 | |
| andrewbonney | 0:ec559500a63f | 79 | //Static callbacks : Transforms into a C++ callback |
| andrewbonney | 0:ec559500a63f | 80 | static err_t sAcceptCb(void *arg, struct tcp_pcb *newpcb, err_t err); |
| andrewbonney | 0:ec559500a63f | 81 | static err_t sConnectedCb(void *arg, struct tcp_pcb *tpcb, err_t err); |
| andrewbonney | 0:ec559500a63f | 82 | |
| andrewbonney | 0:ec559500a63f | 83 | static void sErrCb(void *arg, err_t err); |
| andrewbonney | 0:ec559500a63f | 84 | |
| andrewbonney | 0:ec559500a63f | 85 | static err_t sSentCb(void *arg, struct tcp_pcb *tpcb, u16_t len); |
| andrewbonney | 0:ec559500a63f | 86 | static err_t sRecvCb(void *arg, struct tcp_pcb *tpcb, struct pbuf *p, err_t err); |
| andrewbonney | 0:ec559500a63f | 87 | |
| andrewbonney | 0:ec559500a63f | 88 | }; |
| andrewbonney | 0:ec559500a63f | 89 | |
| andrewbonney | 0:ec559500a63f | 90 | #endif |