wip; scanning working except for AuthMode

get/set hostname

power mgmt, ip config; compiles

wip

compiles

SSID connection working

fix authmode in scanned results

getaddrinfo

fix incorrect const in socket recv API

wip: progress on socket ops

wip

wip; removing heap ops; still need to do sock ops

HTTP fetches work

wip ssl

HTTPS fetching works

wip: manage nina client and server

UDP working both ways

Author: dhalbert

devices/airlift/common-hal/socketpool/Socket.c

@@ -9,21 +9,64 @@
 #include "py/obj.h"
 
 #include "common-hal/socketpool/SocketPool.h"
+#include "shared-bindings/wifi/Radio.h"
+
+typedef enum {
+    SOCKET_CLOSED = 0,
+    SOCKET_LISTEN = 1,
+    SOCKET_SYN_SENT = 2,
+    SOCKET_SYN_RCVD = 3,
+    SOCKET_ESTABLISHED = 4,
+    SOCKET_FIN_WAIT_1 = 5,
+    SOCKET_FIN_WAIT_2 = 6,
+    SOCKET_CLOSE_WAIT = 7,
+    SOCKET_CLOSING = 8,
+    SOCKET_LAST_ACK = 9,
+    SOCKET_TIME_WAIT = 10,
+} airlift_socket_status_t;
 
 typedef struct ssl_sslsocket_obj ssl_sslsocket_obj_t;
 
 typedef struct {
     mp_obj_base_t base;
-    int num;
-    int type;
-    int family;
-    int ipproto;
-    bool connected;
-    socketpool_socketpool_obj_t *pool;
+    socketpool_socketpool_obj_t *socketpool;
     ssl_sslsocket_obj_t *ssl_socket;
-    mp_uint_t timeout_ms;
+    mp_uint_t timeout_ms;   // SOCKET_BLOCK_FOREVER is (mp_uint_t)-1.
+    size_t hostname_len;
+    uint8_t hostname[MAX_HOSTNAME_LENGTH + 1];
+    mp_uint_t port;
+    uint8_t num;
+    uint8_t type;
+    uint8_t family;
+    uint8_t proto;
+    bool connected;
+    bool bound;
+    bool client_started;
+    bool server_started;
 } socketpool_socket_obj_t;
 
+#define AIRLIFT_SOCKET_DEFAULT_TIMEOUT (3000)
+
+#define IPPROTO_IP      0
+#define IPPROTO_ICMP    1
+#define IPPROTO_TCP     6
+#define IPPROTO_UDP     17
+
+#define AF_UNSPEC       0
+#define AF_INET         2
+
+#define SOCK_STREAM     1
+#define SOCK_DGRAM      2
+#define SOCK_RAW        3
+
+// Used both internally and by AirLift.
+#define NO_SOCKET       255
+
 void socket_user_reset(void);
 // Unblock workflow socket select thread (platform specific)
 void socketpool_socket_poll_resume(void);
+
+void socketpool_socket_start_client_mode(socketpool_socket_obj_t *self, const char *host, size_t hostlen, uint32_t port, airlift_conn_mode_t mode);
+void socketpool_socket_stop_client(socketpool_socket_obj_t *self);
+
+void socketpool_socket_start_server_mode(socketpool_socket_obj_t *self, airlift_conn_mode_t mode);

devices/airlift/common-hal/socketpool/Socket.h

@@ -8,117 +8,86 @@
 #include "common-hal/socketpool/Socket.h"
 
 #include "py/runtime.h"
+#include "shared-bindings/ipaddress/IPv4Address.h"
 #include "shared-bindings/wifi/__init__.h"
 #include "common-hal/socketpool/__init__.h"
 
 void common_hal_socketpool_socketpool_construct(socketpool_socketpool_obj_t *self, mp_obj_t radio) {
-    // if (radio != MP_OBJ_FROM_PTR(&common_hal_wifi_radio_obj)) {
-    //     mp_raise_ValueError(MP_ERROR_TEXT("SocketPool can only be used with wifi.radio"));
-    // }
+    if (radio != MP_OBJ_FROM_PTR(&common_hal_wifi_radio_obj)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("SocketPool can only be used with wifi.radio"));
+    }
+    // Not really needed, but more convenient.
+    self->radio = radio;
 }
 
 // common_hal_socketpool_socket is in socketpool/Socket.c to centralize open socket tracking.
 
