implement logic to use v6 dns only when global v6 address is assigned and remove IPv6Address

Author: me-no-dev

CMakeLists.txt

@@ -51,7 +51,6 @@ set(CORE_SRCS
   cores/esp32/FunctionalInterrupt.cpp
   cores/esp32/HardwareSerial.cpp
   cores/esp32/IPAddress.cpp
-  cores/esp32/IPv6Address.cpp
   cores/esp32/libb64/cdecode.c
   cores/esp32/libb64/cencode.c
   cores/esp32/main.cpp

cores/esp32/IPv6Address.cpp

@@ -345,9 +345,9 @@ Function to get the IPv6 address.
 
 .. code-block:: arduino
 
-    IPv6Address softAPIPv6();
+    IPAddress softAPIPv6();
 
-The function will return the AP IPv6 address in ``IPv6Address`` format.
+The function will return the AP IPv6 address in ``IPAddress`` format.
 
 softAPgetHostname
 *****************

cores/esp32/IPv6Address.h

@@ -424,12 +424,12 @@ IPAddress AsyncUDPPacket::localIP()
     return IPAddress(_localIp.u_addr.ip4.addr);
 }
 
-IPv6Address AsyncUDPPacket::localIPv6()
+IPAddress AsyncUDPPacket::localIPv6()
 {
     if(_localIp.type != IPADDR_TYPE_V6){
-        return IPv6Address();
+        return IPAddress(IPv6);
     }
-    return IPv6Address(_localIp.u_addr.ip6.addr);
+    return IPAddress(IPv6, (const uint8_t *)_localIp.u_addr.ip6.addr, _localIp.u_addr.ip6.zone);
 }
 
 uint16_t AsyncUDPPacket::localPort()
@@ -445,12 +445,12 @@ IPAddress AsyncUDPPacket::remoteIP()
     return IPAddress(_remoteIp.u_addr.ip4.addr);
 }
 
-IPv6Address AsyncUDPPacket::remoteIPv6()
+IPAddress AsyncUDPPacket::remoteIPv6()
 {
     if(_remoteIp.type != IPADDR_TYPE_V6){
-        return IPv6Address();
+        return IPAddress(IPv6);
     }
-    return IPv6Address(_remoteIp.u_addr.ip6.addr);
+    return IPAddress(IPv6, (const uint8_t *)_remoteIp.u_addr.ip6.addr, _remoteIp.u_addr.ip6.zone);
 }
 
 uint16_t AsyncUDPPacket::remotePort()
@@ -739,32 +739,28 @@ bool AsyncUDP::listen(uint16_t port)
 bool AsyncUDP::listen(const IPAddress addr, uint16_t port)
 {
     ip_addr_t laddr;
-    laddr.type = IPADDR_TYPE_V4;
-    laddr.u_addr.ip4.addr = addr;
+    addr.to_ip_addr_t(&laddr);
     return listen(&laddr, port);
 }
 
 bool AsyncUDP::listenMulticast(const IPAddress addr, uint16_t port, uint8_t ttl, tcpip_adapter_if_t tcpip_if)
 {
     ip_addr_t laddr;
-    laddr.type = IPADDR_TYPE_V4;
-    laddr.u_addr.ip4.addr = addr;
+    addr.to_ip_addr_t(&laddr);
     return listenMulticast(&laddr, port, ttl, tcpip_if);
 }
 
 bool AsyncUDP::connect(const IPAddress addr, uint16_t port)
 {
     ip_addr_t daddr;
-    daddr.type = IPADDR_TYPE_V4;
-    daddr.u_addr.ip4.addr = addr;
+    addr.to_ip_addr_t(&daddr);
     return connect(&daddr, port);
 }
 
 size_t AsyncUDP::writeTo(const uint8_t *data, size_t len, const IPAddress addr, uint16_t port, tcpip_adapter_if_t tcpip_if)
 {
     ip_addr_t daddr;
-    daddr.type = IPADDR_TYPE_V4;
-    daddr.u_addr.ip4.addr = addr;
+    addr.to_ip_addr_t(&daddr);
     return writeTo(data, len, &daddr, port, tcpip_if);
 }
 
@@ -776,44 +772,12 @@ IPAddress AsyncUDP::listenIP()
     return IPAddress(_pcb->remote_ip.u_addr.ip4.addr);
 }
 
-bool AsyncUDP::listen(const IPv6Address addr, uint16_t port)
-{
-    ip_addr_t laddr;
-    laddr.type = IPADDR_TYPE_V6;
-    memcpy((uint8_t*)(laddr.u_addr.ip6.addr), (const uint8_t*)addr, 16);
-    return listen(&laddr, port);
-}
-
-bool AsyncUDP::listenMulticast(const IPv6Address addr, uint16_t port, uint8_t ttl, tcpip_adapter_if_t tcpip_if)
-{
-    ip_addr_t laddr;
-    laddr.type = IPADDR_TYPE_V6;
-    memcpy((uint8_t*)(laddr.u_addr.ip6.addr), (const uint8_t*)addr, 16);
-    return listenMulticast(&laddr, port, ttl, tcpip_if);
-}
-
-bool AsyncUDP::connect(const IPv6Address addr, uint16_t port)
-{
-    ip_addr_t daddr;
-    daddr.type = IPADDR_TYPE_V6;
-    memcpy((uint8_t*)(daddr.u_addr.ip6.addr), (const uint8_t*)addr, 16);
-    return connect(&daddr, port);
-}
-
-size_t AsyncUDP::writeTo(const uint8_t *data, size_t len, const IPv6Address addr, uint16_t port, tcpip_adapter_if_t tcpip_if)
-{
-    ip_addr_t daddr;
-    daddr.type = IPADDR_TYPE_V6;
-    memcpy((uint8_t*)(daddr.u_addr.ip6.addr), (const uint8_t*)addr, 16);
-    return writeTo(data, len, &daddr, port, tcpip_if);
-}
-
-IPv6Address AsyncUDP::listenIPv6()
+IPAddress AsyncUDP::listenIPv6()
 {
     if(!_pcb || _pcb->remote_ip.type != IPADDR_TYPE_V6){
-        return IPv6Address();
+        return IPAddress(IPv6);
     }
-    return IPv6Address(_pcb->remote_ip.u_addr.ip6.addr);
+    return IPAddress(IPv6, (const uint8_t *)_pcb->remote_ip.u_addr.ip6.addr, _pcb->remote_ip.u_addr.ip6.zone);
 }
 
 size_t AsyncUDP::write(const uint8_t *data, size_t len)
