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 * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
andrewbonney 0:ec559500a63f 3 * All rights reserved.
andrewbonney 0:ec559500a63f 4 *
andrewbonney 0:ec559500a63f 5 * Redistribution and use in source and binary forms, with or without modification,
andrewbonney 0:ec559500a63f 6 * are permitted provided that the following conditions are met:
andrewbonney 0:ec559500a63f 7 *
andrewbonney 0:ec559500a63f 8 * 1. Redistributions of source code must retain the above copyright notice,
andrewbonney 0:ec559500a63f 9 * this list of conditions and the following disclaimer.
andrewbonney 0:ec559500a63f 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
andrewbonney 0:ec559500a63f 11 * this list of conditions and the following disclaimer in the documentation
andrewbonney 0:ec559500a63f 12 * and/or other materials provided with the distribution.
andrewbonney 0:ec559500a63f 13 * 3. The name of the author may not be used to endorse or promote products
andrewbonney 0:ec559500a63f 14 * derived from this software without specific prior written permission.
andrewbonney 0:ec559500a63f 15 *
andrewbonney 0:ec559500a63f 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
andrewbonney 0:ec559500a63f 17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
andrewbonney 0:ec559500a63f 18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
andrewbonney 0:ec559500a63f 19 * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
andrewbonney 0:ec559500a63f 20 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
andrewbonney 0:ec559500a63f 21 * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
andrewbonney 0:ec559500a63f 22 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
andrewbonney 0:ec559500a63f 23 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
andrewbonney 0:ec559500a63f 24 * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
andrewbonney 0:ec559500a63f 25 * OF SUCH DAMAGE.
andrewbonney 0:ec559500a63f 26 *
andrewbonney 0:ec559500a63f 27 * This file is part of the lwIP TCP/IP stack.
andrewbonney 0:ec559500a63f 28 *
andrewbonney 0:ec559500a63f 29 * Author: Adam Dunkels <adam@sics.se>
andrewbonney 0:ec559500a63f 30 *
andrewbonney 0:ec559500a63f 31 */
andrewbonney 0:ec559500a63f 32 #ifndef __LWIP_IP_H__
andrewbonney 0:ec559500a63f 33 #define __LWIP_IP_H__
andrewbonney 0:ec559500a63f 34
andrewbonney 0:ec559500a63f 35 #include "lwip/opt.h"
andrewbonney 0:ec559500a63f 36
andrewbonney 0:ec559500a63f 37 #include "lwip/def.h"
andrewbonney 0:ec559500a63f 38 #include "lwip/pbuf.h"
andrewbonney 0:ec559500a63f 39 #include "lwip/ip_addr.h"
andrewbonney 0:ec559500a63f 40 #include "lwip/err.h"
andrewbonney 0:ec559500a63f 41 #include "lwip/netif.h"
andrewbonney 0:ec559500a63f 42
andrewbonney 0:ec559500a63f 43 #ifdef __cplusplus
andrewbonney 0:ec559500a63f 44 extern "C" {
andrewbonney 0:ec559500a63f 45 #endif
andrewbonney 0:ec559500a63f 46
andrewbonney 0:ec559500a63f 47 /** Currently, the function ip_output_if_opt() is only used with IGMP */
andrewbonney 0:ec559500a63f 48 #define IP_OPTIONS_SEND LWIP_IGMP
andrewbonney 0:ec559500a63f 49
andrewbonney 0:ec559500a63f 50 #define IP_HLEN 20
andrewbonney 0:ec559500a63f 51
andrewbonney 0:ec559500a63f 52 #define IP_PROTO_ICMP 1
andrewbonney 0:ec559500a63f 53 #define IP_PROTO_IGMP 2
andrewbonney 0:ec559500a63f 54 #define IP_PROTO_UDP 17
andrewbonney 0:ec559500a63f 55 #define IP_PROTO_UDPLITE 136
andrewbonney 0:ec559500a63f 56 #define IP_PROTO_TCP 6
andrewbonney 0:ec559500a63f 57
andrewbonney 0:ec559500a63f 58 /* This is passed as the destination address to ip_output_if (not
andrewbonney 0:ec559500a63f 59 to ip_output), meaning that an IP header already is constructed
andrewbonney 0:ec559500a63f 60 in the pbuf. This is used when TCP retransmits. */
andrewbonney 0:ec559500a63f 61 #ifdef IP_HDRINCL
andrewbonney 0:ec559500a63f 62 #undef IP_HDRINCL
andrewbonney 0:ec559500a63f 63 #endif /* IP_HDRINCL */
andrewbonney 0:ec559500a63f 64 #define IP_HDRINCL NULL
andrewbonney 0:ec559500a63f 65
andrewbonney 0:ec559500a63f 66 #if LWIP_NETIF_HWADDRHINT
andrewbonney 0:ec559500a63f 67 #define IP_PCB_ADDRHINT ;u8_t addr_hint
andrewbonney 0:ec559500a63f 68 #else
andrewbonney 0:ec559500a63f 69 #define IP_PCB_ADDRHINT
andrewbonney 0:ec559500a63f 70 #endif /* LWIP_NETIF_HWADDRHINT */
andrewbonney 0:ec559500a63f 71
andrewbonney 0:ec559500a63f 72 /* This is the common part of all PCB types. It needs to be at the
andrewbonney 0:ec559500a63f 73 beginning of a PCB type definition. It is located here so that
andrewbonney 0:ec559500a63f 74 changes to this common part are made in one location instead of
andrewbonney 0:ec559500a63f 75 having to change all PCB structs. */
andrewbonney 0:ec559500a63f 76 #define IP_PCB \
andrewbonney 0:ec559500a63f 77 /* ip addresses in network byte order */ \
andrewbonney 0:ec559500a63f 78 ip_addr_t local_ip; \
andrewbonney 0:ec559500a63f 79 ip_addr_t remote_ip; \
andrewbonney 0:ec559500a63f 80 /* Socket options */ \
andrewbonney 0:ec559500a63f 81 u8_t so_options; \
andrewbonney 0:ec559500a63f 82 /* Type Of Service */ \
andrewbonney 0:ec559500a63f 83 u8_t tos; \
andrewbonney 0:ec559500a63f 84 /* Time To Live */ \
andrewbonney 0:ec559500a63f 85 u8_t ttl \
andrewbonney 0:ec559500a63f 86 /* link layer address resolution hint */ \
andrewbonney 0:ec559500a63f 87 IP_PCB_ADDRHINT
andrewbonney 0:ec559500a63f 88
andrewbonney 0:ec559500a63f 89 struct ip_pcb {
andrewbonney 0:ec559500a63f 90 /* Common members of all PCB types */
andrewbonney 0:ec559500a63f 91 IP_PCB;
andrewbonney 0:ec559500a63f 92 };
andrewbonney 0:ec559500a63f 93
andrewbonney 0:ec559500a63f 94 /*
andrewbonney 0:ec559500a63f 95 * Option flags per-socket. These are the same like SO_XXX.
andrewbonney 0:ec559500a63f 96 */
andrewbonney 0:ec559500a63f 97 /*#define SOF_DEBUG (u8_t)0x01U Unimplemented: turn on debugging info recording */
andrewbonney 0:ec559500a63f 98 #define SOF_ACCEPTCONN (u8_t)0x02U /* socket has had listen() */
andrewbonney 0:ec559500a63f 99 #define SOF_REUSEADDR (u8_t)0x04U /* allow local address reuse */
andrewbonney 0:ec559500a63f 100 #define SOF_KEEPALIVE (u8_t)0x08U /* keep connections alive */
andrewbonney 0:ec559500a63f 101 /*#define SOF_DONTROUTE (u8_t)0x10U Unimplemented: just use interface addresses */
andrewbonney 0:ec559500a63f 102 #define SOF_BROADCAST (u8_t)0x20U /* permit to send and to receive broadcast messages (see IP_SOF_BROADCAST option) */
andrewbonney 0:ec559500a63f 103 /*#define SOF_USELOOPBACK (u8_t)0x40U Unimplemented: bypass hardware when possible */
andrewbonney 0:ec559500a63f 104 #define SOF_LINGER (u8_t)0x80U /* linger on close if data present */
andrewbonney 0:ec559500a63f 105 /*#define SOF_OOBINLINE (u16_t)0x0100U Unimplemented: leave received OOB data in line */
andrewbonney 0:ec559500a63f 106 /*#define SOF_REUSEPORT (u16_t)0x0200U Unimplemented: allow local address & port reuse */
andrewbonney 0:ec559500a63f 107
andrewbonney 0:ec559500a63f 108 /* These flags are inherited (e.g. from a listen-pcb to a connection-pcb): */
andrewbonney 0:ec559500a63f 109 #define SOF_INHERITED (SOF_REUSEADDR|SOF_KEEPALIVE|SOF_LINGER/*|SOF_DEBUG|SOF_DONTROUTE|SOF_OOBINLINE*/)
andrewbonney 0:ec559500a63f 110
andrewbonney 0:ec559500a63f 111
andrewbonney 0:ec559500a63f 112 #ifdef PACK_STRUCT_USE_INCLUDES
andrewbonney 0:ec559500a63f 113 # include "arch/bpstruct.h"
andrewbonney 0:ec559500a63f 114 #endif
andrewbonney 0:ec559500a63f 115 PACK_STRUCT_BEGIN
andrewbonney 0:ec559500a63f 116 struct ip_hdr {
andrewbonney 0:ec559500a63f 117 /* version / header length / type of service */
andrewbonney 0:ec559500a63f 118 PACK_STRUCT_FIELD(u16_t _v_hl_tos);
andrewbonney 0:ec559500a63f 119 /* total length */
andrewbonney 0:ec559500a63f 120 PACK_STRUCT_FIELD(u16_t _len);
andrewbonney 0:ec559500a63f 121 /* identification */
andrewbonney 0:ec559500a63f 122 PACK_STRUCT_FIELD(u16_t _id);
andrewbonney 0:ec559500a63f 123 /* fragment offset field */
andrewbonney 0:ec559500a63f 124 PACK_STRUCT_FIELD(u16_t _offset);
andrewbonney 0:ec559500a63f 125 #define IP_RF 0x8000 /* reserved fragment flag */
andrewbonney 0:ec559500a63f 126 #define IP_DF 0x4000 /* dont fragment flag */
andrewbonney 0:ec559500a63f 127 #define IP_MF 0x2000 /* more fragments flag */
andrewbonney 0:ec559500a63f 128 #define IP_OFFMASK 0x1fff /* mask for fragmenting bits */
andrewbonney 0:ec559500a63f 129 /* time to live */
andrewbonney 0:ec559500a63f 130 PACK_STRUCT_FIELD(u8_t _ttl);
andrewbonney 0:ec559500a63f 131 /* protocol*/
andrewbonney 0:ec559500a63f 132 PACK_STRUCT_FIELD(u8_t _proto);
andrewbonney 0:ec559500a63f 133 /* checksum */
andrewbonney 0:ec559500a63f 134 PACK_STRUCT_FIELD(u16_t _chksum);
andrewbonney 0:ec559500a63f 135 /* source and destination IP addresses */
andrewbonney 0:ec559500a63f 136 PACK_STRUCT_FIELD(ip_addr_p_t src);
andrewbonney 0:ec559500a63f 137 PACK_STRUCT_FIELD(ip_addr_p_t dest);
andrewbonney 0:ec559500a63f 138 } PACK_STRUCT_STRUCT;
andrewbonney 0:ec559500a63f 139 PACK_STRUCT_END
andrewbonney 0:ec559500a63f 140 #ifdef PACK_STRUCT_USE_INCLUDES
andrewbonney 0:ec559500a63f 141 # include "arch/epstruct.h"
andrewbonney 0:ec559500a63f 142 #endif
andrewbonney 0:ec559500a63f 143
andrewbonney 0:ec559500a63f 144 #define IPH_V(hdr) (ntohs((hdr)->_v_hl_tos) >> 12)
andrewbonney 0:ec559500a63f 145 #define IPH_HL(hdr) ((ntohs((hdr)->_v_hl_tos) >> 8) & 0x0f)
andrewbonney 0:ec559500a63f 146 #define IPH_TOS(hdr) (ntohs((hdr)->_v_hl_tos) & 0xff)
andrewbonney 0:ec559500a63f 147 #define IPH_LEN(hdr) ((hdr)->_len)
andrewbonney 0:ec559500a63f 148 #define IPH_ID(hdr) ((hdr)->_id)
andrewbonney 0:ec559500a63f 149 #define IPH_OFFSET(hdr) ((hdr)->_offset)
andrewbonney 0:ec559500a63f 150 #define IPH_TTL(hdr) ((hdr)->_ttl)
andrewbonney 0:ec559500a63f 151 #define IPH_PROTO(hdr) ((hdr)->_proto)
andrewbonney 0:ec559500a63f 152 #define IPH_CHKSUM(hdr) ((hdr)->_chksum)
andrewbonney 0:ec559500a63f 153
andrewbonney 0:ec559500a63f 154 #define IPH_VHLTOS_SET(hdr, v, hl, tos) (hdr)->_v_hl_tos = (htons(((v) << 12) | ((hl) << 8) | (tos)))
andrewbonney 0:ec559500a63f 155 #define IPH_LEN_SET(hdr, len) (hdr)->_len = (len)
andrewbonney 0:ec559500a63f 156 #define IPH_ID_SET(hdr, id) (hdr)->_id = (id)
andrewbonney 0:ec559500a63f 157 #define IPH_OFFSET_SET(hdr, off) (hdr)->_offset = (off)
andrewbonney 0:ec559500a63f 158 #define IPH_TTL_SET(hdr, ttl) (hdr)->_ttl = (u8_t)(ttl)
andrewbonney 0:ec559500a63f 159 #define IPH_PROTO_SET(hdr, proto) (hdr)->_proto = (u8_t)(proto)
andrewbonney 0:ec559500a63f 160 #define IPH_CHKSUM_SET(hdr, chksum) (hdr)->_chksum = (chksum)
andrewbonney 0:ec559500a63f 161
andrewbonney 0:ec559500a63f 162 /** The interface that provided the packet for the current callback invocation. */
andrewbonney 0:ec559500a63f 163 extern struct netif *current_netif;
andrewbonney 0:ec559500a63f 164 /** Header of the input packet currently being processed. */
andrewbonney 0:ec559500a63f 165 extern const struct ip_hdr *current_header;
andrewbonney 0:ec559500a63f 166 /** Source IP address of current_header */
andrewbonney 0:ec559500a63f 167 extern ip_addr_t current_iphdr_src;
andrewbonney 0:ec559500a63f 168 /** Destination IP address of current_header */
andrewbonney 0:ec559500a63f 169 extern ip_addr_t current_iphdr_dest;
andrewbonney 0:ec559500a63f 170
andrewbonney 0:ec559500a63f 171 #define ip_init() /* Compatibility define, not init needed. */
andrewbonney 0:ec559500a63f 172 struct netif *ip_route(ip_addr_t *dest);
andrewbonney 0:ec559500a63f 173 err_t ip_input(struct pbuf *p, struct netif *inp);
andrewbonney 0:ec559500a63f 174 err_t ip_output(struct pbuf *p, ip_addr_t *src, ip_addr_t *dest,
andrewbonney 0:ec559500a63f 175 u8_t ttl, u8_t tos, u8_t proto);
andrewbonney 0:ec559500a63f 176 err_t ip_output_if(struct pbuf *p, ip_addr_t *src, ip_addr_t *dest,
andrewbonney 0:ec559500a63f 177 u8_t ttl, u8_t tos, u8_t proto,
andrewbonney 0:ec559500a63f 178 struct netif *netif);
andrewbonney 0:ec559500a63f 179 #if LWIP_NETIF_HWADDRHINT
andrewbonney 0:ec559500a63f 180 err_t ip_output_hinted(struct pbuf *p, ip_addr_t *src, ip_addr_t *dest,
andrewbonney 0:ec559500a63f 181 u8_t ttl, u8_t tos, u8_t proto, u8_t *addr_hint);
andrewbonney 0:ec559500a63f 182 #endif /* LWIP_NETIF_HWADDRHINT */
andrewbonney 0:ec559500a63f 183 #if IP_OPTIONS_SEND
andrewbonney 0:ec559500a63f 184 err_t ip_output_if_opt(struct pbuf *p, ip_addr_t *src, ip_addr_t *dest,
andrewbonney 0:ec559500a63f 185 u8_t ttl, u8_t tos, u8_t proto, struct netif *netif, void *ip_options,
andrewbonney 0:ec559500a63f 186 u16_t optlen);
andrewbonney 0:ec559500a63f 187 #endif /* IP_OPTIONS_SEND */
andrewbonney 0:ec559500a63f 188 /** Get the interface that received the current packet.
andrewbonney 0:ec559500a63f 189 * This function must only be called from a receive callback (udp_recv,
andrewbonney 0:ec559500a63f 190 * raw_recv, tcp_accept). It will return NULL otherwise. */
andrewbonney 0:ec559500a63f 191 #define ip_current_netif() (current_netif)
andrewbonney 0:ec559500a63f 192 /** Get the IP header of the current packet.
andrewbonney 0:ec559500a63f 193 * This function must only be called from a receive callback (udp_recv,
andrewbonney 0:ec559500a63f 194 * raw_recv, tcp_accept). It will return NULL otherwise. */
andrewbonney 0:ec559500a63f 195 #define ip_current_header() (current_header)
andrewbonney 0:ec559500a63f 196 /** Source IP address of current_header */
andrewbonney 0:ec559500a63f 197 #define ip_current_src_addr() (&current_iphdr_src)
andrewbonney 0:ec559500a63f 198 /** Destination IP address of current_header */
andrewbonney 0:ec559500a63f 199 #define ip_current_dest_addr() (&current_iphdr_dest)
andrewbonney 0:ec559500a63f 200
andrewbonney 0:ec559500a63f 201 #if IP_DEBUG
andrewbonney 0:ec559500a63f 202 void ip_debug_print(struct pbuf *p);
andrewbonney 0:ec559500a63f 203 #else
andrewbonney 0:ec559500a63f 204 #define ip_debug_print(p)
andrewbonney 0:ec559500a63f 205 #endif /* IP_DEBUG */
andrewbonney 0:ec559500a63f 206
andrewbonney 0:ec559500a63f 207 #ifdef __cplusplus
andrewbonney 0:ec559500a63f 208 }
andrewbonney 0:ec559500a63f 209 #endif
andrewbonney 0:ec559500a63f 210
andrewbonney 0:ec559500a63f 211 #endif /* __LWIP_IP_H__ */
andrewbonney 0:ec559500a63f 212
andrewbonney 0:ec559500a63f 213