-// int socketpool_getaddrinfo_common(const char *host, int service, const struct addrinfo *hints, struct addrinfo **res) {
-//     // As of 2022, the version of lwip in esp-idf does not handle the
-//     // trailing-dot syntax of domain names, so emulate it.
-//     // Remove this once https://github.com/espressif/esp-idf/issues/10013 has
-//     // been implemented
-//     if (host) {
-//         size_t strlen_host = strlen(host);
-//         if (strlen_host && host[strlen_host - 1] == '.') {
-//             mp_obj_t nodot = mp_obj_new_str(host, strlen_host - 1);
-//             host = mp_obj_str_get_str(nodot);
-//         }
-//     }
-
-//     char service_buf[6];
-//     snprintf(service_buf, sizeof(service_buf), "%d", service);
-
-//     return lwip_getaddrinfo(host, service_buf, hints, res);
-// }
-
-// static mp_obj_t format_address(const struct sockaddr *addr, int family) {
-//     char ip_str[IPADDR_STRLEN_MAX]; // big enough for any supported address type
-//     const struct sockaddr_in *a = (void *)addr;
-
-//     switch (family) {
-//         #if CIRCUITPY_SOCKETPOOL_IPV6
-//         case AF_INET6:
-//             inet_ntop(family, &((const struct sockaddr_in6 *)a)->sin6_addr, ip_str, sizeof(ip_str));
-//             break;
-//         #endif
-//         default:
-//         case AF_INET:
-//             inet_ntop(family, &((const struct sockaddr_in *)a)->sin_addr, ip_str, sizeof(ip_str));
-//             break;
-//     }
-//     return mp_obj_new_str(ip_str, strlen(ip_str));
-//     return mp_const_none;
-// }
-
-// 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;
-//     return mp_const_none;
-// }
-
-// 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);
-//     // result->items[1] = MP_OBJ_NEW_SMALL_INT(ai->ai_socktype);
-//     // result->items[2] = MP_OBJ_NEW_SMALL_INT(ai->ai_protocol);
-//     // result->items[3] = ai->ai_canonname ? mp_obj_new_str(ai->ai_canonname, strlen(ai->ai_canonname)) : MP_OBJ_NEW_QSTR(MP_QSTR_);
-//     // result->items[4] = convert_sockaddr(ai, port);
-//     // return result;
-//     return mp_const_none;
-// }
+bool socketpool_gethostbyname_ipv4(socketpool_socketpool_obj_t *self, const char *host, uint8_t ipv4[4]) {
+    const uint8_t *req_host_params[1] = { (uint8_t *)host };
+    size_t req_host_param_lengths[1] = { strlen(host) };
+
+    uint8_t result = 0;
+    uint8_t *req_host_responses[1] = { &result };
+    size_t req_host_response_lengths[1] = { 1 };
+
+    // If host is a numeric IP address, AirLift will just parse and return the address.
+
+    size_t num_responses = wifi_radio_send_command_get_response(self->radio, REQ_HOST_BY_NAME_CMD,
+        req_host_params, req_host_param_lengths, LENGTHS_8, MP_ARRAY_SIZE(req_host_params),
+        req_host_responses, req_host_response_lengths, LENGTHS_8, MP_ARRAY_SIZE(req_host_responses),
+        AIRLIFT_DEFAULT_TIMEOUT_MS);
+
+    if (num_responses >= 1) {
+        if (result == 0) {
+            return false;
+        }
+
+        uint8_t *get_host_responses[1] = { ipv4 };
+        size_t get_host_response_lengths[1] = { IPV4_LENGTH };
+
+        // Now actually get the name.
+        num_responses = wifi_radio_send_command_get_response(self->radio, GET_HOST_BY_NAME_CMD,
+            NULL, NULL, LENGTHS_8, 0,
+            get_host_responses, get_host_response_lengths, LENGTHS_8, MP_ARRAY_SIZE(get_host_responses),
+            AIRLIFT_DEFAULT_TIMEOUT_MS);
+        if (num_responses == 1) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+static mp_obj_t socketpool_socketpool_gethostbyname_str(socketpool_socketpool_obj_t *self, const char *host) {
+    uint8_t ipv4[4] = { 0 };
+
+    if (!socketpool_gethostbyname_ipv4(self, host, ipv4)) {
+        // Could not resolve or parse hostname.
+        return mp_const_none;
+    }
+
+    vstr_t vstr;
+    mp_print_t print;
+    vstr_init_print(&vstr, 16, &print);
+    mp_printf(&print, "%d.%d.%d.%d", ipv4[0], ipv4[1], ipv4[2], ipv4[3]);
+    return mp_obj_new_str_from_vstr(&vstr);
+}
 
 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) {
-    // const struct addrinfo hints = {
-    //     .ai_flags = flags,
-    //     .ai_family = family,
-    //     .ai_protocol = proto,
-    //     .ai_socktype = type,
-    // };
-    //
-    // struct addrinfo *res = NULL;
-    // int err = socketpool_getaddrinfo_common(host, port, &hints, &res);
-    // if (err != 0 || res == NULL) {
-    //     common_hal_socketpool_socketpool_raise_gaierror_noname();
-    // }
-    //
-    // nlr_buf_t nlr;
-    // if (nlr_push(&nlr) == 0) {
-    //     mp_obj_t result = mp_obj_new_list(0, NULL);
-    //     for (struct addrinfo *ai = res; ai; ai = ai->ai_next) {
-    //         mp_obj_list_append(result, convert_addrinfo(ai, port));
-    //     }
-    //     nlr_pop();
-    //     lwip_freeaddrinfo(res);
-    //     return result;
-    // } else {
-    //     lwip_freeaddrinfo(res);
-    //     nlr_raise(MP_OBJ_FROM_PTR(nlr.ret_val));
-    // }
-    return mp_const_none;
+    mp_obj_t ip_str = socketpool_socketpool_gethostbyname_str(self, host);
+    if (ip_str == mp_const_none) {
+        // Could not resolve hostname.
+        common_hal_socketpool_socketpool_raise_gaierror_noname();
+    }
+
+    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);
 }

