sslsocket: Simplify handling the timeout value

We're just going to pass it down to the underlying socket, so don't
parse it, multiply it, etc.

Author: jepler

shared-bindings/ssl/SSLSocket.c

@@ -220,17 +220,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(ssl_sslsocket_send_obj, ssl_sslsocket_send);
 //|         ...
 STATIC mp_obj_t ssl_sslsocket_settimeout(mp_obj_t self_in, mp_obj_t timeout_in) {
     ssl_sslsocket_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_uint_t timeout_ms;
-    if (timeout_in == mp_const_none) {
-        timeout_ms = -1;
-    } else {
-        #if MICROPY_PY_BUILTINS_FLOAT
-        timeout_ms = 1000 * mp_obj_get_float(timeout_in);
-        #else
-        timeout_ms = 1000 * mp_obj_get_int(timeout_in);
-        #endif
-    }
-    common_hal_ssl_sslsocket_settimeout(self, timeout_ms);
+    common_hal_ssl_sslsocket_settimeout(self, timeout_in);
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(ssl_sslsocket_settimeout_obj, ssl_sslsocket_settimeout);
@@ -245,9 +235,9 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(ssl_sslsocket_settimeout_obj, ssl_sslsocket_set
 STATIC mp_obj_t ssl_sslsocket_setblocking(mp_obj_t self_in, mp_obj_t blocking) {
     ssl_sslsocket_obj_t *self = MP_OBJ_TO_PTR(self_in);
     if (mp_obj_is_true(blocking)) {
-        common_hal_ssl_sslsocket_settimeout(self, -1);
+        common_hal_ssl_sslsocket_settimeout(self, mp_const_none);
     } else {
-        common_hal_ssl_sslsocket_settimeout(self, 0);
+        common_hal_ssl_sslsocket_settimeout(self, MP_OBJ_NEW_SMALL_INT(0));
     }
     return mp_const_none;
 }

shared-bindings/ssl/SSLSocket.h

@@ -43,4 +43,4 @@ bool common_hal_ssl_sslsocket_get_connected(ssl_sslsocket_obj_t *self);
 bool common_hal_ssl_sslsocket_listen(ssl_sslsocket_obj_t *self, int backlog);
 mp_uint_t common_hal_ssl_sslsocket_recv_into(ssl_sslsocket_obj_t *self, uint8_t *buf, uint32_t len);
 mp_uint_t common_hal_ssl_sslsocket_send(ssl_sslsocket_obj_t *self, const uint8_t *buf, uint32_t len);
-void common_hal_ssl_sslsocket_settimeout(ssl_sslsocket_obj_t *self, uint32_t timeout_ms);
+void common_hal_ssl_sslsocket_settimeout(ssl_sslsocket_obj_t *self, mp_obj_t timeout_obj);

shared-module/ssl/SSLSocket.c

@@ -154,8 +154,8 @@ static int ssl_socket_close(ssl_sslsocket_obj_t *self) {
     return call_method_errno(0, self->close_args);
 }
 
-static int ssl_socket_settimeout(ssl_sslsocket_obj_t *self, mp_int_t timeout_ms) {
-    self->settimeout_args[2] = mp_obj_new_float(timeout_ms * MICROPY_FLOAT_CONST(1e-3));
+static int ssl_socket_settimeout(ssl_sslsocket_obj_t *self, mp_obj_t timeout_obj) {
+    self->settimeout_args[2] = timeout_obj;
     return call_method_errno(1, self->settimeout_args);
 }
 
@@ -442,6 +442,6 @@ mp_obj_t common_hal_ssl_sslsocket_accept(ssl_sslsocket_obj_t *self) {
     return mp_obj_new_tuple(2, tuple_contents);
 }
 
-void common_hal_ssl_sslsocket_settimeout(ssl_sslsocket_obj_t *self, uint32_t timeout_ms) {
-    ssl_socket_settimeout(self, timeout_ms);
+void common_hal_ssl_sslsocket_settimeout(ssl_sslsocket_obj_t *self, mp_obj_t timeout_obj) {
+    ssl_socket_settimeout(self, timeout_obj);
 }