Support non-IPv6 lwIP

Author: kuba2k2

src/AsyncTCP.cpp

@@ -843,7 +843,11 @@ bool AsyncClient::connect(ip_addr_t addr, uint16_t port) {
   tcp_pcb *pcb;
   {
     tcp_core_guard tcg;
+#if LWIP_IPV4 && LWIP_IPV6
     pcb = tcp_new_ip_type(addr.type);
+#else
+    pcb = tcp_new_ip_type(IPADDR_TYPE_V4);
+#endif
     if (!pcb) {
       log_e("pcb == NULL");
       return false;
@@ -863,8 +867,12 @@ bool AsyncClient::connect(ip_addr_t addr, uint16_t port) {
 bool AsyncClient::connect(const IPAddress &ip, uint16_t port) {
   ip_addr_t addr;
 #if ESP_IDF_VERSION_MAJOR < 5
+#if LWIP_IPV4 && LWIP_IPV6
   addr.u_addr.ip4.addr = ip;
   addr.type = IPADDR_TYPE_V4;
+#else
+  addr.addr = ip;
+#endif
 #else
   ip.to_ip_addr_t(&addr);
 #endif
@@ -1349,19 +1357,33 @@ uint16_t AsyncClient::getLocalPort() const {
 }
 
 ip4_addr_t AsyncClient::getRemoteAddress4() const {
+#if LWIP_IPV4 && LWIP_IPV6
   if (_pcb && _pcb->remote_ip.type == IPADDR_TYPE_V4) {
     return _pcb->remote_ip.u_addr.ip4;
-  } else {
+  }
+#else
+  if (_pcb) {
+    return _pcb->remote_ip;
+  }
+#endif
+  else {
     ip4_addr_t nulladdr;
     ip4_addr_set_zero(&nulladdr);
     return nulladdr;
   }
 }
 
 ip4_addr_t AsyncClient::getLocalAddress4() const {
+#if LWIP_IPV4 && LWIP_IPV6
   if (_pcb && _pcb->local_ip.type == IPADDR_TYPE_V4) {
     return _pcb->local_ip.u_addr.ip4;
-  } else {
+  }
+#else
+  if (_pcb) {
+    return _pcb->local_ip;
+  }
+#endif
+  else {
     ip4_addr_t nulladdr;
     ip4_addr_set_zero(&nulladdr);
     return nulladdr;
@@ -1492,24 +1514,34 @@ AsyncServer::AsyncServer(ip_addr_t addr, uint16_t port)
 #ifdef ARDUINO
 AsyncServer::AsyncServer(IPAddress addr, uint16_t port) : _port(port), _noDelay(false), _pcb(0), _connect_cb(0), _connect_cb_arg(0) {
 #if ESP_IDF_VERSION_MAJOR < 5
+#if LWIP_IPV4 && LWIP_IPV6
   _addr.type = IPADDR_TYPE_V4;
   _addr.u_addr.ip4.addr = addr;
+#else
+  _addr.addr = addr;
+#endif
 #else
   addr.to_ip_addr_t(&_addr);
 #endif
 }
-#if ESP_IDF_VERSION_MAJOR < 5
+#if ESP_IDF_VERSION_MAJOR < 5 && __has_include(<IPv6Address.h>) && LWIP_IPV6
 AsyncServer::AsyncServer(IPv6Address addr, uint16_t port) : _port(port), _noDelay(false), _pcb(0), _connect_cb(0), _connect_cb_arg(0) {
+#if LWIP_IPV4 && LWIP_IPV6
   _addr.type = IPADDR_TYPE_V6;
+#endif
   auto ipaddr = static_cast<const uint32_t *>(addr);
   _addr = IPADDR6_INIT(ipaddr[0], ipaddr[1], ipaddr[2], ipaddr[3]);
 }
 #endif
 #endif
 
 AsyncServer::AsyncServer(uint16_t port) : _port(port), _noDelay(false), _pcb(0), _connect_cb(0), _connect_cb_arg(0) {
+#if LWIP_IPV4 && LWIP_IPV6
   _addr.type = IPADDR_TYPE_ANY;
   _addr.u_addr.ip4.addr = INADDR_ANY;
+#else
+  _addr.addr = IPADDR_TYPE_ANY;
+#endif
 }
 
 AsyncServer::~AsyncServer() {
@@ -1533,7 +1565,11 @@ void AsyncServer::begin() {
   int8_t err;
   {
     tcp_core_guard tcg;
+#if LWIP_IPV4 && LWIP_IPV6
     _pcb = tcp_new_ip_type(_addr.type);
+#else
+    _pcb = tcp_new_ip_type(IPADDR_TYPE_V4);
+#endif
   }
   if (!_pcb) {
     log_e("_pcb == NULL");