Align with latest ArduinoCore

Author: sgryphon

Diff for: cores/esp32/IPAddress.cpp

@@ -89,6 +89,11 @@ IPAddress::IPAddress(IPType ip_type, const uint8_t *address)
     }
 }
 
+IPAddress::IPAddress(const char *address)
+{
+    fromString(address);
+}
+
 IPAddress& IPAddress::operator=(const uint8_t *address)
 {
     // IPv4 only conversion from byte pointer
@@ -98,6 +103,12 @@ IPAddress& IPAddress::operator=(const uint8_t *address)
     return *this;
 }
 
+IPAddress& IPAddress::operator=(const char *address)
+{
+    fromString(address);
+    return *this;
+}
+
 IPAddress& IPAddress::operator=(uint32_t address)
 {
     // IPv4 conversion
@@ -200,22 +211,30 @@ size_t IPAddress::printTo(Print& p) const
     return n;
 }
 
-String IPAddress::toString() const
+String IPAddress::toString4() const
 {
-    if (_type == IPv6)
-    {
-        StreamString s;
-        s.reserve(40);
-        printTo(s);
-        return s;
-    }
-
-    // IPv4
     char szRet[16];
-    sprintf(szRet,"%u.%u.%u.%u", _address.bytes[0], _address.bytes[1], _address.bytes[2], _address.bytes[3]);
+    snprintf(szRet, sizeof(szRet), "%u.%u.%u.%u", _address.bytes[IPADDRESS_V4_BYTES_INDEX], _address.bytes[IPADDRESS_V4_BYTES_INDEX + 1], _address.bytes[IPADDRESS_V4_BYTES_INDEX + 2], _address.bytes[IPADDRESS_V4_BYTES_INDEX + 3]);
     return String(szRet);
 }
 
+String IPAddress::toString6() const
+{
+    StreamString s;
+    s.reserve(40);
+    printTo(s);
+    return s;
+}
+
+String IPAddress::toString() const
+{
+    if (_type == IPv4) {
+        return toString4();
+    } else {
+        return toString6();
+    }
+}
+
 bool IPAddress::fromString(const char *address)
 {
     if (!fromString4(address))

Diff for: cores/esp32/IPAddress.h

@@ -62,6 +62,8 @@ class IPAddress: public Printable
     IPAddress(uint32_t address);
     IPAddress(const uint8_t *address);
     IPAddress(IPType ip_type, const uint8_t *address);
+    // If IPv4 fails tries IPv6 see fromString function
+    IPAddress(const char *address);
     virtual ~IPAddress() {}
 
     bool fromString(const char *address);
@@ -84,11 +86,13 @@ class IPAddress: public Printable
     // Overloaded copy operators to allow initialisation of IPAddress objects from other types
     IPAddress& operator=(const uint8_t *address);
     IPAddress& operator=(uint32_t address);
+    // If IPv4 fails tries IPv6 see fromString function
+    IPAddress& operator=(const char *address);
 
     virtual size_t printTo(Print& p) const;
     String toString() const;
 
-    IPType type() { return _type; }
+    IPType type() const { return _type; }
 
     friend class EthernetClass;
     friend class UDP;
@@ -100,6 +104,8 @@ class IPAddress: public Printable
 protected:
     bool fromString4(const char *address);
     bool fromString6(const char *address);
+    String toString4() const;
+    String toString6() const;
 };
 
 // changed to extern because const declaration creates copies in BSS of INADDR_NONE for each CPP unit that includes it