devices/airlift/common-hal/socketpool/SocketPool.c

@@ -7,7 +7,11 @@
 #pragma once
 
 #include "py/obj.h"
+#include "shared-bindings/wifi/Radio.h"
 
 typedef struct {
     mp_obj_base_t base;
+    wifi_radio_obj_t *radio;
 } socketpool_socketpool_obj_t;
+
+bool socketpool_gethostbyname_ipv4(socketpool_socketpool_obj_t *self, const char *host, uint8_t ipv4[IPV4_LENGTH]);

devices/airlift/common-hal/socketpool/SocketPool.h

@@ -9,5 +9,5 @@
 #include "common-hal/socketpool/Socket.h"
 
 void socketpool_user_reset(void) {
-    // socket_user_reset();
+    socket_user_reset();
 }

devices/airlift/common-hal/socketpool/__init__.c

@@ -5,8 +5,3 @@
 // SPDX-License-Identifier: MIT
 
 #pragma once
-
-struct addrinfo;
-
-// int socketpool_getaddrinfo_common(const char *host, int service, const struct addrinfo *hints, struct addrinfo **res);
-// void socketpool_resolve_host_or_throw(int family, int type, const char *hostname, struct sockaddr_storage *addr, int port);

devices/airlift/common-hal/socketpool/__init__.h

@@ -11,34 +11,28 @@
 #include "py/stream.h"
 
 void common_hal_ssl_sslcontext_construct(ssl_sslcontext_obj_t *self) {
-    // common_hal_ssl_sslcontext_set_default_verify_paths(self);
+    common_hal_ssl_sslcontext_set_default_verify_paths(self);
 }
 
 void common_hal_ssl_sslcontext_load_verify_locations(ssl_sslcontext_obj_t *self,
     const char *cadata) {
-    // self->crt_bundle_attach = NULL;
-    // self->use_global_ca_store = false;
-    // self->cacert_buf = (const unsigned char *)cadata;
-    // self->cacert_bytes = *cadata ? strlen(cadata) + 1 : 0;
+    mp_raise_NotImplementedError(NULL);
 }
 
 void common_hal_ssl_sslcontext_set_default_verify_paths(ssl_sslcontext_obj_t *self) {
-    // self->crt_bundle_attach = crt_bundle_attach;
-    // self->use_global_ca_store = true;
-    // self->cacert_buf = NULL;
-    // self->cacert_bytes = 0;
+    // The default paths are what's built in to NINA-FW, so nothing need be done.
 }
 
 bool common_hal_ssl_sslcontext_get_check_hostname(ssl_sslcontext_obj_t *self) {
-    // return self->check_name;
-    return false;
+    return true;
 }
 
 void common_hal_ssl_sslcontext_set_check_hostname(ssl_sslcontext_obj_t *self, bool value) {
-    // self->check_name = value;
+    if (!value) {
+        mp_raise_ValueError_varg(MP_ERROR_TEXT("%q must be %q"), MP_QSTR_check_hostname, MP_QSTR_true);
+    }
 }
 
 void common_hal_ssl_sslcontext_load_cert_chain(ssl_sslcontext_obj_t *self, mp_buffer_info_t *cert_buf, mp_buffer_info_t *key_buf) {
-    // self->cert_buf = *cert_buf;
-    // self->key_buf = *key_buf;
+    mp_raise_NotImplementedError(NULL);
 }

devices/airlift/common-hal/ssl/SSLContext.c

@@ -10,8 +10,8 @@
 
 typedef struct {
     mp_obj_base_t base;
-    bool check_name, use_global_ca_store;
-    const unsigned char *cacert_buf;
+    // bool check_name, use_global_ca_store;
+    // const unsigned char *cacert_buf;
     // size_t cacert_bytes;
     // int (*crt_bundle_attach)(mbedtls_ssl_config *conf);
     // mp_buffer_info_t cert_buf, key_buf;