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/lwipNetDnsRequest.cpp@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 | #include "lwipNetDnsRequest.h" |
| andrewbonney | 0:ec559500a63f | 25 | #include "lwip/err.h" //err_t, ERR_xxx |
| andrewbonney | 0:ec559500a63f | 26 | #include "lwip/dns.h" |
| andrewbonney | 0:ec559500a63f | 27 | |
| andrewbonney | 0:ec559500a63f | 28 | #include "netCfg.h" |
| andrewbonney | 0:ec559500a63f | 29 | #if NET_LWIP_STACK |
| andrewbonney | 0:ec559500a63f | 30 | |
| andrewbonney | 0:ec559500a63f | 31 | //#define __DEBUG |
| andrewbonney | 0:ec559500a63f | 32 | #include "dbg/dbg.h" |
| andrewbonney | 0:ec559500a63f | 33 | |
| andrewbonney | 0:ec559500a63f | 34 | LwipNetDnsRequest::LwipNetDnsRequest(const char* hostname) : NetDnsRequest(hostname), m_state(LWIPNETDNS_START), m_cbFired(false), m_closing(false) |
| andrewbonney | 0:ec559500a63f | 35 | { |
| andrewbonney | 0:ec559500a63f | 36 | DBG("New LwipNetDnsRequest %p\n", this); |
| andrewbonney | 0:ec559500a63f | 37 | } |
| andrewbonney | 0:ec559500a63f | 38 | |
| andrewbonney | 0:ec559500a63f | 39 | LwipNetDnsRequest::LwipNetDnsRequest(Host* pHost) : NetDnsRequest(pHost), m_state(LWIPNETDNS_START), m_cbFired(false), m_closing(false) |
| andrewbonney | 0:ec559500a63f | 40 | { |
| andrewbonney | 0:ec559500a63f | 41 | DBG("New LwipNetDnsRequest %p\n", this); |
| andrewbonney | 0:ec559500a63f | 42 | } |
| andrewbonney | 0:ec559500a63f | 43 | |
| andrewbonney | 0:ec559500a63f | 44 | LwipNetDnsRequest::~LwipNetDnsRequest() |
| andrewbonney | 0:ec559500a63f | 45 | { |
| andrewbonney | 0:ec559500a63f | 46 | DBG("LwipNetDnsRequest %p destroyed\n", this); |
| andrewbonney | 0:ec559500a63f | 47 | } |
| andrewbonney | 0:ec559500a63f | 48 | |
| andrewbonney | 0:ec559500a63f | 49 | /* |
| andrewbonney | 0:ec559500a63f | 50 | Main useful function here (see lwip/dns.h): |
| andrewbonney | 0:ec559500a63f | 51 | err_t dns_gethostbyname(const char *hostname, ip_addr_t *addr, |
| andrewbonney | 0:ec559500a63f | 52 | dns_found_callback found, void *callback_arg); |
| andrewbonney | 0:ec559500a63f | 53 | */ |
| andrewbonney | 0:ec559500a63f | 54 | |
| andrewbonney | 0:ec559500a63f | 55 | //Execute request & return OK if found, NOTFOUND or ERROR on error, or PROCESSING if the request has not completed yet |
| andrewbonney | 0:ec559500a63f | 56 | void LwipNetDnsRequest::poll() |
| andrewbonney | 0:ec559500a63f | 57 | { |
| andrewbonney | 0:ec559500a63f | 58 | err_t err; |
| andrewbonney | 0:ec559500a63f | 59 | switch(m_state) |
| andrewbonney | 0:ec559500a63f | 60 | { |
| andrewbonney | 0:ec559500a63f | 61 | case LWIPNETDNS_START: //First req, let's call dns_gethostbyname |
| andrewbonney | 0:ec559500a63f | 62 | ip_addr_t ipStruct; |
| andrewbonney | 0:ec559500a63f | 63 | err = dns_gethostbyname(m_hostname, &ipStruct, LwipNetDnsRequest::sFoundCb, (void*) this ); |
| andrewbonney | 0:ec559500a63f | 64 | if( err == ERR_OK ) |
| andrewbonney | 0:ec559500a63f | 65 | { |
| andrewbonney | 0:ec559500a63f | 66 | m_ip = IpAddr(&ipStruct); |
| andrewbonney | 0:ec559500a63f | 67 | m_state = LWIPNETDNS_OK; |
| andrewbonney | 0:ec559500a63f | 68 | DBG("DNS: Ip found in cache.\n"); |
| andrewbonney | 0:ec559500a63f | 69 | } |
| andrewbonney | 0:ec559500a63f | 70 | else if( err == ERR_INPROGRESS) |
| andrewbonney | 0:ec559500a63f | 71 | { |
| andrewbonney | 0:ec559500a63f | 72 | DBG("DNS: Processing.\n"); |
| andrewbonney | 0:ec559500a63f | 73 | m_state = LWIPNETDNS_PROCESSING; |
| andrewbonney | 0:ec559500a63f | 74 | } |
| andrewbonney | 0:ec559500a63f | 75 | else //Likely ERR_VAL |
| andrewbonney | 0:ec559500a63f | 76 | { |
| andrewbonney | 0:ec559500a63f | 77 | DBG("DNS: Error on init.\n"); |
| andrewbonney | 0:ec559500a63f | 78 | m_state = LWIPNETDNS_ERROR; |
| andrewbonney | 0:ec559500a63f | 79 | } |
| andrewbonney | 0:ec559500a63f | 80 | break; |
| andrewbonney | 0:ec559500a63f | 81 | case LWIPNETDNS_PROCESSING: |
| andrewbonney | 0:ec559500a63f | 82 | break; //Nothing to do, DNS is polled on interrupt |
| andrewbonney | 0:ec559500a63f | 83 | case LWIPNETDNS_OK: |
| andrewbonney | 0:ec559500a63f | 84 | if(!m_cbFired) |
| andrewbonney | 0:ec559500a63f | 85 | { |
| andrewbonney | 0:ec559500a63f | 86 | DBG("DNS: Ip found.\n"); |
| andrewbonney | 0:ec559500a63f | 87 | m_cbFired = true; |
| andrewbonney | 0:ec559500a63f | 88 | onReply(NETDNS_FOUND); //Raise callback |
| andrewbonney | 0:ec559500a63f | 89 | } |
| andrewbonney | 0:ec559500a63f | 90 | break; |
| andrewbonney | 0:ec559500a63f | 91 | case LWIPNETDNS_NOTFOUND: |
| andrewbonney | 0:ec559500a63f | 92 | if(!m_cbFired) |
| andrewbonney | 0:ec559500a63f | 93 | { |
| andrewbonney | 0:ec559500a63f | 94 | DBG("DNS: could not be resolved.\n"); |
| andrewbonney | 0:ec559500a63f | 95 | m_cbFired = true; |
| andrewbonney | 0:ec559500a63f | 96 | onReply(NETDNS_NOTFOUND); //Raise callback |
| andrewbonney | 0:ec559500a63f | 97 | } |
| andrewbonney | 0:ec559500a63f | 98 | break; |
| andrewbonney | 0:ec559500a63f | 99 | case LWIPNETDNS_ERROR: |
| andrewbonney | 0:ec559500a63f | 100 | default: |
| andrewbonney | 0:ec559500a63f | 101 | if(!m_cbFired) |
| andrewbonney | 0:ec559500a63f | 102 | { |
| andrewbonney | 0:ec559500a63f | 103 | DBG("DNS: Error.\n"); |
| andrewbonney | 0:ec559500a63f | 104 | m_cbFired = true; |
| andrewbonney | 0:ec559500a63f | 105 | onReply(NETDNS_ERROR); //Raise callback |
| andrewbonney | 0:ec559500a63f | 106 | } |
| andrewbonney | 0:ec559500a63f | 107 | break; |
| andrewbonney | 0:ec559500a63f | 108 | } |
| andrewbonney | 0:ec559500a63f | 109 | if(m_closing && (m_state!=LWIPNETDNS_PROCESSING)) //Check wether the closure has been reqd |
| andrewbonney | 0:ec559500a63f | 110 | { |
| andrewbonney | 0:ec559500a63f | 111 | DBG("LwipNetDnsRequest: Closing in poll()\n"); |
| andrewbonney | 0:ec559500a63f | 112 | NetDnsRequest::close(); |
| andrewbonney | 0:ec559500a63f | 113 | } |
| andrewbonney | 0:ec559500a63f | 114 | } |
| andrewbonney | 0:ec559500a63f | 115 | |
| andrewbonney | 0:ec559500a63f | 116 | void LwipNetDnsRequest::close() |
| andrewbonney | 0:ec559500a63f | 117 | { |
| andrewbonney | 0:ec559500a63f | 118 | DBG("LwipNetDnsRequest: Close req\n"); |
| andrewbonney | 0:ec559500a63f | 119 | if(m_state!=LWIPNETDNS_PROCESSING) |
| andrewbonney | 0:ec559500a63f | 120 | { |
| andrewbonney | 0:ec559500a63f | 121 | DBG("LwipNetDnsRequest: Closing in close()\n"); |
| andrewbonney | 0:ec559500a63f | 122 | NetDnsRequest::close(); |
| andrewbonney | 0:ec559500a63f | 123 | } |
| andrewbonney | 0:ec559500a63f | 124 | else //Cannot close rightaway, waiting for callback from underlying layer |
| andrewbonney | 0:ec559500a63f | 125 | { |
| andrewbonney | 0:ec559500a63f | 126 | m_closing = true; |
| andrewbonney | 0:ec559500a63f | 127 | } |
| andrewbonney | 0:ec559500a63f | 128 | } |
| andrewbonney | 0:ec559500a63f | 129 | |
| andrewbonney | 0:ec559500a63f | 130 | void LwipNetDnsRequest::foundCb(const char *name, ip_addr_t *ipaddr) |
| andrewbonney | 0:ec559500a63f | 131 | { |
| andrewbonney | 0:ec559500a63f | 132 | if( ipaddr == NULL ) |
| andrewbonney | 0:ec559500a63f | 133 | { |
| andrewbonney | 0:ec559500a63f | 134 | DBG("LwipNetDnsRequest: Callback: Name not found\n"); |
| andrewbonney | 0:ec559500a63f | 135 | m_state = LWIPNETDNS_NOTFOUND; |
| andrewbonney | 0:ec559500a63f | 136 | return; |
| andrewbonney | 0:ec559500a63f | 137 | } |
| andrewbonney | 0:ec559500a63f | 138 | DBG("LwipNetDnsRequest: Callback: Resolved\n"); |
| andrewbonney | 0:ec559500a63f | 139 | m_ip = IpAddr(ipaddr); |
| andrewbonney | 0:ec559500a63f | 140 | m_state = LWIPNETDNS_OK; |
| andrewbonney | 0:ec559500a63f | 141 | } |
| andrewbonney | 0:ec559500a63f | 142 | |
| andrewbonney | 0:ec559500a63f | 143 | |
| andrewbonney | 0:ec559500a63f | 144 | void LwipNetDnsRequest::sFoundCb(const char *name, ip_addr_t *ipaddr, void *arg) |
| andrewbonney | 0:ec559500a63f | 145 | { |
| andrewbonney | 0:ec559500a63f | 146 | DBG("LwipNetDnsRequest: Static callback\n"); |
| andrewbonney | 0:ec559500a63f | 147 | LwipNetDnsRequest* pMe = (LwipNetDnsRequest*) arg; |
| andrewbonney | 0:ec559500a63f | 148 | return pMe->foundCb( name, ipaddr ); |
| andrewbonney | 0:ec559500a63f | 149 | } |
| andrewbonney | 0:ec559500a63f | 150 | |
| andrewbonney | 0:ec559500a63f | 151 | #endif |
| andrewbonney | 0:ec559500a63f | 152 |