Apply IPAddress fixes from ESP8266

esp8266/Arduino#8818

Author: s-hadinger

cores/esp32/IPAddress.cpp

@@ -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) {
@@ -86,19 +88,6 @@ IPAddress::IPAddress(IPType type, const uint8_t *address, uint8_t zone) {
 
 }
 
-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
@@ -154,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;
 }
 
@@ -166,7 +156,14 @@ 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 {

cores/esp32/IPAddress.h

@@ -54,8 +54,10 @@ 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);
 
@@ -68,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 {
@@ -97,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