getting closer on HTTPS server

Author: dhalbert

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

@@ -165,7 +165,7 @@ static bool socketpool_socket_get_connection_info(socketpool_socket_obj_t *self,
 
 
 
-static airlift_socket_status_t socketpool_socket_status(socketpool_socket_obj_t *self) {
+static airlift_client_socket_status_t client_socket_status(socketpool_socket_obj_t *self) {
     const uint8_t *params[1] = { &self->num };
     size_t param_lengths[1] = { 1 };
 
@@ -185,43 +185,88 @@ static airlift_socket_status_t socketpool_socket_status(socketpool_socket_obj_t
     return result;
 }
 
-int socketpool_socket_accept(socketpool_socket_obj_t *self, mp_obj_t *peer_out, socketpool_socket_obj_t *accepted) {
-    if (self->type != SOCK_STREAM) {
-        return -MP_EOPNOTSUPP;
-    }
-
-    if (common_hal_socketpool_socket_get_closed(self)) {
-        return -MP_EBADF;
-    }
-
+static bool server_socket_status(socketpool_socket_obj_t *self) {
     const uint8_t *params[1] = { &self->num };
     size_t param_lengths[1] = { 1 };
 
-    uint8_t accept_socket_num;
-    uint8_t *responses[1] = { &accept_socket_num };
+    uint8_t result;
+    uint8_t *responses[1] = { &result };
     size_t response_lengths[1] = { 1 };
 
-    size_t num_responses = wifi_radio_send_command_get_response(self->socketpool->radio, AVAIL_DATA_TCP_CMD,
+    // GET_STATE_TCP_CMD is a misnomer. It only checks whether there's a tcpserver for the socket.
+    size_t num_responses = wifi_radio_send_command_get_response(self->socketpool->radio, GET_STATE_TCP_CMD,
         params, param_lengths, LENGTHS_8, MP_ARRAY_SIZE(params),
         responses, response_lengths, LENGTHS_8, MP_ARRAY_SIZE(responses),
         AIRLIFT_DEFAULT_TIMEOUT_MS);
 
     if (num_responses == 0) {
         raise_failed();
     }
-    if (accept_socket_num == NO_SOCKET) {
-        return -EBADF;
+
+    return result == 1;
+}
+
+int socketpool_socket_accept(socketpool_socket_obj_t *self, mp_obj_t *peer_out, socketpool_socket_obj_t *accepted) {
+    if (self->type != SOCK_STREAM) {
+        return -MP_EOPNOTSUPP;
+    }
+
+    if (!server_socket_status(self)) {
+        return -MP_ENOTCONN;
     }
 
-    return accept_socket_num;
+    const uint8_t *params[1] = { &self->num };
+    size_t param_lengths[1] = { 1 };
+
+    uint16_t accept_socket_num;
+    uint8_t *responses[1] = { (uint8_t *)&accept_socket_num };
+    size_t response_lengths[1] = { sizeof(accept_socket_num) };
+
+    const uint64_t start_time = supervisor_ticks_ms64();
+    while (true) {
+        // When passed a server socket, AVAIL_DATA_TCP_CMD returns the socket number on which to read data.
+        // For client and UDP sockets, it returns the number of bytes available. (Quite a difference!)
+        size_t num_responses = wifi_radio_send_command_get_response(self->socketpool->radio, AVAIL_DATA_TCP_CMD,
+            params, param_lengths, LENGTHS_8, MP_ARRAY_SIZE(params),
+            responses, response_lengths, LENGTHS_8, MP_ARRAY_SIZE(responses),
+            AIRLIFT_DEFAULT_TIMEOUT_MS);
+
+        if (num_responses == 0) {
+            raise_failed();
+        }
+
+        if (accept_socket_num != NO_SOCKET) {
+            return accept_socket_num;
+        }
+
+        if (self->timeout_ms == 0) {
+            // Non-blocking raises a different exception than a timeout.
+            return -MP_EAGAIN;
+        }
+        if ((self->timeout_ms != SOCKET_BLOCK_FOREVER &&
+             supervisor_ticks_ms64() - start_time >= self->timeout_ms) ||
+            mp_hal_is_interrupted()) {
+            return -MP_ETIMEDOUT;
+        }
+
+        RUN_BACKGROUND_TASKS;
+        // Give the AirLift some time to do work instead of asking again immediately.
+        mp_hal_delay_ms(50);
+    }
 }
 
+
 socketpool_socket_obj_t *common_hal_socketpool_socket_accept(socketpool_socket_obj_t *self, mp_obj_t *peer_out) {
     socketpool_socket_obj_t *accepted = mp_obj_malloc_with_finaliser(socketpool_socket_obj_t, NULL);
     socketpool_socket_reset(accepted);
 
     int ret = socketpool_socket_accept(self, peer_out, accepted);
     if (ret < 0) {
+        if (ret == -MP_ETIMEDOUT) {
+            // There is a specific subclass for timeouts.
+            mp_raise_msg(&mp_type_TimeoutError, NULL);
+        }
+        // Otherwise, raise a general OSError. Includes EAGAIN.
         mp_raise_OSError(-ret);
     }
 
@@ -238,16 +283,27 @@ int common_hal_socketpool_socket_bind(socketpool_socket_obj_t *self,
         mp_raise_OSError(MP_EINVAL);
     }
 
-    // Validate the host name (which might a numeric IP string) to an IPv4 address first.
+    // Validate the host name (which might be a numeric IP string) to an IPv4 address first.
     uint8_t ipv4[IPV4_LENGTH];
     if (!socketpool_gethostbyname_ipv4(self->socketpool, host, ipv4)) {
         // Could not resolve hostname.
         common_hal_socketpool_socketpool_raise_gaierror_noname();
     }
 
+    const uint8_t zero_ipv4[IPV4_LENGTH] = { 0 };
+    uint8_t self_ipv4[IPV4_LENGTH];
+    ipv4_uint32_to_bytes(wifi_radio_get_ipv4_address(self->socketpool->radio), self_ipv4);
+
+    // The bound host's IP must be this host: 0.0.0.0 or wifi.radio.ipv4_address.
+    if (memcmp(ipv4, zero_ipv4, IPV4_LENGTH) != 0 &&
+        memcmp(ipv4, self_ipv4, IPV4_LENGTH) != 0) {
+        // Same as CPython.
+        mp_raise_OSError(99);  // EADDRNOTAVAIL (sometimes 125!)
+    }
     self->bound = true;
     memcpy(self->hostname, host, hostlen);
     self->hostname_len = hostlen;
+    self->port = port;
     return 0;
 }
 
@@ -256,9 +312,7 @@ void socketpool_socket_close(socketpool_socket_obj_t *self) {
         socketpool_socket_stop_client(self);
     }
 
-    if (self->server_started) {
-        // TODO: how to shut down server?
-    }
+    // Re server_started: there is no way to shut down a server.
 }
 
 void common_hal_socketpool_socket_close(socketpool_socket_obj_t *self) {
@@ -342,12 +396,13 @@ void socketpool_socket_start_server_mode(socketpool_socket_obj_t *self, airlift_
         return;
     }
 
+    uint8_t zero_ipv4[IPV4_LENGTH] = { 0 };
     uint8_t port_bytes[2];
     be_uint16_to_uint8_bytes((uint16_t)self->port, port_bytes);
     uint8_t conn_mode = mode;
 
-    const uint8_t *params[5] = { self->hostname, port_bytes, &self->num, &conn_mode };
-    size_t param_lengths[5] = { self->hostname_len, 4, 2, 1, 1 };
+    const uint8_t *params[4] = { zero_ipv4, port_bytes, &self->num, &conn_mode };
+    size_t param_lengths[4] = { 4, 2, 1, 1 };
 
     uint8_t result;
     uint8_t *responses[1] = { &result };
@@ -371,11 +426,23 @@ void common_hal_socketpool_socket_connect(socketpool_socket_obj_t *self,
 }
 
 bool common_hal_socketpool_socket_get_closed(socketpool_socket_obj_t *self) {
-    return socketpool_socket_status(self) == SOCKET_CLOSED;
+    if (self->client_started) {
+        return client_socket_status(self) == SOCKET_CLOSED;
+    } else if (self->server_started) {
+        return !server_socket_status(self);
+    } else {
+        return false;
+    }
 }
 
 bool common_hal_socketpool_socket_get_connected(socketpool_socket_obj_t *self) {
-    return socketpool_socket_status(self) == SOCKET_ESTABLISHED;
+    if (self->client_started) {
+        return client_socket_status(self) == SOCKET_ESTABLISHED;
+    } else if (self->server_started) {
+        return server_socket_status(self);
+    } else {
+        return false;
+    }
 }
 
 bool common_hal_socketpool_socket_listen(socketpool_socket_obj_t *self, int backlog) {
@@ -447,8 +514,10 @@ int socketpool_socket_recv_into(socketpool_socket_obj_t *self, uint8_t *buf, uin
             mp_hal_is_interrupted()) {
             return 0;
         }
+
         RUN_BACKGROUND_TASKS;
-        mp_hal_delay_ms(500);
+        // Give the AirLift some time to do work instead of asking again immediately.
+        mp_hal_delay_ms(50);
     }
 }
 
@@ -542,7 +611,7 @@ mp_int_t common_hal_socketpool_socket_get_type(socketpool_socket_obj_t *self) {
 
 
 int common_hal_socketpool_socket_setsockopt(socketpool_socket_obj_t *self, int level, int optname, const void *value, size_t optlen) {
-    //// mp_raise_NotImplementedError(NULL); // TODO
+    // TODO: not sure any of this can be implemented.
     return 0;
 }
 

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

@@ -23,7 +23,7 @@ typedef enum {
     SOCKET_CLOSING = 8,
     SOCKET_LAST_ACK = 9,
     SOCKET_TIME_WAIT = 10,
-} airlift_socket_status_t;
+} airlift_client_socket_status_t;
 
 typedef struct ssl_sslsocket_obj ssl_sslsocket_obj_t;
 

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

@@ -55,7 +55,6 @@ void common_hal_ssl_sslsocket_bind(ssl_sslsocket_obj_t *self, mp_obj_t addr_in)
 }
 
 void common_hal_ssl_sslsocket_close(ssl_sslsocket_obj_t *self) {
-    // TODO: MORE??
     common_hal_socketpool_socket_close(self->socket);
 }
 

devices/airlift/common-hal/wifi/Radio.c

@@ -29,7 +29,7 @@
 
 
 // Print out SPI traffic with AirLift.
-#define DEBUG_AIRLIFT 1
+#define DEBUG_AIRLIFT 0
 
 #if DEBUG_AIRLIFT
 static const char *command_name(uint8_t command) {
@@ -420,7 +420,6 @@ size_t wifi_radio_wait_response_cmd(wifi_radio_obj_t *self, uint8_t cmd,
         response_lengths[i] = read_length;
 
         // Read and discard bytes that didn't fit in buffer.
-        // TODO report error?
         if (read_length > response_lengths[i]) {
             #if DEBUG_AIRLIFT
             PLAT_PRINTF("<!! response %d too long. expected %d, got %d\n", i, response_lengths[i], response_length);

shared-bindings/socketpool/Socket.c

@@ -57,7 +57,9 @@ static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socketpool_socket___exit___obj, 4, 4,
 //|     def accept(self) -> Tuple[Socket, Tuple[str, int]]:
 //|         """Accept a connection on a listening socket of type SOCK_STREAM,
 //|         creating a new socket of type SOCK_STREAM.
-//|         Returns a tuple of (new_socket, remote_address)"""
+//|         Returns a tuple of ``(new_socket, remote_address)``,
+//|         where remote address is a tuple of ``(host, port)``.
+//|         """
 //|
 static mp_obj_t _socketpool_socket_accept(mp_obj_t self_in) {
     socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -72,7 +74,7 @@ static MP_DEFINE_CONST_FUN_OBJ_1(socketpool_socket_accept_obj, _socketpool_socke
 //|     def bind(self, address: Tuple[str, int]) -> None:
 //|         """Bind a socket to an address
 //|
-//|         :param ~tuple address: tuple of (remote_address, remote_port)"""
+//|         :param ~tuple address: tuple of ``(host, port)``"""
 //|         ...
 //|
 static mp_obj_t socketpool_socket_bind(mp_obj_t self_in, mp_obj_t addr_in) {
@@ -110,7 +112,7 @@ static MP_DEFINE_CONST_FUN_OBJ_1(socketpool_socket_close_obj, _socketpool_socket
 //|     def connect(self, address: Tuple[str, int]) -> None:
 //|         """Connect a socket to a remote address
 //|
-//|         :param ~tuple address: tuple of (remote_address, remote_port)"""
+//|         :param ~tuple address: tuple of ``(host, port)``"""
 //|         ...
 //|
 static mp_obj_t socketpool_socket_connect(mp_obj_t self_in, mp_obj_t addr_in) {
@@ -154,7 +156,7 @@ static MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_listen_obj, socketpool_socket
 //|         Returns a tuple containing
 //|
 //|         * the number of bytes received into the given buffer
-//|         * a remote_address, which is a tuple of ip address and port number
+//|         * a remote_address, which is a tuple of ``("ip_address", port)``.
 //|
 //|         :param object buffer: buffer to read into"""
 //|         ...
@@ -289,7 +291,7 @@ static MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_sendall_obj, _socketpool_sock
 //|         Suits sockets of type SOCK_DGRAM
 //|
 //|         :param ~bytes bytes: some bytes to send
-//|         :param ~tuple address: tuple of (remote_address, remote_port)"""
+//|         :param ~tuple address: tuple of ``(host, port)``"""
 //|         ...
 //|
 static mp_obj_t socketpool_socket_sendto(mp_obj_t self_in, mp_obj_t data_in, mp_obj_t addr_in) {