Skip to content

Commit

Permalink
Apply IPAddress fixes from ESP8266
Browse files Browse the repository at this point in the history 
esp8266/Arduino#8818
  • Loading branch information
@s-hadinger
s-hadinger committed Nov 1, 2023
1 parent 63152a2 commit 246ea6d
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 78 deletions.
116 changes: 43 additions & 73 deletions cores/esp32/IPAddress.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,13 @@ IPAddress::IPAddress(const IPAddress& from)
}

IPAddress::IPAddress(uint8_t first_octet, uint8_t second_octet, uint8_t third_octet, uint8_t fourth_octet) {
setV4();
(*this)[0] = first_octet;
(*this)[1] = second_octet;
(*this)[2] = third_octet;
(*this)[3] = fourth_octet;
uint8_t addr[] {
first_octet,
second_octet,
third_octet,
fourth_octet,
};
*this = &addr[0];
}

IPAddress::IPAddress(uint8_t o1, uint8_t o2, uint8_t o3, uint8_t o4, uint8_t o5, uint8_t o6, uint8_t o7, uint8_t o8, uint8_t o9, uint8_t o10, uint8_t o11, uint8_t o12, uint8_t o13, uint8_t o14, uint8_t o15, uint8_t o16) {
Expand All @@ -65,12 +67,17 @@ IPAddress::IPAddress(uint8_t o1, uint8_t o2, uint8_t o3, uint8_t o4, uint8_t o5,
}

IPAddress::IPAddress(IPType type, const uint8_t *address) {
IPAddress(type, address, 0);
}

IPAddress::IPAddress(IPType type, const uint8_t *address, uint8_t zone) {
if (type == IPv4) {
setV4();
memcpy(&this->_ip.u_addr.ip4, address, 4);
} else if (type == IPv6) {
setV6();
memcpy(&this->_ip.u_addr.ip6.addr[0], address, 16);
setZone(zone);
} else {
#if LWIP_IPV6
_ip = *IP6_ADDR_ANY;
Expand All @@ -81,19 +88,6 @@ IPAddress::IPAddress(IPType type, const uint8_t *address) {

}

void IPAddress::ctor32(uint32_t address) {
setV4();
v4() = address;
}

IPAddress::IPAddress(const uint8_t *address) {
setV4();
(*this)[0] = address[0];
(*this)[1] = address[1];
(*this)[2] = address[2];
(*this)[3] = address[3];
}

bool IPAddress::fromString(const char *address) {
if (!fromString4(address)) {
#if LWIP_IPV6
Expand Down Expand Up @@ -149,8 +143,9 @@ bool IPAddress::fromString4(const char *address) {
}

IPAddress& IPAddress::operator=(const uint8_t *address) {
setV4();
v4() = *reinterpret_cast<const uint32_t*>(address);
uint32_t value;
memcpy_P(&value, address, sizeof(value));
*this = value;
return *this;
}

Expand All @@ -161,15 +156,19 @@ IPAddress& IPAddress::operator=(uint32_t address) {
}

bool IPAddress::operator==(const uint8_t* addr) const {
return isV4() && v4() == *reinterpret_cast<const uint32_t*>(addr);
if (!isV4()) {
return false;
}

uint32_t value;
memcpy_P(&value, addr, sizeof(value));

return v4() == value;
}

size_t IPAddress::printTo(Print& p) const {
size_t n = 0;

// if (!isSet())
// return p.print(F("(IP unset)"));

#if LWIP_IPV6
if (isV6()) {
int count0 = 0;
Expand All @@ -185,6 +184,13 @@ size_t IPAddress::printTo(Print& p) const {
if ((i != 7 && count0 < 2) || count0 == 7)
n += p.print(':');
}
// add a zone if zone-id si non-zero
if (_ip.u_addr.ip6.zone) {
n += p.print('%');
char if_name[NETIF_NAMESIZE];
netif_index_to_name(_ip.u_addr.ip6.zone, if_name);
n += p.print(if_name);
}
return n;
}
#endif
Expand All @@ -202,7 +208,7 @@ String IPAddress::toString() const
StreamString sstr;
#if LWIP_IPV6
if (isV6())
sstr.reserve(40); // 8 shorts x 4 chars each + 7 colons + nullterm
sstr.reserve(44); // 8 shorts x 4 chars each + 7 colons + nullterm + '%' + zone-id
else
#endif
sstr.reserve(16); // 4 bytes with 3 chars max + 3 dots + nullterm, or '(IP unset)'
Expand Down Expand Up @@ -230,56 +236,20 @@ void IPAddress::clear() {
#if LWIP_IPV6

bool IPAddress::fromString6(const char *address) {
// TODO: test test test

uint32_t acc = 0; // Accumulator
int dots = 0, doubledots = -1;

while (*address)
{
char c = tolower(*address++);
if (isalnum(c)) {
if (c >= 'a')
c -= 'a' - '0' - 10;
acc = acc * 16 + (c - '0');
if (acc > 0xffff)
// Value out of range
return false;
}
else if (c == ':') {
if (*address == ':') {
if (doubledots >= 0)
// :: allowed once
return false;
// remember location
doubledots = dots + !!acc;
address++;
}
if (dots == 7)
// too many separators
return false;
raw6()[dots++] = PP_HTONS(acc);
acc = 0;
ip6_addr_t ip6;
if (ip6addr_aton(address, &ip6)) {
setV6();
memcpy(&this->_ip.u_addr.ip6.addr[0], ip6.addr, 16);
// look for '%' in string
const char *s = address;
while (*s && *s != '%') { s++; }
if (*s == '%') {
// we have a zone id
setZone(netif_name_to_index(s + 1));
}
else
// Invalid char
return false;
return true;
}

if (doubledots == -1 && dots != 7)
// Too few separators
return false;
raw6()[dots++] = PP_HTONS(acc);

if (doubledots != -1) {
for (int i = dots - doubledots - 1; i >= 0; i--)
raw6()[8 - dots + doubledots + i] = raw6()[doubledots + i];
for (int i = doubledots; i < 8 - dots + doubledots; i++)
raw6()[i] = 0;
}

setV6();
return true;
return false;
}
#endif // LWIP_IPV6

Expand Down
27 changes: 22 additions & 5 deletions cores/esp32/IPAddress.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,12 @@ class IPAddress: public Printable
IPAddress(const IPAddress& from);
IPAddress(uint8_t first_octet, uint8_t second_octet, uint8_t third_octet, uint8_t fourth_octet);
IPAddress(uint8_t o1, uint8_t o2, uint8_t o3, uint8_t o4, uint8_t o5, uint8_t o6, uint8_t o7, uint8_t o8, uint8_t o9, uint8_t o10, uint8_t o11, uint8_t o12, uint8_t o13, uint8_t o14, uint8_t o15, uint8_t o16);
IPAddress(uint32_t address) { ctor32(address); }
IPAddress(const uint8_t *address); // v4 only
IPAddress(uint32_t address) { *this = address; }
IPAddress(unsigned long address) { *this = address; }
IPAddress(int address) { *this = address; }
IPAddress(const uint8_t *address) { *this = address; }
IPAddress(IPType type, const uint8_t *address);
IPAddress(IPType type, const uint8_t *address, uint8_t zone);

bool fromString(const char *address);
bool fromString(const String &address) { return fromString(address.c_str()); }
Expand All @@ -67,7 +70,7 @@ class IPAddress: public Printable
operator uint32_t() { return isV4()? v4(): (uint32_t)0; }

// generic IPv4 wrapper to uint32-view like arduino loves to see it
const uint32_t& v4() const { return ip_2_ip4(&_ip)->addr; } // for raw_address(const)
const uint32_t& v4() const { return ip_2_ip4(&_ip)->addr; }
uint32_t& v4() { return ip_2_ip4(&_ip)->addr; }

bool operator==(const IPAddress& addr) const {
Expand Down Expand Up @@ -96,11 +99,16 @@ class IPAddress: public Printable

// Overloaded index operator to allow getting and setting individual octets of the address
uint8_t operator[](int index) const {
return isV4()? *(raw_address() + index): 0;
if (!isV4()) {
return 0;
}

return ip4_addr_get_byte_val(*ip_2_ip4(&_ip), index);
}
uint8_t& operator[](int index) {
setV4();
return *(raw_address() + index);
uint8_t* ptr = reinterpret_cast<uint8_t*>(&v4());
return *(ptr + index);
}

// Overloaded copy operators to allow initialisation of IPAddress objects from other types
Expand Down Expand Up @@ -167,6 +175,13 @@ class IPAddress: public Printable
IP_SET_TYPE_VAL(_ip, IPADDR_TYPE_V6);
ip6_addr_clear_zone(ip_2_ip6(&_ip));
}
inline uint8_t zone() const { return isV6() ? ip_2_ip6(&_ip)->zone : 0; }
void setZone(uint8_t zone) {
if (isV6()) {
ip_2_ip6(&_ip)->zone = zone;
}
}


protected:
bool fromString6(const char *address);
Expand All @@ -179,6 +194,8 @@ class IPAddress: public Printable
const uint16_t* raw6() const { return nullptr; }
bool isV6() const { return false; }
void setV6() { }
inline uint8_t zone() const { return 0; }
void setZone(uint8_t zone) { }

#endif

Expand Down

0 comments on commit 246ea6d

Please sign in to comment.