socketpool: Always use getaddrinfo_raise.

jepler · jepler · commit 99e5e6651820 · 2024-07-22T16:20:34.000-05:00
diff --git a/ports/espressif/common-hal/socketpool/SocketPool.c b/ports/espressif/common-hal/socketpool/SocketPool.c
@@ -60,48 +60,30 @@ static mp_obj_t format_address(const struct sockaddr *addr, int family) {
     return mp_obj_new_str(ip_str, strlen(ip_str));
 }
 
-mp_obj_t common_hal_socketpool_socketpool_gethostbyname(socketpool_socketpool_obj_t *self,
-    const char *host) {
-
-    const struct addrinfo hints = {
-        .ai_family = AF_INET,
-        .ai_socktype = SOCK_STREAM,
-    };
-    struct addrinfo *res = NULL;
-    int err = socketpool_getaddrinfo_common(host, 0, &hints, &res);
-    if (err != 0 || res == NULL) {
-        return mp_const_none;
-    }
-
-    nlr_buf_t nlr;
-    if (nlr_push(&nlr) == 0) {
-        mp_obj_t result = format_address(res->ai_addr, res->ai_family);
-        nlr_pop();
-        lwip_freeaddrinfo(res);
-        return result;
-    } else {
-        lwip_freeaddrinfo(res);
-        nlr_raise(MP_OBJ_FROM_PTR(nlr.ret_val));
-    };
-}
-
-#if CIRCUITPY_SOCKETPOOL_IPV6
 static mp_obj_t convert_sockaddr(const struct addrinfo *ai, int port) {
+    #if CIRCUITPY_SOCKETPOOL_IPV6
     mp_int_t n_tuple = ai->ai_family == AF_INET6 ? 4 : 2;
+    #else
+    mp_int_t n_tuple = 2;
+    #endif
     mp_obj_tuple_t *result = MP_OBJ_TO_PTR(mp_obj_new_tuple(n_tuple, NULL));
     result->items[0] = format_address(ai->ai_addr, ai->ai_family);
     result->items[1] = MP_OBJ_NEW_SMALL_INT(port);
+    #if CIRCUITPY_SOCKETPOOL_IPV6
     if (ai->ai_family == AF_INET6) {
         const struct sockaddr_in6 *ai6 = (void *)ai->ai_addr;
         result->items[2] = MP_OBJ_NEW_SMALL_INT(ai6->sin6_flowinfo);
         result->items[3] = MP_OBJ_NEW_SMALL_INT(ai6->sin6_scope_id);
     }
+    #endif
     return result;
 }
 
 static mp_obj_t convert_addrinfo(const struct addrinfo *ai, int port) {
     MP_STATIC_ASSERT(AF_INET == SOCKETPOOL_AF_INET);
+    #if CIRCUITPY_SOCKETPOOL_IPV6
     MP_STATIC_ASSERT(AF_INET6 == SOCKETPOOL_AF_INET6);
+    #endif
     // MP_STATIC_ASSERT(AF_UNSPEC == SOCKETPOOL_AF_UNSPEC);
     mp_obj_tuple_t *result = MP_OBJ_TO_PTR(mp_obj_new_tuple(5, NULL));
     result->items[0] = MP_OBJ_NEW_SMALL_INT(ai->ai_family);
@@ -113,7 +95,6 @@ static mp_obj_t convert_addrinfo(const struct addrinfo *ai, int port) {
 }
 
 mp_obj_t common_hal_socketpool_getaddrinfo_raise(socketpool_socketpool_obj_t *self, const char *host, int port, int family, int type, int proto, int flags) {
-    MP_STATIC_ASSERT(LWIP_IPV6);
     const struct addrinfo hints = {
         .ai_flags = flags,
         .ai_family = family,
@@ -141,4 +122,3 @@ mp_obj_t common_hal_socketpool_getaddrinfo_raise(socketpool_socketpool_obj_t *se
         nlr_raise(MP_OBJ_FROM_PTR(nlr.ret_val));
     }
 }
-#endif
diff --git a/ports/raspberrypi/common-hal/socketpool/SocketPool.c b/ports/raspberrypi/common-hal/socketpool/SocketPool.c
@@ -10,6 +10,7 @@
 #include "shared/runtime/interrupt_char.h"
 #include "py/runtime.h"
 #include "shared-bindings/wifi/__init__.h"
+#include "shared-bindings/ipaddress/__init__.h"
 
 #include "lwip/dns.h"
 #include "lwip/inet.h"
@@ -22,7 +23,7 @@ void common_hal_socketpool_socketpool_construct(socketpool_socketpool_obj_t *sel
 
 // common_hal_socketpool_socket is in socketpool/Socket.c to centralize open socket tracking.
 
-mp_obj_t common_hal_socketpool_socketpool_gethostbyname(socketpool_socketpool_obj_t *self, const char *host) {
+static mp_obj_t common_hal_socketpool_socketpool_gethostbyname_raise(socketpool_socketpool_obj_t *self, const char *host) {
 
     ip_addr_t addr;
     socketpool_resolve_host_raise(host, &addr);
@@ -33,6 +34,23 @@ mp_obj_t common_hal_socketpool_socketpool_gethostbyname(socketpool_socketpool_ob
     return ip_obj;
 }
 
-mp_obj_t common_hal_socketpool_socketpool_gethostbyname_raise(socketpool_socketpool_obj_t *self, const char *host) {
-    return common_hal_socketpool_socketpool_gethostbyname(self, host);
+mp_obj_t common_hal_socketpool_getaddrinfo_raise(socketpool_socketpool_obj_t *self, const char *host, int port, int family, int type, int proto, int flags) {
+    mp_obj_t ip_str;
+
+    if (strlen(host) > 0 && ipaddress_parse_ipv4address(host, strlen(host), NULL)) {
+        ip_str = mp_obj_new_str(host, strlen(host));
+    } else {
+        ip_str = common_hal_socketpool_socketpool_gethostbyname_raise(self, host);
+    }
+
+    mp_obj_tuple_t *tuple = MP_OBJ_TO_PTR(mp_obj_new_tuple(5, NULL));
+    tuple->items[0] = MP_OBJ_NEW_SMALL_INT(SOCKETPOOL_AF_INET);
+    tuple->items[1] = MP_OBJ_NEW_SMALL_INT(SOCKETPOOL_SOCK_STREAM);
+    tuple->items[2] = MP_OBJ_NEW_SMALL_INT(0);
+    tuple->items[3] = MP_OBJ_NEW_QSTR(MP_QSTR_);
+    mp_obj_tuple_t *sockaddr = MP_OBJ_TO_PTR(mp_obj_new_tuple(2, NULL));
+    sockaddr->items[0] = ip_str;
+    sockaddr->items[1] = MP_OBJ_NEW_SMALL_INT(port);
+    tuple->items[4] = MP_OBJ_FROM_PTR(sockaddr);
+    return mp_obj_new_list(1, (mp_obj_t *)&tuple);
 }
diff --git a/shared-bindings/socketpool/SocketPool.c b/shared-bindings/socketpool/SocketPool.c
@@ -142,7 +142,6 @@ static mp_obj_t socketpool_socketpool_getaddrinfo(size_t n_args, const mp_obj_t
     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);
 
-    #if CIRCUITPY_SOCKETPOOL_IPV6
     return common_hal_socketpool_getaddrinfo_raise(
         self,
         mp_obj_str_get_str(args[ARG_host].u_obj),
@@ -151,30 +150,6 @@ static mp_obj_t socketpool_socketpool_getaddrinfo(size_t n_args, const mp_obj_t
         args[ARG_type].u_int,
         args[ARG_proto].u_int,
         args[ARG_flags].u_int);
-    #else
-    const char *host = mp_obj_str_get_str(args[ARG_host].u_obj);
-    mp_int_t port = args[ARG_port].u_int;
-    mp_obj_t ip_str = mp_const_none;
-
-    if (strlen(host) > 0 && ipaddress_parse_ipv4address(host, strlen(host), NULL)) {
-        ip_str = args[ARG_host].u_obj;
-    }
-
-    if (ip_str == mp_const_none) {
-        ip_str = common_hal_socketpool_socketpool_gethostbyname_raise(self, host);
-    }
-
-    mp_obj_tuple_t *tuple = MP_OBJ_TO_PTR(mp_obj_new_tuple(5, NULL));
-    tuple->items[0] = MP_OBJ_NEW_SMALL_INT(SOCKETPOOL_AF_INET);
-    tuple->items[1] = MP_OBJ_NEW_SMALL_INT(SOCKETPOOL_SOCK_STREAM);
-    tuple->items[2] = MP_OBJ_NEW_SMALL_INT(0);
-    tuple->items[3] = MP_OBJ_NEW_QSTR(MP_QSTR_);
-    mp_obj_tuple_t *sockaddr = MP_OBJ_TO_PTR(mp_obj_new_tuple(2, NULL));
-    sockaddr->items[0] = ip_str;
-    sockaddr->items[1] = MP_OBJ_NEW_SMALL_INT(port);
-    tuple->items[4] = MP_OBJ_FROM_PTR(sockaddr);
-    return mp_obj_new_list(1, (mp_obj_t *)&tuple);
-    #endif
 }
 static MP_DEFINE_CONST_FUN_OBJ_KW(socketpool_socketpool_getaddrinfo_obj, 1, socketpool_socketpool_getaddrinfo);
 
@@ -218,15 +193,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &socketpool_socketpool_locals_dict
     );
 
-MP_WEAK
-mp_obj_t common_hal_socketpool_socketpool_gethostbyname_raise(socketpool_socketpool_obj_t *self, const char *host) {
-    mp_obj_t ip_str = common_hal_socketpool_socketpool_gethostbyname(self, host);
-    if (ip_str == mp_const_none) {
-        common_hal_socketpool_socketpool_raise_gaierror_noname();
-    }
-    return ip_str;
-}
-
 MP_WEAK NORETURN
 void common_hal_socketpool_socketpool_raise_gaierror_noname(void) {
     vstr_t vstr;
diff --git a/shared-bindings/socketpool/SocketPool.h b/shared-bindings/socketpool/SocketPool.h
@@ -19,12 +19,6 @@ void common_hal_socketpool_socketpool_construct(socketpool_socketpool_obj_t *sel
 socketpool_socket_obj_t *common_hal_socketpool_socket(socketpool_socketpool_obj_t *self,
     socketpool_socketpool_addressfamily_t family, socketpool_socketpool_sock_t type, int proto);
 
-mp_obj_t common_hal_socketpool_socketpool_gethostbyname(socketpool_socketpool_obj_t *self,
-    const char *host);
-// raises an exception instead of returning mp_const_none in the case of error
-mp_obj_t common_hal_socketpool_socketpool_gethostbyname_raise(socketpool_socketpool_obj_t *self,
-    const char *host);
-
 // Non-allocating version for internal use. These sockets are not registered and, therefore, not
 // closed automatically.
 bool socketpool_socket(socketpool_socketpool_obj_t *self,
@@ -33,6 +27,4 @@ bool socketpool_socket(socketpool_socketpool_obj_t *self,
 
 NORETURN void common_hal_socketpool_socketpool_raise_gaierror_noname(void);
 
-#if CIRCUITPY_SOCKETPOOL_IPV6
 mp_obj_t common_hal_socketpool_getaddrinfo_raise(socketpool_socketpool_obj_t *self, const char *host, int port, int family, int type, int proto, int flags);
-#endif
