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.
core/ipaddr.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 "ipaddr.h" |
| andrewbonney | 0:ec559500a63f | 25 | |
| andrewbonney | 0:ec559500a63f | 26 | #include "netCfg.h" |
| andrewbonney | 0:ec559500a63f | 27 | #if NET_LWIP_STACK |
| andrewbonney | 0:ec559500a63f | 28 | #include "lwip/ip_addr.h" |
| andrewbonney | 0:ec559500a63f | 29 | #endif |
| andrewbonney | 0:ec559500a63f | 30 | |
| andrewbonney | 0:ec559500a63f | 31 | |
| andrewbonney | 0:ec559500a63f | 32 | #if NET_LWIP_STACK |
| andrewbonney | 0:ec559500a63f | 33 | IpAddr::IpAddr(ip_addr_t* pIp) |
| andrewbonney | 0:ec559500a63f | 34 | { |
| andrewbonney | 0:ec559500a63f | 35 | *((uint32_t*)m_ip) = pIp->addr; |
| andrewbonney | 0:ec559500a63f | 36 | } |
| andrewbonney | 0:ec559500a63f | 37 | #endif |
| andrewbonney | 0:ec559500a63f | 38 | |
| andrewbonney | 0:ec559500a63f | 39 | ///Initializes IP address with provided values |
| andrewbonney | 0:ec559500a63f | 40 | IpAddr::IpAddr(uint8_t ip0, uint8_t ip1, uint8_t ip2, uint8_t ip3) |
| andrewbonney | 0:ec559500a63f | 41 | { |
| andrewbonney | 0:ec559500a63f | 42 | //We are in LE |
| andrewbonney | 0:ec559500a63f | 43 | m_ip[0] = ip0; |
| andrewbonney | 0:ec559500a63f | 44 | m_ip[1] = ip1; |
| andrewbonney | 0:ec559500a63f | 45 | m_ip[2] = ip2; |
| andrewbonney | 0:ec559500a63f | 46 | m_ip[3] = ip3; |
| andrewbonney | 0:ec559500a63f | 47 | } |
| andrewbonney | 0:ec559500a63f | 48 | |
| andrewbonney | 0:ec559500a63f | 49 | ///Initializes IP address with null values |
| andrewbonney | 0:ec559500a63f | 50 | IpAddr::IpAddr() |
| andrewbonney | 0:ec559500a63f | 51 | { |
| andrewbonney | 0:ec559500a63f | 52 | m_ip[0] = 0; |
| andrewbonney | 0:ec559500a63f | 53 | m_ip[1] = 0; |
| andrewbonney | 0:ec559500a63f | 54 | m_ip[2] = 0; |
| andrewbonney | 0:ec559500a63f | 55 | m_ip[3] = 0; |
| andrewbonney | 0:ec559500a63f | 56 | } |
| andrewbonney | 0:ec559500a63f | 57 | |
| andrewbonney | 0:ec559500a63f | 58 | |
| andrewbonney | 0:ec559500a63f | 59 | #if NET_LWIP_STACK |
| andrewbonney | 0:ec559500a63f | 60 | ip_addr_t IpAddr::getStruct() const |
| andrewbonney | 0:ec559500a63f | 61 | { |
| andrewbonney | 0:ec559500a63f | 62 | ip_addr_t ip_struct; |
| andrewbonney | 0:ec559500a63f | 63 | ip_struct.addr = *((uint32_t*)m_ip); |
| andrewbonney | 0:ec559500a63f | 64 | return ip_struct; |
| andrewbonney | 0:ec559500a63f | 65 | } |
| andrewbonney | 0:ec559500a63f | 66 | #endif |
| andrewbonney | 0:ec559500a63f | 67 | |
| andrewbonney | 0:ec559500a63f | 68 | uint8_t IpAddr::operator[](unsigned int i) const |
| andrewbonney | 0:ec559500a63f | 69 | { |
| andrewbonney | 0:ec559500a63f | 70 | uint8_t null = 0; |
| andrewbonney | 0:ec559500a63f | 71 | if( i > 3 ) |
| andrewbonney | 0:ec559500a63f | 72 | return null; |
| andrewbonney | 0:ec559500a63f | 73 | return m_ip[i]; |
| andrewbonney | 0:ec559500a63f | 74 | } |
| andrewbonney | 0:ec559500a63f | 75 | |
| andrewbonney | 0:ec559500a63f | 76 | bool IpAddr::isEq(const IpAddr& b) const |
| andrewbonney | 0:ec559500a63f | 77 | { |
| andrewbonney | 0:ec559500a63f | 78 | return (*((uint32_t*)m_ip) == *((uint32_t*)(b.m_ip))); |
| andrewbonney | 0:ec559500a63f | 79 | } |
| andrewbonney | 0:ec559500a63f | 80 | |
| andrewbonney | 0:ec559500a63f | 81 | bool IpAddr::operator==(const IpAddr& b) const |
| andrewbonney | 0:ec559500a63f | 82 | { |
| andrewbonney | 0:ec559500a63f | 83 | return isEq(b); |
| andrewbonney | 0:ec559500a63f | 84 | } |
| andrewbonney | 0:ec559500a63f | 85 | |
| andrewbonney | 0:ec559500a63f | 86 | bool IpAddr::operator!=(const IpAddr& b) const |
| andrewbonney | 0:ec559500a63f | 87 | { |
| andrewbonney | 0:ec559500a63f | 88 | return !(operator==(b)); |
| andrewbonney | 0:ec559500a63f | 89 | } |
| andrewbonney | 0:ec559500a63f | 90 | |
| andrewbonney | 0:ec559500a63f | 91 | bool IpAddr::isNull() const |
| andrewbonney | 0:ec559500a63f | 92 | { |
| andrewbonney | 0:ec559500a63f | 93 | return (*((uint32_t*)m_ip) == 0); |
| andrewbonney | 0:ec559500a63f | 94 | } |
| andrewbonney | 0:ec559500a63f | 95 | |
| andrewbonney | 0:ec559500a63f | 96 | bool IpAddr::isBroadcast() const |
| andrewbonney | 0:ec559500a63f | 97 | { |
| andrewbonney | 0:ec559500a63f | 98 | return (*((uint32_t*)m_ip) == 0xFFFFFFFF); |
| andrewbonney | 0:ec559500a63f | 99 | } |
| andrewbonney | 0:ec559500a63f | 100 | |
| andrewbonney | 0:ec559500a63f | 101 | bool IpAddr::isMulticast() const |
| andrewbonney | 0:ec559500a63f | 102 | { |
| andrewbonney | 0:ec559500a63f | 103 | return ((m_ip[0] & 0xF0) == 0xE0); |
| andrewbonney | 0:ec559500a63f | 104 | } |