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.
api/DNSRequest.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 "DNSRequest.h" |
| andrewbonney | 0:ec559500a63f | 25 | #include "if/net/netdnsrequest.h" |
| andrewbonney | 0:ec559500a63f | 26 | |
| andrewbonney | 0:ec559500a63f | 27 | DNSRequest::DNSRequest() : m_pNetDnsRequest(NULL), m_pCbItem(NULL), m_pCbMeth(NULL), m_pCb(NULL) |
| andrewbonney | 0:ec559500a63f | 28 | { |
| andrewbonney | 0:ec559500a63f | 29 | |
| andrewbonney | 0:ec559500a63f | 30 | } |
| andrewbonney | 0:ec559500a63f | 31 | |
| andrewbonney | 0:ec559500a63f | 32 | DNSRequest::~DNSRequest() |
| andrewbonney | 0:ec559500a63f | 33 | { |
| andrewbonney | 0:ec559500a63f | 34 | close(); |
| andrewbonney | 0:ec559500a63f | 35 | } |
| andrewbonney | 0:ec559500a63f | 36 | |
| andrewbonney | 0:ec559500a63f | 37 | DNSRequestErr DNSRequest::resolve(const char* hostname) |
| andrewbonney | 0:ec559500a63f | 38 | { |
| andrewbonney | 0:ec559500a63f | 39 | if(!m_pNetDnsRequest) |
| andrewbonney | 0:ec559500a63f | 40 | { |
| andrewbonney | 0:ec559500a63f | 41 | m_pNetDnsRequest = Net::dnsRequest(hostname); |
| andrewbonney | 0:ec559500a63f | 42 | if(!m_pNetDnsRequest) |
| andrewbonney | 0:ec559500a63f | 43 | { |
| andrewbonney | 0:ec559500a63f | 44 | return DNS_IF; //Interface did not return a NetDnsRequest (usually because a default interface does not exist) |
| andrewbonney | 0:ec559500a63f | 45 | } |
| andrewbonney | 0:ec559500a63f | 46 | m_pNetDnsRequest->setOnReply(this, &DNSRequest::onNetDnsReply); |
| andrewbonney | 0:ec559500a63f | 47 | return DNS_OK; |
| andrewbonney | 0:ec559500a63f | 48 | } |
| andrewbonney | 0:ec559500a63f | 49 | else |
| andrewbonney | 0:ec559500a63f | 50 | { |
| andrewbonney | 0:ec559500a63f | 51 | return DNS_INUSE; //The previous req has not completed |
| andrewbonney | 0:ec559500a63f | 52 | } |
| andrewbonney | 0:ec559500a63f | 53 | } |
| andrewbonney | 0:ec559500a63f | 54 | |
| andrewbonney | 0:ec559500a63f | 55 | DNSRequestErr DNSRequest::resolve(Host* pHost) |
| andrewbonney | 0:ec559500a63f | 56 | { |
| andrewbonney | 0:ec559500a63f | 57 | if(!m_pNetDnsRequest) |
| andrewbonney | 0:ec559500a63f | 58 | { |
| andrewbonney | 0:ec559500a63f | 59 | m_pNetDnsRequest = Net::dnsRequest(pHost); |
| andrewbonney | 0:ec559500a63f | 60 | if(!m_pNetDnsRequest) |
| andrewbonney | 0:ec559500a63f | 61 | { |
| andrewbonney | 0:ec559500a63f | 62 | return DNS_IF; //Interface did not return a NetDnsRequest (usually because a default interface does not exist) |
| andrewbonney | 0:ec559500a63f | 63 | } |
| andrewbonney | 0:ec559500a63f | 64 | m_pNetDnsRequest->setOnReply(this, &DNSRequest::onNetDnsReply); |
| andrewbonney | 0:ec559500a63f | 65 | return DNS_OK; |
| andrewbonney | 0:ec559500a63f | 66 | } |
| andrewbonney | 0:ec559500a63f | 67 | else |
| andrewbonney | 0:ec559500a63f | 68 | { |
| andrewbonney | 0:ec559500a63f | 69 | return DNS_INUSE; //The previous req has not completed |
| andrewbonney | 0:ec559500a63f | 70 | } |
| andrewbonney | 0:ec559500a63f | 71 | } |
| andrewbonney | 0:ec559500a63f | 72 | |
| andrewbonney | 0:ec559500a63f | 73 | //Callbacks |
| andrewbonney | 0:ec559500a63f | 74 | void DNSRequest::setOnReply( void (*pMethod)(DNSReply) ) |
| andrewbonney | 0:ec559500a63f | 75 | { |
| andrewbonney | 0:ec559500a63f | 76 | m_pCb = pMethod; |
| andrewbonney | 0:ec559500a63f | 77 | } |
| andrewbonney | 0:ec559500a63f | 78 | |
| andrewbonney | 0:ec559500a63f | 79 | #if 0 //For doc only |
| andrewbonney | 0:ec559500a63f | 80 | template<class T> |
| andrewbonney | 0:ec559500a63f | 81 | void DNSRequest::setOnReply( T* pItem, void (T::*pMethod)(DNSReply) ) |
| andrewbonney | 0:ec559500a63f | 82 | { |
| andrewbonney | 0:ec559500a63f | 83 | m_pCbItem = (CDummy*) pItem; |
| andrewbonney | 0:ec559500a63f | 84 | m_pCbMeth = (void (CDummy::*)(DNSReply)) pMethod; |
| andrewbonney | 0:ec559500a63f | 85 | } |
| andrewbonney | 0:ec559500a63f | 86 | #endif |
| andrewbonney | 0:ec559500a63f | 87 | |
| andrewbonney | 0:ec559500a63f | 88 | DNSRequestErr DNSRequest::getResult(IpAddr* pIp) |
| andrewbonney | 0:ec559500a63f | 89 | { |
| andrewbonney | 0:ec559500a63f | 90 | if(!m_pNetDnsRequest) |
| andrewbonney | 0:ec559500a63f | 91 | { |
| andrewbonney | 0:ec559500a63f | 92 | return DNS_SETUP; |
| andrewbonney | 0:ec559500a63f | 93 | } |
| andrewbonney | 0:ec559500a63f | 94 | m_pNetDnsRequest->getResult(pIp); |
| andrewbonney | 0:ec559500a63f | 95 | return DNS_OK; |
| andrewbonney | 0:ec559500a63f | 96 | } |
| andrewbonney | 0:ec559500a63f | 97 | |
| andrewbonney | 0:ec559500a63f | 98 | DNSRequestErr DNSRequest::close() |
| andrewbonney | 0:ec559500a63f | 99 | { |
| andrewbonney | 0:ec559500a63f | 100 | if(!m_pNetDnsRequest) |
| andrewbonney | 0:ec559500a63f | 101 | { |
| andrewbonney | 0:ec559500a63f | 102 | return DNS_SETUP; |
| andrewbonney | 0:ec559500a63f | 103 | } |
| andrewbonney | 0:ec559500a63f | 104 | m_pNetDnsRequest->close(); |
| andrewbonney | 0:ec559500a63f | 105 | m_pNetDnsRequest = NULL; |
| andrewbonney | 0:ec559500a63f | 106 | return DNS_OK; |
| andrewbonney | 0:ec559500a63f | 107 | } |
| andrewbonney | 0:ec559500a63f | 108 | |
| andrewbonney | 0:ec559500a63f | 109 | void DNSRequest::onNetDnsReply(NetDnsReply r) |
| andrewbonney | 0:ec559500a63f | 110 | { |
| andrewbonney | 0:ec559500a63f | 111 | if(m_pCbItem && m_pCbMeth) |
| andrewbonney | 0:ec559500a63f | 112 | (m_pCbItem->*m_pCbMeth)((DNSReply) r); |
| andrewbonney | 0:ec559500a63f | 113 | else if(m_pCb) |
| andrewbonney | 0:ec559500a63f | 114 | m_pCb((DNSReply) r); |
| andrewbonney | 0:ec559500a63f | 115 | } |