Make IPv6 compatible with Core3 official

Author: s-hadinger

cores/esp32/IPAddress.cpp

@@ -31,6 +31,14 @@ IPAddress::IPAddress() {
     // _ip = *IP_ANY_TYPE; // lwIP's v4-or-v6 generic address
 }
 
+IPAddress::IPAddress(IPType type) {
+  if (type == IPv6) {
+    _ip = *IP6_ADDR_ANY;
+  } else {
+    _ip = *IP_ADDR_ANY;
+  }
+}
+
 IPAddress::IPAddress(const IPAddress& from)
 {
     ip_addr_copy(_ip, from._ip);
@@ -199,7 +207,7 @@ size_t IPAddress::printTo(Print& p) const {
     return n;
 }
 
-String IPAddress::toString() const
+String IPAddress::toString(bool includeZone) const
 {
     StreamString sstr;
 #if LWIP_IPV6
@@ -247,6 +255,24 @@ bool IPAddress::fromString6(const char *address) {
     }
     return false;
 }
+
+// compatibillity with Core3
+
+esp_ip6_addr_type_t IPAddress::addr_type() const {
+    if(_ip.type != IPv6){
+        return ESP_IP6_ADDR_IS_UNKNOWN;
+    }
+    return esp_netif_ip6_get_addr_type((esp_ip6_addr_t*)(&(_ip.u_addr.ip6)));
+}
+
+void IPAddress::to_ip_addr_t(ip_addr_t* addr) const {
+    ip_addr_copy(*addr, _ip);
+}
+
+IPAddress& IPAddress::from_ip_addr_t(const ip_addr_t* addr) {
+    ip_addr_copy(_ip, *addr);
+    return *this;
+}
 #endif // LWIP_IPV6
 
 // declared one time - as external in IPAddress.h

cores/esp32/IPAddress.h

@@ -23,8 +23,9 @@
 #include <WString.h>
 #include <Printable.h>
 #include <lwip/netif.h>
+#include "esp_netif_ip_addr.h"
 
-enum IPType
+enum IPType : uint8_t
 {
     IPv4 = IPADDR_TYPE_V4,
     IPv6 = IPADDR_TYPE_V6
@@ -51,6 +52,7 @@ class IPAddress: public Printable
 public:
     // Constructors
     IPAddress();
+    IPAddress(IPType type);
     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);
@@ -117,7 +119,8 @@ class IPAddress: public Printable
     IPType type() const { return (IPType)_ip.type; }
 
     virtual size_t printTo(Print& p) const;
-    String toString() const;
+    // String toString() const;
+    String toString(bool includeZone = false) const ;
 
     void clear();
 
@@ -180,6 +183,10 @@ class IPAddress: public Printable
         }
     }
 
+    // compatibility with Core3 version
+    esp_ip6_addr_type_t addr_type() const;
+    void to_ip_addr_t(ip_addr_t* addr) const;
+    IPAddress& from_ip_addr_t(const ip_addr_t* addr);
 
 protected:
     bool fromString6(const char *address);

libraries/Ethernet/src/ETH.h

@@ -86,6 +86,7 @@ class ETHClass {
         uint8_t linkSpeed();
 
         bool enableIpV6();
+        bool enableIPv6() { return enableIpV6(); };
         IPv6Address localIPv6();
 
         IPAddress localIP();

libraries/WiFi/src/WiFiGeneric.h

@@ -140,6 +140,10 @@ static const int WIFI_DNS_IDLE_BIT = BIT13;
 static const int WIFI_DNS_DONE_BIT = BIT14;
 static const int WIFI_WANT_IP6_BIT = BIT15;
 
+// Compatibility with Core3
+static const int NET_DNS_IDLE_BIT       = WIFI_DNS_IDLE_BIT;
+static const int NET_DNS_DONE_BIT       = WIFI_DNS_DONE_BIT;
+
 typedef enum {
 	WIFI_RX_ANT0 = 0,
 	WIFI_RX_ANT1,

libraries/WiFi/src/WiFiMulti.cpp

@@ -162,7 +162,7 @@ uint8_t WiFiMulti::run(uint32_t connectTimeout)
 
             WiFi.begin(bestNetwork.ssid, bestNetwork.passphrase, bestChannel, bestBSSID);
             if (ipv6_support == true)
-                WiFi.IPv6(true);
+                WiFi.enableIPv6(true);
             status = WiFi.status();
 
             auto startTime = millis();
@@ -206,6 +206,3 @@ uint8_t WiFiMulti::run(uint32_t connectTimeout)
     return status;
 }
 
-void WiFiMulti::IPv6(bool state) {
-    ipv6_support = state;
-}

libraries/WiFi/src/WiFiMulti.h

@@ -42,7 +42,7 @@ class WiFiMulti
 
     bool addAP(const char* ssid, const char *passphrase = NULL);
 
-    void IPv6(bool state);
+    void enableIPv6(bool state = true) { ipv6_support = state; }
     uint8_t run(uint32_t connectTimeout=5000);
 
 private:

libraries/WiFi/src/WiFiSTA.cpp

@@ -691,13 +691,12 @@ bool WiFiSTAClass::enableIpV6()
  * Enable IPv6 support on the station interface.
  * @return true on success
  */
-bool WiFiSTAClass::IPv6(bool state)
+void WiFiSTAClass::enableIPv6(bool state)
 {
    if (state)
        WiFiGenericClass::setStatusBits(WIFI_WANT_IP6_BIT);
    else
        WiFiGenericClass::clearStatusBits(WIFI_WANT_IP6_BIT);
-   return true;
 }
 
 /**

libraries/WiFi/src/WiFiSTA.h

@@ -91,7 +91,8 @@ class WiFiSTAClass
     uint8_t subnetCIDR();
 
     bool enableIpV6();
-    bool IPv6(bool state);
+    bool IPv6(bool state) { enableIPv6(state); return true; };
+    void enableIPv6(bool state = true);
     IPv6Address localIPv6();
 
     // STA WiFi info