Tick more boxes on the TODO list

 * v6 on by default
 * dhcp can start v4 & v6 separately
 * self documenting property for v4 & v6 support
   * v4 support is always on .. for now

Author: jepler

docs/shared_bindings_matrix.py

@@ -85,6 +85,7 @@
     "sys": "CIRCUITPY_SYS",
     "terminalio": "CIRCUITPY_DISPLAYIO",
     "usb": "CIRCUITPY_PYUSB",
+    "wifi.supports_ipv6": "CIRCUITPY_SOCKETPOOL_IPV6",
 }
 
 MODULES_NOT_IN_BINDINGS = ["binascii", "errno", "json", "re", "ulab"]

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

@@ -532,11 +532,19 @@ void common_hal_wifi_radio_set_ipv4_dns(wifi_radio_obj_t *self, mp_obj_t ipv4_dn
     esp_netif_set_dns_info(self->netif, ESP_NETIF_DNS_MAIN, &dns_addr);
 }
 
-void common_hal_wifi_radio_start_dhcp_client(wifi_radio_obj_t *self) {
-    esp_netif_dhcpc_start(self->netif);
+void common_hal_wifi_radio_start_dhcp_client(wifi_radio_obj_t *self, bool ipv4, bool ipv6) {
+    if (ipv4) {
+        esp_netif_dhcpc_start(self->netif);
+    } else {
+        esp_netif_dhcpc_stop(self->netif);
+    }
     #if LWIP_IPV6_DHCP6
-    esp_netif_create_ip6_linklocal(self->netif);
-    dhcp6_enable_stateless(esp_netif_get_netif_impl(self->netif));
+    if (ipv6) {
+        esp_netif_create_ip6_linklocal(self->netif);
+        dhcp6_enable_stateless(esp_netif_get_netif_impl(self->netif));
+    } else {
+        dhcp6_disable(esp_netif_get_netif_impl(self->netif));
+    }
     #endif
 }
 

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

@@ -136,6 +136,8 @@ void common_hal_wifi_init(bool user_initiated) {
     if (wifi_inited) {
         if (user_initiated && !wifi_user_initiated) {
             common_hal_wifi_radio_set_enabled(self, true);
+            // explicitly start dhcp
+            common_hal_wifi_radio_start_dhcp_client(self, true, true);
         }
         return;
     }
@@ -201,6 +203,8 @@ void common_hal_wifi_init(bool user_initiated) {
     common_hal_wifi_radio_start_station(self);
     // start wifi
     common_hal_wifi_radio_set_enabled(self, true);
+    // explicitly start dhcp
+    common_hal_wifi_radio_start_dhcp_client(self, true, true);
 }
 
 void wifi_user_reset(void) {

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

@@ -406,8 +406,12 @@ void common_hal_wifi_radio_set_ipv4_dns(wifi_radio_obj_t *self, mp_obj_t ipv4_dn
     dns_setserver(0, &addr);
 }
 
-void common_hal_wifi_radio_start_dhcp_client(wifi_radio_obj_t *self) {
-    dhcp_start(NETIF_STA);
+void common_hal_wifi_radio_start_dhcp_client(wifi_radio_obj_t *self, bool ipv4, bool ipv6) {
+    if (ipv4) {
+        dhcp_start(NETIF_STA);
+    } else {
+        dhcp_stop(NETIF_STA);
+    }
 }
 
 void common_hal_wifi_radio_stop_dhcp_client(wifi_radio_obj_t *self) {

shared-bindings/wifi/Radio.c

@@ -700,14 +700,27 @@ MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_stations_ap_obj, wifi_radio_get_station
 MP_PROPERTY_GETTER(wifi_radio_stations_ap_obj,
     (mp_obj_t)&wifi_radio_get_stations_ap_obj);
 
-//|     def start_dhcp(self) -> None:
-//|         """Starts the station DHCP client."""
+//|     def start_dhcp(self, *, ipv4: bool = supports_ipv4, ipv6: bool = supports_ipv6) -> None:
+//|         """Starts the station DHCP client.
+//|
+//|         If specified
+//|         """
 //|         ...
-static mp_obj_t wifi_radio_start_dhcp_client(mp_obj_t self) {
-    common_hal_wifi_radio_start_dhcp_client(self);
+static mp_obj_t wifi_radio_start_dhcp_client(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_ipv4, ARG_ipv6 };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_ipv4, MP_ARG_KW_ONLY | MP_ARG_BOOL, { .u_bool = MP_ROM_TRUE } },
+        { MP_QSTR_ipv6, MP_ARG_KW_ONLY | MP_ARG_BOOL, { .u_bool = CIRCUITPY_SOCKETPOOL_IPV6 ? MP_ROM_TRUE : MP_ROM_FALSE } },
+    };
+
+    wifi_radio_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    common_hal_wifi_radio_start_dhcp_client(self, args[ARG_ipv4].u_bool, args[ARG_ipv6].u_bool);
     return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_start_dhcp_client_obj, wifi_radio_start_dhcp_client);
+static MP_DEFINE_CONST_FUN_OBJ_KW(wifi_radio_start_dhcp_client_obj, 1, wifi_radio_start_dhcp_client);
 
 //|     def stop_dhcp(self) -> None:
 //|         """Stops the station DHCP client. Needed to assign a static IP address."""

shared-bindings/wifi/Radio.h

@@ -86,7 +86,7 @@ extern void common_hal_wifi_radio_stop_ap(wifi_radio_obj_t *self);
 extern bool common_hal_wifi_radio_get_ap_active(wifi_radio_obj_t *self);
 extern mp_obj_t common_hal_wifi_radio_get_stations_ap(wifi_radio_obj_t *self);
 
-extern void common_hal_wifi_radio_start_dhcp_client(wifi_radio_obj_t *self);
+extern void common_hal_wifi_radio_start_dhcp_client(wifi_radio_obj_t *self, bool ipv4, bool ipv6);
 extern void common_hal_wifi_radio_stop_dhcp_client(wifi_radio_obj_t *self);
 extern void common_hal_wifi_radio_start_dhcp_server(wifi_radio_obj_t *self);
 extern void common_hal_wifi_radio_stop_dhcp_server(wifi_radio_obj_t *self);

shared-bindings/wifi/__init__.c

@@ -13,8 +13,32 @@
 
 //| """
 //| The `wifi` module provides necessary low-level functionality for managing
-//| wifi connections. Use `socketpool` for communicating over the network."""
+//| wifi connections. Use `socketpool` for communicating over the network.
 //|
+//| .. jinja
+//| """
+
+//| supports_ipv6: bool
+//| """``True`` when ipv6 is supported.  Read-only
+//|
+//| .. raw:: html
+//|
+//|     <p>
+//|     <details>
+//|     <summary>True on these boards</summary>
+//|     <ul>
+//|     {% for board in support_matrix_reverse["wifi.supports_ipv6"] %}
+//|     <li> {{ board }}
+//|     {% endfor %}
+//|     </ul>
+//|     </details>
+//|     </p>
+//|
+//| """
+
+//| supports_ipv4: bool
+//| """``True`` when ipv4 is supported.  Read-only"""
+
 //| radio: Radio
 //| """Wifi radio used to manage both station and AP modes.
 //| This object is the sole instance of `wifi.Radio`."""
@@ -43,6 +67,9 @@ static const mp_rom_map_elem_t wifi_module_globals_table[] = {
 
     // Properties
     { MP_ROM_QSTR(MP_QSTR_radio),       MP_ROM_PTR(&common_hal_wifi_radio_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_supports_ipv6), MP_ROM_PTR(CIRCUITPY_SOCKETPOOL_IPV6 ? MP_ROM_TRUE : MP_ROM_FALSE) },
+    { MP_ROM_QSTR(MP_QSTR_supports_ipv4), MP_ROM_TRUE },
 };
 static MP_DEFINE_CONST_DICT(wifi_module_globals, wifi_module_globals_table);