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 * SETUP: Make sure we define everything we will need.
andrewbonney 0:ec559500a63f 3 *
andrewbonney 0:ec559500a63f 4 * We have create three types of pools:
andrewbonney 0:ec559500a63f 5 * 1) MEMPOOL - standard pools
andrewbonney 0:ec559500a63f 6 * 2) MALLOC_MEMPOOL - to be used by mem_malloc in mem.c
andrewbonney 0:ec559500a63f 7 * 3) PBUF_MEMPOOL - a mempool of pbuf's, so include space for the pbuf struct
andrewbonney 0:ec559500a63f 8 *
andrewbonney 0:ec559500a63f 9 * If the include'r doesn't require any special treatment of each of the types
andrewbonney 0:ec559500a63f 10 * above, then will declare #2 & #3 to be just standard mempools.
andrewbonney 0:ec559500a63f 11 */
andrewbonney 0:ec559500a63f 12 #ifndef LWIP_MALLOC_MEMPOOL
andrewbonney 0:ec559500a63f 13 /* This treats "malloc pools" just like any other pool.
andrewbonney 0:ec559500a63f 14 The pools are a little bigger to provide 'size' as the amount of user data. */
andrewbonney 0:ec559500a63f 15 #define LWIP_MALLOC_MEMPOOL(num, size) LWIP_MEMPOOL(POOL_##size, num, (size + sizeof(struct memp_malloc_helper)), "MALLOC_"#size)
andrewbonney 0:ec559500a63f 16 #define LWIP_MALLOC_MEMPOOL_START
andrewbonney 0:ec559500a63f 17 #define LWIP_MALLOC_MEMPOOL_END
andrewbonney 0:ec559500a63f 18 #endif /* LWIP_MALLOC_MEMPOOL */
andrewbonney 0:ec559500a63f 19
andrewbonney 0:ec559500a63f 20 #ifndef LWIP_PBUF_MEMPOOL
andrewbonney 0:ec559500a63f 21 /* This treats "pbuf pools" just like any other pool.
andrewbonney 0:ec559500a63f 22 * Allocates buffers for a pbuf struct AND a payload size */
andrewbonney 0:ec559500a63f 23 #define LWIP_PBUF_MEMPOOL(name, num, payload, desc) LWIP_MEMPOOL(name, num, (MEMP_ALIGN_SIZE(sizeof(struct pbuf)) + MEMP_ALIGN_SIZE(payload)), desc)
andrewbonney 0:ec559500a63f 24 #endif /* LWIP_PBUF_MEMPOOL */
andrewbonney 0:ec559500a63f 25
andrewbonney 0:ec559500a63f 26
andrewbonney 0:ec559500a63f 27 /*
andrewbonney 0:ec559500a63f 28 * A list of internal pools used by LWIP.
andrewbonney 0:ec559500a63f 29 *
andrewbonney 0:ec559500a63f 30 * LWIP_MEMPOOL(pool_name, number_elements, element_size, pool_description)
andrewbonney 0:ec559500a63f 31 * creates a pool name MEMP_pool_name. description is used in stats.c
andrewbonney 0:ec559500a63f 32 */
andrewbonney 0:ec559500a63f 33 #if LWIP_RAW
andrewbonney 0:ec559500a63f 34 LWIP_MEMPOOL(RAW_PCB, MEMP_NUM_RAW_PCB, sizeof(struct raw_pcb), "RAW_PCB")
andrewbonney 0:ec559500a63f 35 #endif /* LWIP_RAW */
andrewbonney 0:ec559500a63f 36
andrewbonney 0:ec559500a63f 37 #if LWIP_UDP
andrewbonney 0:ec559500a63f 38 LWIP_MEMPOOL(UDP_PCB, MEMP_NUM_UDP_PCB, sizeof(struct udp_pcb), "UDP_PCB")
andrewbonney 0:ec559500a63f 39 #endif /* LWIP_UDP */
andrewbonney 0:ec559500a63f 40
andrewbonney 0:ec559500a63f 41 #if LWIP_TCP
andrewbonney 0:ec559500a63f 42 LWIP_MEMPOOL(TCP_PCB, MEMP_NUM_TCP_PCB, sizeof(struct tcp_pcb), "TCP_PCB")
andrewbonney 0:ec559500a63f 43 LWIP_MEMPOOL(TCP_PCB_LISTEN, MEMP_NUM_TCP_PCB_LISTEN, sizeof(struct tcp_pcb_listen), "TCP_PCB_LISTEN")
andrewbonney 0:ec559500a63f 44 LWIP_MEMPOOL(TCP_SEG, MEMP_NUM_TCP_SEG, sizeof(struct tcp_seg), "TCP_SEG")
andrewbonney 0:ec559500a63f 45 #endif /* LWIP_TCP */
andrewbonney 0:ec559500a63f 46
andrewbonney 0:ec559500a63f 47 #if IP_REASSEMBLY
andrewbonney 0:ec559500a63f 48 LWIP_MEMPOOL(REASSDATA, MEMP_NUM_REASSDATA, sizeof(struct ip_reassdata), "REASSDATA")
andrewbonney 0:ec559500a63f 49 #endif /* IP_REASSEMBLY */
andrewbonney 0:ec559500a63f 50 #if IP_FRAG && !IP_FRAG_USES_STATIC_BUF && !LWIP_NETIF_TX_SINGLE_PBUF
andrewbonney 0:ec559500a63f 51 LWIP_MEMPOOL(FRAG_PBUF, MEMP_NUM_FRAG_PBUF, sizeof(struct pbuf_custom_ref),"FRAG_PBUF")
andrewbonney 0:ec559500a63f 52 #endif /* IP_FRAG && !IP_FRAG_USES_STATIC_BUF && !LWIP_NETIF_TX_SINGLE_PBUF */
andrewbonney 0:ec559500a63f 53
andrewbonney 0:ec559500a63f 54 #if LWIP_NETCONN
andrewbonney 0:ec559500a63f 55 LWIP_MEMPOOL(NETBUF, MEMP_NUM_NETBUF, sizeof(struct netbuf), "NETBUF")
andrewbonney 0:ec559500a63f 56 LWIP_MEMPOOL(NETCONN, MEMP_NUM_NETCONN, sizeof(struct netconn), "NETCONN")
andrewbonney 0:ec559500a63f 57 #endif /* LWIP_NETCONN */
andrewbonney 0:ec559500a63f 58
andrewbonney 0:ec559500a63f 59 #if NO_SYS==0
andrewbonney 0:ec559500a63f 60 LWIP_MEMPOOL(TCPIP_MSG_API, MEMP_NUM_TCPIP_MSG_API, sizeof(struct tcpip_msg), "TCPIP_MSG_API")
andrewbonney 0:ec559500a63f 61 #if !LWIP_TCPIP_CORE_LOCKING_INPUT
andrewbonney 0:ec559500a63f 62 LWIP_MEMPOOL(TCPIP_MSG_INPKT,MEMP_NUM_TCPIP_MSG_INPKT, sizeof(struct tcpip_msg), "TCPIP_MSG_INPKT")
andrewbonney 0:ec559500a63f 63 #endif /* !LWIP_TCPIP_CORE_LOCKING_INPUT */
andrewbonney 0:ec559500a63f 64 #endif /* NO_SYS==0 */
andrewbonney 0:ec559500a63f 65
andrewbonney 0:ec559500a63f 66 #if ARP_QUEUEING
andrewbonney 0:ec559500a63f 67 LWIP_MEMPOOL(ARP_QUEUE, MEMP_NUM_ARP_QUEUE, sizeof(struct etharp_q_entry), "ARP_QUEUE")
andrewbonney 0:ec559500a63f 68 #endif /* ARP_QUEUEING */
andrewbonney 0:ec559500a63f 69
andrewbonney 0:ec559500a63f 70 #if LWIP_IGMP
andrewbonney 0:ec559500a63f 71 LWIP_MEMPOOL(IGMP_GROUP, MEMP_NUM_IGMP_GROUP, sizeof(struct igmp_group), "IGMP_GROUP")
andrewbonney 0:ec559500a63f 72 #endif /* LWIP_IGMP */
andrewbonney 0:ec559500a63f 73
andrewbonney 0:ec559500a63f 74 #if (!NO_SYS || (NO_SYS && !NO_SYS_NO_TIMERS)) /* LWIP_TIMERS */
andrewbonney 0:ec559500a63f 75 LWIP_MEMPOOL(SYS_TIMEOUT, MEMP_NUM_SYS_TIMEOUT, sizeof(struct sys_timeo), "SYS_TIMEOUT")
andrewbonney 0:ec559500a63f 76 #endif /* LWIP_TIMERS */
andrewbonney 0:ec559500a63f 77
andrewbonney 0:ec559500a63f 78 #if LWIP_SNMP
andrewbonney 0:ec559500a63f 79 LWIP_MEMPOOL(SNMP_ROOTNODE, MEMP_NUM_SNMP_ROOTNODE, sizeof(struct mib_list_rootnode), "SNMP_ROOTNODE")
andrewbonney 0:ec559500a63f 80 LWIP_MEMPOOL(SNMP_NODE, MEMP_NUM_SNMP_NODE, sizeof(struct mib_list_node), "SNMP_NODE")
andrewbonney 0:ec559500a63f 81 LWIP_MEMPOOL(SNMP_VARBIND, MEMP_NUM_SNMP_VARBIND, sizeof(struct snmp_varbind), "SNMP_VARBIND")
andrewbonney 0:ec559500a63f 82 LWIP_MEMPOOL(SNMP_VALUE, MEMP_NUM_SNMP_VALUE, SNMP_MAX_VALUE_SIZE, "SNMP_VALUE")
andrewbonney 0:ec559500a63f 83 #endif /* LWIP_SNMP */
andrewbonney 0:ec559500a63f 84 #if LWIP_DNS && LWIP_SOCKET
andrewbonney 0:ec559500a63f 85 LWIP_MEMPOOL(NETDB, MEMP_NUM_NETDB, NETDB_ELEM_SIZE, "NETDB")
andrewbonney 0:ec559500a63f 86 #endif /* LWIP_DNS && LWIP_SOCKET */
andrewbonney 0:ec559500a63f 87 #if LWIP_DNS && DNS_LOCAL_HOSTLIST && DNS_LOCAL_HOSTLIST_IS_DYNAMIC
andrewbonney 0:ec559500a63f 88 LWIP_MEMPOOL(LOCALHOSTLIST, MEMP_NUM_LOCALHOSTLIST, LOCALHOSTLIST_ELEM_SIZE, "LOCALHOSTLIST")
andrewbonney 0:ec559500a63f 89 #endif /* LWIP_DNS && DNS_LOCAL_HOSTLIST && DNS_LOCAL_HOSTLIST_IS_DYNAMIC */
andrewbonney 0:ec559500a63f 90 #if PPP_SUPPORT && PPPOE_SUPPORT
andrewbonney 0:ec559500a63f 91 LWIP_MEMPOOL(PPPOE_IF, MEMP_NUM_PPPOE_INTERFACES, sizeof(struct pppoe_softc), "PPPOE_IF")
andrewbonney 0:ec559500a63f 92 #endif /* PPP_SUPPORT && PPPOE_SUPPORT */
andrewbonney 0:ec559500a63f 93
andrewbonney 0:ec559500a63f 94 /*
andrewbonney 0:ec559500a63f 95 * A list of pools of pbuf's used by LWIP.
andrewbonney 0:ec559500a63f 96 *
andrewbonney 0:ec559500a63f 97 * LWIP_PBUF_MEMPOOL(pool_name, number_elements, pbuf_payload_size, pool_description)
andrewbonney 0:ec559500a63f 98 * creates a pool name MEMP_pool_name. description is used in stats.c
andrewbonney 0:ec559500a63f 99 * This allocates enough space for the pbuf struct and a payload.
andrewbonney 0:ec559500a63f 100 * (Example: pbuf_payload_size=0 allocates only size for the struct)
andrewbonney 0:ec559500a63f 101 */
andrewbonney 0:ec559500a63f 102 LWIP_PBUF_MEMPOOL(PBUF, MEMP_NUM_PBUF, 0, "PBUF_REF/ROM")
andrewbonney 0:ec559500a63f 103 LWIP_PBUF_MEMPOOL(PBUF_POOL, PBUF_POOL_SIZE, PBUF_POOL_BUFSIZE, "PBUF_POOL")
andrewbonney 0:ec559500a63f 104
andrewbonney 0:ec559500a63f 105
andrewbonney 0:ec559500a63f 106 /*
andrewbonney 0:ec559500a63f 107 * Allow for user-defined pools; this must be explicitly set in lwipopts.h
andrewbonney 0:ec559500a63f 108 * since the default is to NOT look for lwippools.h
andrewbonney 0:ec559500a63f 109 */
andrewbonney 0:ec559500a63f 110 #if MEMP_USE_CUSTOM_POOLS
andrewbonney 0:ec559500a63f 111 #include "lwippools.h"
andrewbonney 0:ec559500a63f 112 #endif /* MEMP_USE_CUSTOM_POOLS */
andrewbonney 0:ec559500a63f 113
andrewbonney 0:ec559500a63f 114 /*
andrewbonney 0:ec559500a63f 115 * REQUIRED CLEANUP: Clear up so we don't get "multiply defined" error later
andrewbonney 0:ec559500a63f 116 * (#undef is ignored for something that is not defined)
andrewbonney 0:ec559500a63f 117 */
andrewbonney 0:ec559500a63f 118 #undef LWIP_MEMPOOL
andrewbonney 0:ec559500a63f 119 #undef LWIP_MALLOC_MEMPOOL
andrewbonney 0:ec559500a63f 120 #undef LWIP_MALLOC_MEMPOOL_START
andrewbonney 0:ec559500a63f 121 #undef LWIP_MALLOC_MEMPOOL_END
andrewbonney 0:ec559500a63f 122 #undef LWIP_PBUF_MEMPOOL