Add option to print the zone at the end of IPv6

@TD-er

Author: me-no-dev

cores/esp32/IPAddress.cpp

@@ -67,6 +67,7 @@ IPAddress::IPAddress(uint32_t address)
 {
     // IPv4 only
     _type = IPv4;
+    _zone = IP6_NO_ZONE;
     memset(_address.bytes, 0, sizeof(_address.bytes));
     _address.dword[IPADDRESS_V4_DWORD_INDEX] = address;
 
@@ -104,10 +105,10 @@ IPAddress::IPAddress(const IPAddress& address)
     *this = address;
 }
 
-String IPAddress::toString() const
+String IPAddress::toString(bool includeZone) const
 {
     StreamString s;
-    printTo(s);
+    printTo(s, includeZone);
     return String(s);
 }
 
@@ -303,6 +304,11 @@ uint8_t& IPAddress::operator[](int index) {
 }
 
 size_t IPAddress::printTo(Print& p) const
+{
+    return printTo(p, false);
+}
+
+size_t IPAddress::printTo(Print& p, bool includeZone) const
 {
     size_t n = 0;
 
@@ -355,12 +361,12 @@ size_t IPAddress::printTo(Print& p) const
             }
         }
         // add a zone if zone-id is non-zero
-        // if(_zone > 0){
-        //     n += p.print('%');
-        //     char if_name[NETIF_NAMESIZE];
-        //     netif_index_to_name(_zone, if_name);
-        //     n += p.print(if_name);
-        // }
+        if(_zone > 0 && includeZone){
+            n += p.print('%');
+            char if_name[NETIF_NAMESIZE];
+            netif_index_to_name(_zone, if_name);
+            n += p.print(if_name);
+        }
         return n;
     }
 

cores/esp32/IPAddress.h

@@ -93,7 +93,8 @@ class IPAddress : public Printable {
     IPAddress& operator=(const IPAddress& address);
 
     virtual size_t printTo(Print& p) const;
-    String toString() const;
+    size_t printTo(Print& p, bool includeZone) const;
+    String toString(bool includeZone = false) const;
 
     IPType type() const { return _type; }
 

libraries/Ethernet/src/ETH.cpp

@@ -1055,7 +1055,7 @@ void ETHClass::printInfo(Print & out){
     for (int i = 0; i < v6addrs; ++i){
         out.print("      ");
         out.print("inet6 ");
-        IPAddress(IPv6, (const uint8_t *)if_ip6[i].addr, if_ip6[i].zone).printTo(out);
+        IPAddress(IPv6, (const uint8_t *)if_ip6[i].addr, if_ip6[i].zone).printTo(out, true);
         out.print(" type ");
         out.print(types[esp_netif_ip6_get_addr_type(&if_ip6[i])]);
         out.println();