Merge pull request #1660 from petermm/ipv6-disable

ESP32: Default disable (unsupported) IPv6

These changes are made under both the "Apache 2.0" and the "GNU Lesser General
Public License 2.1 or later" license terms (dual license).

SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1-or-later

Author: bettio

src/platforms/esp32/components/avm_builtins/socket_driver.c

@@ -107,16 +107,27 @@ uint32_t socket_tuple_to_addr(term addr_tuple)
 
 static void tuple_to_ip_addr(term address_tuple, ip_addr_t *out_addr)
 {
+#ifdef CONFIG_LWIP_IPV6
     out_addr->type = IPADDR_TYPE_V4;
     out_addr->u_addr.ip4.addr = htonl(socket_tuple_to_addr(address_tuple));
+#else
+    out_addr->addr = htonl(socket_tuple_to_addr(address_tuple));
+#endif
 }
 
 static void socket_fill_ipv4_addr_tuple(term addr_tuple, ip_addr_t *addr)
 {
+#ifdef CONFIG_LWIP_IPV6
     uint8_t ad1 = ip4_addr1(&(addr->u_addr.ip4));
     uint8_t ad2 = ip4_addr2(&(addr->u_addr.ip4));
     uint8_t ad3 = ip4_addr3(&(addr->u_addr.ip4));
     uint8_t ad4 = ip4_addr4(&(addr->u_addr.ip4));
+#else
+    uint8_t ad1 = ip4_addr1(addr);
+    uint8_t ad2 = ip4_addr2(addr);
+    uint8_t ad3 = ip4_addr3(addr);
+    uint8_t ad4 = ip4_addr4(addr);
+#endif
     term_put_tuple_element(addr_tuple, 0, term_from_int11(ad1));
     term_put_tuple_element(addr_tuple, 1, term_from_int11(ad2));
     term_put_tuple_element(addr_tuple, 2, term_from_int11(ad3));
@@ -127,6 +138,7 @@ static void socket_fill_ipv4_addr_tuple(term addr_tuple, ip_addr_t *addr)
 static term socket_addr_to_tuple(Heap *heap, ip_addr_t *addr)
 {
     term addr_tuple;
+#ifdef CONFIG_LWIP_IPV6
     switch (IP_GET_TYPE(addr)) {
         case IPADDR_TYPE_V4: {
             addr_tuple = term_alloc_tuple(4, heap);
@@ -141,6 +153,11 @@ static term socket_addr_to_tuple(Heap *heap, ip_addr_t *addr)
         default:
             addr_tuple = term_invalid_term();
     }
+#else
+    // When IPv6 is disabled, we only have IPv4 addresses
+    addr_tuple = term_alloc_tuple(4, heap);
+    socket_fill_ipv4_addr_tuple(addr_tuple, addr);
+#endif
 
     return addr_tuple;
 }
@@ -888,7 +905,7 @@ static void do_connect(Context *ctx, const GenMessage *gen_message)
 
     TRACE("tcp: connecting to: %s\n", address_string);
 
-    struct ip_addr remote_ip;
+    ip_addr_t remote_ip;
     //TODO: use dns_gethostbyname instead
     err_t status = netconn_gethostbyname(address_string, &remote_ip);
     if (UNLIKELY(status != ERR_OK)) {

src/platforms/esp32/sdkconfig.defaults

@@ -1,3 +1,4 @@
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
 CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y
+CONFIG_LWIP_IPV6=n

src/platforms/esp32/sdkconfig.release-defaults

@@ -3,3 +3,4 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
 CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y
 CONFIG_COMPILER_OPTIMIZATION_PERF=y
 CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
+CONFIG_LWIP_IPV6=n

src/platforms/esp32/test/sdkconfig.ci.wokwi

@@ -6,3 +6,4 @@ CONFIG_ETH_USE_OPENETH=n
 CONFIG_COMPILER_OPTIMIZATION_PERF=y
 CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
 CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y
+CONFIG_LWIP_IPV6=n

src/platforms/esp32/test/sdkconfig.defaults

@@ -5,3 +5,4 @@ CONFIG_ESP_INT_WDT_TIMEOUT_MS=10000
 CONFIG_ETH_USE_OPENETH=y
 CONFIG_AVM_RTC_SLOW_MAX_SIZE=1024
 CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y
+CONFIG_LWIP_IPV6=n