espressif: actually disable v6 support on select boards

Author: jepler

ports/espressif/boards/lolin_c3_pico/sdkconfig

@@ -7,6 +7,7 @@
 #
 # LWIP
 #
+# CONFIG_LWIP_IPV6 is not set
 CONFIG_LWIP_LOCAL_HOSTNAME="lolin-c3-pico"
 # end of LWIP
 

ports/espressif/boards/waveshare_esp32_s3_tiny/sdkconfig

@@ -7,6 +7,7 @@
 #
 # LWIP
 #
+# CONFIG_LWIP_IPV6 is not set
 CONFIG_LWIP_LOCAL_HOSTNAME="waveshare-esp32-s3-tiny"
 # end of LWIP
 

ports/espressif/common-hal/socketpool/Socket.c

@@ -195,7 +195,7 @@ static bool _socketpool_socket(socketpool_socketpool_obj_t *self,
     if (family == SOCKETPOOL_AF_INET) {
         addr_family = AF_INET;
         ipproto = IPPROTO_IP;
-    #if LWIP_IPV6
+    #if CIRCUITPY_SOCKETPOOL_IPV6
     } else { // INET6
         addr_family = AF_INET6;
         ipproto = IPPROTO_IPV6;
@@ -345,14 +345,14 @@ socketpool_socket_obj_t *common_hal_socketpool_socket_accept(socketpool_socket_o
     }
 }
 
-// TODO: ipv6
 size_t common_hal_socketpool_socket_bind(socketpool_socket_obj_t *self,
     const char *host, size_t hostlen, uint32_t port) {
     struct sockaddr_storage bind_addr;
     const char *broadcast = "<broadcast>";
 
     bind_addr.ss_family = self->family;
 
+    #if CIRCUITPY_SOCKETPOOL_IPV6
     if (self->family == AF_INET6) {
         struct sockaddr_in6 *addr6 = (void *)&bind_addr;
         addr6->sin6_port = htons(port);
@@ -362,7 +362,9 @@ size_t common_hal_socketpool_socket_bind(socketpool_socket_obj_t *self,
         } else {
             socketpool_resolve_host_or_throw(self->family, self->type, host, &bind_addr, port);
         }
-    } else {
+    } else
+    #endif
+    {
         struct sockaddr_in *addr4 = (void *)&bind_addr;
         addr4->sin_port = htons(port);
         if (hostlen == 0) {

ports/espressif/common-hal/wifi/Radio.c

@@ -461,14 +461,20 @@ static mp_obj_t common_hal_wifi_radio_get_addresses_netif(wifi_radio_obj_t *self
     esp_netif_get_ip_info(netif, &ip_info);
     int n_addresses4 = ip_info.ip.addr != INADDR_NONE;
 
+    #if CIRCUITPY_SOCKETPOOL_IPV6
     esp_ip6_addr_t addresses[LWIP_IPV6_NUM_ADDRESSES];
     int n_addresses6 = esp_netif_get_all_ip6(netif, &addresses[0]);
+    #else
+    int n_addresses6 = 0;
+    #endif
     int n_addresses = n_addresses4 + n_addresses6;
-
     mp_obj_tuple_t *result = MP_OBJ_TO_PTR(mp_obj_new_tuple(n_addresses, NULL));
+
+    #if CIRCUITPY_SOCKETPOOL_IPV6
     for (int i = 0; i < n_addresses6; i++) {
         result->items[i] = espaddr6_to_str(&addresses[i]);
     }
+    #endif
 
     if (n_addresses4) {
         result->items[n_addresses6] = espaddr4_to_str(&ip_info.ip);

ports/espressif/common-hal/wifi/__init__.c

@@ -241,7 +241,9 @@ void wifi_reset(void) {
 void ipaddress_ipaddress_to_esp_idf(mp_obj_t ip_address, ip_addr_t *esp_ip_address) {
     if (mp_obj_is_type(ip_address, &ipaddress_ipv4address_type)) {
         ipaddress_ipaddress_to_esp_idf_ip4(ip_address, (esp_ip4_addr_t *)esp_ip_address);
+        #if LWIP_IPV6
         esp_ip_address->type = IPADDR_TYPE_V4;
+        #endif
     } else {
         struct sockaddr_storage addr_storage;
         socketpool_resolve_host_or_throw(AF_UNSPEC, SOCK_STREAM, mp_obj_str_get_str(ip_address), &addr_storage, 1);
@@ -283,10 +285,13 @@ mp_obj_t espaddr6_to_str(const esp_ip6_addr_t *espaddr) {
 
 mp_obj_t sockaddr_to_str(const struct sockaddr_storage *sockaddr) {
     char buf[IPADDR_STRLEN_MAX];
+    #if CIRCUITPY_SOCKETPOOL_IPV6
     if (sockaddr->ss_family == AF_INET6) {
         const struct sockaddr_in6 *addr6 = (const void *)sockaddr;
         inet_ntop(AF_INET6, &addr6->sin6_addr, buf, sizeof(buf));
-    } else {
+    } else
+    #endif
+    {
         const struct sockaddr_in *addr = (const void *)sockaddr;
         inet_ntop(AF_INET, &addr->sin_addr, buf, sizeof(buf));
     }
@@ -298,20 +303,24 @@ mp_obj_t sockaddr_to_tuple(const struct sockaddr_storage *sockaddr) {
         sockaddr_to_str(sockaddr),
     };
     int n = 2;
+    #if CIRCUITPY_SOCKETPOOL_IPV6
     if (sockaddr->ss_family == AF_INET6) {
         const struct sockaddr_in6 *addr6 = (const void *)sockaddr;
         args[1] = MP_OBJ_NEW_SMALL_INT(htons(addr6->sin6_port));
         args[2] = MP_OBJ_NEW_SMALL_INT(addr6->sin6_flowinfo);
         args[3] = MP_OBJ_NEW_SMALL_INT(addr6->sin6_scope_id);
         n = 4;
-    } else {
+    } else
+    #endif
+    {
         const struct sockaddr_in *addr = (const void *)sockaddr;
         args[1] = MP_OBJ_NEW_SMALL_INT(htons(addr->sin_port));
     }
     return mp_obj_new_tuple(n, args);
 }
 
 void sockaddr_to_espaddr(const struct sockaddr_storage *sockaddr, esp_ip_addr_t *espaddr) {
+    #if CIRCUITPY_SOCKETPOOL_IPV6
     MP_STATIC_ASSERT(IPADDR_TYPE_V4 == ESP_IPADDR_TYPE_V4);
     MP_STATIC_ASSERT(IPADDR_TYPE_V6 == ESP_IPADDR_TYPE_V6);
     MP_STATIC_ASSERT(sizeof(ip_addr_t) == sizeof(esp_ip_addr_t));
@@ -323,7 +332,9 @@ void sockaddr_to_espaddr(const struct sockaddr_storage *sockaddr, esp_ip_addr_t
         memcpy(&espaddr->u_addr.ip6.addr, &addr6->sin6_addr, sizeof(espaddr->u_addr.ip6.addr));
         espaddr->u_addr.ip6.zone = addr6->sin6_scope_id;
         espaddr->type = ESP_IPADDR_TYPE_V6;
-    } else {
+    } else
+    #endif
+    {
         const struct sockaddr_in *addr = (const void *)sockaddr;
         MP_STATIC_ASSERT(sizeof(espaddr->u_addr.ip4.addr) == sizeof(addr->sin_addr));
         memcpy(&espaddr->u_addr.ip4.addr, &addr->sin_addr, sizeof(espaddr->u_addr.ip4.addr));
@@ -332,11 +343,14 @@ void sockaddr_to_espaddr(const struct sockaddr_storage *sockaddr, esp_ip_addr_t
 }
 
 void espaddr_to_sockaddr(const esp_ip_addr_t *espaddr, struct sockaddr_storage *sockaddr, int port) {
+    #if CIRCUITPY_SOCKETPOOL_IPV6
     if (espaddr->type == ESP_IPADDR_TYPE_V6) {
         struct sockaddr_in6 *addr6 = (void *)sockaddr;
         memcpy(&addr6->sin6_addr, &espaddr->u_addr.ip6.addr, sizeof(espaddr->u_addr.ip6.addr));
         addr6->sin6_scope_id = espaddr->u_addr.ip6.zone;
-    } else {
+    } else
+    #endif
+    {
         struct sockaddr_in *addr = (void *)sockaddr;
         memcpy(&addr->sin_addr, &espaddr->u_addr.ip4.addr, sizeof(espaddr->u_addr.ip4.addr));
     }

shared-bindings/wifi/Radio.c

@@ -616,13 +616,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_addresses_ap_obj, _wifi_radio_get_addre
 MP_PROPERTY_GETTER(wifi_radio_addresses_ap_obj,
     (mp_obj_t)&wifi_radio_get_addresses_ap_obj);
 
-
-#if 0
-MP_WEAK mp_obj_t common_hal_wifi_radio_get_addresses(wifi_radio_obj_t *self) {
-    return mp_const_none;
-}
-#endif
-
 //|     ipv4_address: Optional[ipaddress.IPv4Address]
 //|     """IP v4 Address of the station when connected to an access point. None otherwise. (read-only)"""
 static mp_obj_t _wifi_radio_get_ipv4_address(mp_obj_t self) {