Fix socket binding

.. & make web workflow bind to v6 if available. Binding v6 "any"
address also allows v4 connections

Author: jepler

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

@@ -348,20 +348,32 @@ 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_in bind_addr;
+    struct sockaddr_storage bind_addr;
     const char *broadcast = "<broadcast>";
-    uint32_t ip;
-    if (hostlen == 0) {
-        ip = IPADDR_ANY;
-    } else if (hostlen == strlen(broadcast) &&
-               memcmp(host, broadcast, strlen(broadcast)) == 0) {
-        ip = IPADDR_BROADCAST;
+
+    bind_addr.ss_family = self->family;
+
+    if (self->family == AF_INET6) {
+        struct sockaddr_in6 *addr6 = (void *)&bind_addr;
+        addr6->sin6_port = htons(port);
+        // no ipv6 broadcast
+        if (hostlen == 0) {
+            memset(&addr6->sin6_addr, 0, sizeof(addr6->sin6_addr));
+        } else {
+            socketpool_resolve_host_or_throw(self->family, self->type, host, &bind_addr, port);
+        }
     } else {
-        ip = inet_addr(host);
+        struct sockaddr_in *addr4 = (void *)&bind_addr;
+        addr4->sin_port = htons(port);
+        if (hostlen == 0) {
+            addr4->sin_addr.s_addr = IPADDR_ANY;
+        } else if (hostlen == strlen(broadcast) &&
+                   memcmp(host, broadcast, strlen(broadcast)) == 0) {
+            addr4->sin_addr.s_addr = IPADDR_BROADCAST;
+        } else {
+            socketpool_resolve_host_or_throw(self->family, self->type, host, &bind_addr, port);
+        }
     }
-    bind_addr.sin_addr.s_addr = ip;
-    bind_addr.sin_family = self->family;
-    bind_addr.sin_port = htons(port);
 
     int result = lwip_bind(self->num, (struct sockaddr *)&bind_addr, sizeof(bind_addr));
     if (result == 0) {

supervisor/shared/web_workflow/web_workflow.c

@@ -338,7 +338,11 @@ bool supervisor_start_web_workflow(void) {
         #endif
 
         if (common_hal_socketpool_socket_get_closed(&listening)) {
+            #if CIRCUITPY_SOCKETPOOL_IPV6
+            socketpool_socket(&pool, SOCKETPOOL_AF_INET6, SOCKETPOOL_SOCK_STREAM, 0, &listening);
+            #else
             socketpool_socket(&pool, SOCKETPOOL_AF_INET, SOCKETPOOL_SOCK_STREAM, 0, &listening);
+            #endif
             common_hal_socketpool_socket_settimeout(&listening, 0);
             // Bind to any ip. (Not checking for failures)
             common_hal_socketpool_socket_bind(&listening, "", 0, web_api_port);