@@ -866,14 +830,6 @@ size_t AsyncUDP::sendTo(AsyncUDPMessage &message, const IPAddress addr, uint16_t
     return writeTo(message.data(), message.length(), addr, port, tcpip_if);
 }
 
-size_t AsyncUDP::sendTo(AsyncUDPMessage &message, const IPv6Address addr, uint16_t port, tcpip_adapter_if_t tcpip_if)
-{
-    if(!message) {
-        return 0;
-    }
-    return writeTo(message.data(), message.length(), addr, port, tcpip_if);
-}
-
 size_t AsyncUDP::send(AsyncUDPMessage &message)
 {
     if(!message) {

docs/source/api/wifi.rst

@@ -2,7 +2,6 @@
 #define ESPASYNCUDP_H
 
 #include "IPAddress.h"
-#include "IPv6Address.h"
 #include "Print.h"
 #include "Stream.h"
 #include <functional>
@@ -81,10 +80,10 @@ class AsyncUDPPacket : public Stream
     tcpip_adapter_if_t interface();
 
     IPAddress localIP();
-    IPv6Address localIPv6();
+    IPAddress localIPv6();
     uint16_t localPort();
     IPAddress remoteIP();
-    IPv6Address remoteIPv6();
+    IPAddress remoteIPv6();
     uint16_t remotePort();
     void remoteMac(uint8_t * mac);
 
@@ -121,22 +120,18 @@ class AsyncUDP : public Print
 
     bool listen(const ip_addr_t *addr, uint16_t port);
     bool listen(const IPAddress addr, uint16_t port);
-    bool listen(const IPv6Address addr, uint16_t port);
     bool listen(uint16_t port);
 
     bool listenMulticast(const ip_addr_t *addr, uint16_t port, uint8_t ttl=1, tcpip_adapter_if_t tcpip_if=TCPIP_ADAPTER_IF_MAX);
     bool listenMulticast(const IPAddress addr, uint16_t port, uint8_t ttl=1, tcpip_adapter_if_t tcpip_if=TCPIP_ADAPTER_IF_MAX);
-    bool listenMulticast(const IPv6Address addr, uint16_t port, uint8_t ttl=1, tcpip_adapter_if_t tcpip_if=TCPIP_ADAPTER_IF_MAX);
 
     bool connect(const ip_addr_t *addr, uint16_t port);
     bool connect(const IPAddress addr, uint16_t port);
-    bool connect(const IPv6Address addr, uint16_t port);
 
     void close();
 
     size_t writeTo(const uint8_t *data, size_t len, const ip_addr_t *addr, uint16_t port, tcpip_adapter_if_t tcpip_if=TCPIP_ADAPTER_IF_MAX);
     size_t writeTo(const uint8_t *data, size_t len, const IPAddress addr, uint16_t port, tcpip_adapter_if_t tcpip_if=TCPIP_ADAPTER_IF_MAX);
-    size_t writeTo(const uint8_t *data, size_t len, const IPv6Address addr, uint16_t port, tcpip_adapter_if_t tcpip_if=TCPIP_ADAPTER_IF_MAX);
     size_t write(const uint8_t *data, size_t len);
     size_t write(uint8_t data);
 
@@ -147,14 +142,13 @@ class AsyncUDP : public Print
 
     size_t sendTo(AsyncUDPMessage &message, const ip_addr_t *addr, uint16_t port, tcpip_adapter_if_t tcpip_if=TCPIP_ADAPTER_IF_MAX);
     size_t sendTo(AsyncUDPMessage &message, const IPAddress addr, uint16_t port, tcpip_adapter_if_t tcpip_if=TCPIP_ADAPTER_IF_MAX);
-    size_t sendTo(AsyncUDPMessage &message, const IPv6Address addr, uint16_t port, tcpip_adapter_if_t tcpip_if=TCPIP_ADAPTER_IF_MAX);
     size_t send(AsyncUDPMessage &message);
 
     size_t broadcastTo(AsyncUDPMessage &message, uint16_t port, tcpip_adapter_if_t tcpip_if=TCPIP_ADAPTER_IF_MAX);
     size_t broadcast(AsyncUDPMessage &message);
 
     IPAddress listenIP();
-    IPv6Address listenIPv6();
+    IPAddress listenIPv6();
     bool connected();
 	esp_err_t lastErr();
     operator bool();