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.

Committer:
andrewbonney
Date:
Fri Apr 08 14:39:41 2011 +0000
Revision:
0:ec559500a63f

        

Who changed what in which revision?

UserRevisionLine numberNew 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 LWIPNETUDPSOCKET_H
andrewbonney 0:ec559500a63f 25 #define LWIPNETUDPSOCKET_H
andrewbonney 0:ec559500a63f 26
andrewbonney 0:ec559500a63f 27 #define NET_LWIP_STACK 1
andrewbonney 0:ec559500a63f 28 //#include "lwip/ip_addr.h"
andrewbonney 0:ec559500a63f 29 #include "if/net/netudpsocket.h"
andrewbonney 0:ec559500a63f 30 #include "LwipNetIf.h"
andrewbonney 0:ec559500a63f 31
andrewbonney 0:ec559500a63f 32 #include "stdint.h"
andrewbonney 0:ec559500a63f 33
andrewbonney 0:ec559500a63f 34 #include <list>
andrewbonney 0:ec559500a63f 35 using std::list;
andrewbonney 0:ec559500a63f 36
andrewbonney 0:ec559500a63f 37 //Implements NetUdpSockets over lwIP raw API
andrewbonney 0:ec559500a63f 38
andrewbonney 0:ec559500a63f 39 struct udp_pcb; //Represents a Udp Connection, "Protocol Control Block", see rawapi.txt & udp.h
andrewbonney 0:ec559500a63f 40 struct pbuf; //Lwip Buffer Container
andrewbonney 0:ec559500a63f 41 typedef struct ip_addr ip_addr_t;
andrewbonney 0:ec559500a63f 42
andrewbonney 0:ec559500a63f 43 //typedef signed char err_t;
andrewbonney 0:ec559500a63f 44 typedef uint16_t u16_t;
andrewbonney 0:ec559500a63f 45
andrewbonney 0:ec559500a63f 46 class LwipNetUdpSocket: public NetUdpSocket
andrewbonney 0:ec559500a63f 47 {
andrewbonney 0:ec559500a63f 48 public:
andrewbonney 0:ec559500a63f 49 LwipNetUdpSocket(udp_pcb* pPcb = NULL); //Passes a pcb if already created (by an accept req for instance), in that case transfers ownership
andrewbonney 0:ec559500a63f 50 virtual ~LwipNetUdpSocket();
andrewbonney 0:ec559500a63f 51
andrewbonney 0:ec559500a63f 52 virtual NetUdpSocketErr bind(const Host& me);
andrewbonney 0:ec559500a63f 53
andrewbonney 0:ec559500a63f 54 virtual int /*if < 0 : NetUdpSocketErr*/ sendto(const char* buf, int len, Host* pHost);
andrewbonney 0:ec559500a63f 55 virtual int /*if < 0 : NetUdpSocketErr*/ recvfrom(char* buf, int len, Host* pHost);
andrewbonney 0:ec559500a63f 56
andrewbonney 0:ec559500a63f 57 virtual NetUdpSocketErr close();
andrewbonney 0:ec559500a63f 58
andrewbonney 0:ec559500a63f 59 virtual NetUdpSocketErr poll();
andrewbonney 0:ec559500a63f 60
andrewbonney 0:ec559500a63f 61 protected:
andrewbonney 0:ec559500a63f 62 volatile udp_pcb* m_pPcb;
andrewbonney 0:ec559500a63f 63
andrewbonney 0:ec559500a63f 64 //Event callback from lwIp
andrewbonney 0:ec559500a63f 65 void recvCb(udp_pcb* pcb, struct pbuf* p, ip_addr_t* addr, u16_t port);
andrewbonney 0:ec559500a63f 66
andrewbonney 0:ec559500a63f 67 private:
andrewbonney 0:ec559500a63f 68 void cleanUp(); //Flush input buffer
andrewbonney 0:ec559500a63f 69 struct InPacket
andrewbonney 0:ec559500a63f 70 {
andrewbonney 0:ec559500a63f 71 volatile pbuf* pBuf;
andrewbonney 0:ec559500a63f 72 ip_addr_t addr;
andrewbonney 0:ec559500a63f 73 u16_t port;
andrewbonney 0:ec559500a63f 74 };
andrewbonney 0:ec559500a63f 75
andrewbonney 0:ec559500a63f 76 list<InPacket> m_lInPkt;
andrewbonney 0:ec559500a63f 77 IpAddr m_multicastGroup;
andrewbonney 0:ec559500a63f 78
andrewbonney 0:ec559500a63f 79 //Static callback : Transforms into a C++ callback
andrewbonney 0:ec559500a63f 80 static void sRecvCb(void *arg, struct udp_pcb *pcb, struct pbuf *p, ip_addr_t *addr, u16_t port);
andrewbonney 0:ec559500a63f 81
andrewbonney 0:ec559500a63f 82 };
andrewbonney 0:ec559500a63f 83
andrewbonney 0:ec559500a63f 84 #endif