merge from upstream

4 files changed, 78 insertions, 72 deletions

diff --git a/shared-bindings/displayio/ColorConverter.c b/shared-bindings/displayio/ColorConverter.c
index 0e6e9bfd9..88d3a1ba8 100644
--- a/shared-bindings/displayio/ColorConverter.c
+++ b/shared-bindings/displayio/ColorConverter.c
@@ -116,7 +116,7 @@ const mp_obj_property_t displayio_colorconverter_dither_obj = {
 STATIC mp_obj_t displayio_colorconverter_make_transparent(mp_obj_t self_in, mp_obj_t transparent_color_obj) {
     displayio_colorconverter_t *self = MP_OBJ_TO_PTR(self_in);
 
-    mp_int_t transparent_color = mp_obj_get_int(&transparent_color);
+    mp_int_t transparent_color = mp_obj_get_int(transparent_color_obj);
     common_hal_displayio_colorconverter_make_transparent(self, transparent_color);
     return mp_const_none;
 }
@@ -128,7 +128,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(displayio_colorconverter_make_transparent_obj, display
 STATIC mp_obj_t displayio_colorconverter_make_opaque(mp_obj_t self_in, mp_obj_t transparent_color_obj) {
     displayio_colorconverter_t *self = MP_OBJ_TO_PTR(self_in);
 
-    mp_int_t transparent_color = mp_obj_get_int(&transparent_color);
+    mp_int_t transparent_color = mp_obj_get_int(transparent_color_obj);
     common_hal_displayio_colorconverter_make_opaque(self, transparent_color);
     return mp_const_none;
 }
diff --git a/shared-bindings/socketpool/Socket.c b/shared-bindings/socketpool/Socket.c
index 362e4d7e8..0e6968d5f 100644
--- a/shared-bindings/socketpool/Socket.c
+++ b/shared-bindings/socketpool/Socket.c
@@ -36,6 +36,8 @@
 #include "py/runtime.h"
 #include "py/mperrno.h"
 
+#include "lib/netutils/netutils.h"
+
 //| class Socket:
 //|     """TCP, UDP and RAW socket. Cannot be created directly. Instead, call
 //|        `SocketPool.socket()`.
@@ -274,79 +276,63 @@ STATIC mp_obj_t socketpool_socket_recv_into(size_t n_args, const mp_obj_t *args)
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socketpool_socket_recv_into_obj, 2, 3, socketpool_socket_recv_into);
 
-// //|     def sendto(self, bytes: ReadableBuffer, address: tuple) -> int:
-// //|         """Send some bytes to a specific address.
-// //|         Suits sockets of type SOCK_DGRAM
-// //|
-// //|         :param ~bytes bytes: some bytes to send
-// //|         :param ~tuple address: tuple of (remote_address, remote_port)"""
-// //|         ...
-// //|
-
-// STATIC mp_obj_t socketpool_socket_sendto(mp_obj_t self_in, mp_obj_t data_in, mp_obj_t addr_in) {
-//     // mod_network_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
+//|     def sendto(self, bytes: ReadableBuffer, address: Tuple[str, int]) -> int:
+//|         """Send some bytes to a specific address.
+//|         Suits sockets of type SOCK_DGRAM
+//|
+//|         :param ~bytes bytes: some bytes to send
+//|         :param ~tuple address: tuple of (remote_address, remote_port)"""
+//|         ...
+//|
 
-//     // // get the data
-//     // mp_buffer_info_t bufinfo;
-//     // mp_get_buffer_raise(data_in, &bufinfo, MP_BUFFER_READ);
+STATIC mp_obj_t socketpool_socket_sendto(mp_obj_t self_in, mp_obj_t data_in, mp_obj_t addr_in) {
+    socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
-//     // // get address
-//     // uint8_t ip[MOD_NETWORK_IPADDR_BUF_SIZE];
-//     // mp_uint_t port = netutils_parse_inet_addr(addr_in, ip, NETUTILS_BIG);
+    // get the data
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(data_in, &bufinfo, MP_BUFFER_READ);
 
-//     // // check if we need to select a NIC
-//     // socket_select_nic(self, ip);
+    mp_obj_t *addr_items;
+    mp_obj_get_array_fixed_n(addr_in, 2, &addr_items);
 
-//     // // call the NIC to sendto
-//     // int _errno;
-//     // mp_int_t ret = self->nic_type->sendto(self, bufinfo.buf, bufinfo.len, ip, port, &_errno);
-//     // if (ret == -1) {
-//     //     mp_raise_OSError(_errno);
-//     // }
-//     mp_int_t ret = 0;
+    size_t hostlen;
+    const char* host = mp_obj_str_get_data(addr_items[0], &hostlen);
+    mp_int_t port = mp_obj_get_int(addr_items[1]);
 
-//     return mp_obj_new_int(ret);
-// }
-// STATIC MP_DEFINE_CONST_FUN_OBJ_3(socketpool_socket_sendto_obj, socketpool_socket_sendto);
+    mp_int_t ret = common_hal_socketpool_socket_sendto(self, host, hostlen, port, bufinfo.buf, bufinfo.len);
+    if (!ret) {
+        mp_raise_OSError(0);
+    }
 
-// //|     def recvfrom(self, bufsize: int) -> Tuple[bytes, tuple]:
-// //|         """Reads some bytes from the connected remote address.
-// //|         Suits sockets of type SOCK_STREAM
-// //|
-// //|         Returns a tuple containing
-// //|         * a bytes() of length <= bufsize
-// //|         * a remote_address, which is a tuple of ip address and port number
-// //|
-// //|         :param ~int bufsize: maximum number of bytes to receive"""
-// //|         ...
-// //|
+    return mp_obj_new_int_from_uint(ret);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_3(socketpool_socket_sendto_obj, socketpool_socket_sendto);
 
-// STATIC mp_obj_t socketpool_socket_recvfrom_into(mp_obj_t self_in, mp_obj_t len_in) {
-//     // mod_network_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
-//     // if (self->nic == MP_OBJ_NULL) {
-//     //     // not connected
-//     //     mp_raise_OSError(MP_ENOTCONN);
-//     // }
-//     // vstr_t vstr;
-//     // vstr_init_len(&vstr, mp_obj_get_int(len_in));
-//     // byte ip[4];
-//     // mp_uint_t port;
-//     // int _errno;
-//     // mp_int_t ret = self->nic_type->recvfrom(self, (byte*)vstr.buf, vstr.len, ip, &port, &_errno);
-//     // if (ret == -1) {
-//     //     mp_raise_OSError(_errno);
-//     // }
-//     mp_obj_t tuple[2];
-//     // if (ret == 0) {
-//     //     tuple[0] = mp_const_empty_bytes;
-//     // } else {
-//     //     vstr.len = ret;
-//     //     tuple[0] = mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
-//     // }
-//     // tuple[1] = netutils_format_inet_addr(ip, port, NETUTILS_BIG);
-//     return mp_obj_new_tuple(2, tuple);
-// }
-// STATIC MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_recvfrom_into_obj, socketpool_socket_recvfrom_into);
+//|     def recvfrom_into(self, buffer: WriteableBuffer) -> Tuple[int, Tuple[str, int]]:
+//|         """Reads some bytes from a remote address.
+//|
+//|         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
+//|
+//|         :param object buffer: buffer to read into"""
+//|         ...
+//|
+STATIC mp_obj_t socketpool_socket_recvfrom_into(mp_obj_t self_in, mp_obj_t data_in) {
+    socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(data_in, &bufinfo, MP_BUFFER_WRITE);
+
+    byte ip[4];
+    mp_uint_t port;
+    mp_int_t ret = common_hal_socketpool_socket_recvfrom_into(self,
+        (byte*)bufinfo.buf, bufinfo.len, ip, &port);
+    mp_obj_t tuple_contents[2];
+    tuple_contents[0] = mp_obj_new_int_from_uint(ret);
+    tuple_contents[1] = netutils_format_inet_addr(ip, port, NETUTILS_BIG);
+    return mp_obj_new_tuple(2, tuple_contents);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_recvfrom_into_obj, socketpool_socket_recvfrom_into);
 
 // //|     def setsockopt(self, level: int, optname: int, value: int) -> None:
 // //|         """Sets socket options"""
@@ -449,8 +435,8 @@ STATIC const mp_rom_map_elem_t socketpool_socket_locals_dict_table[] = {
     // { MP_ROM_QSTR(MP_QSTR_accept), MP_ROM_PTR(&socketpool_socket_accept_obj) },
     { MP_ROM_QSTR(MP_QSTR_connect), MP_ROM_PTR(&socketpool_socket_connect_obj) },
     { MP_ROM_QSTR(MP_QSTR_send), MP_ROM_PTR(&socketpool_socket_send_obj) },
-    // { MP_ROM_QSTR(MP_QSTR_sendto), MP_ROM_PTR(&socketpool_socket_sendto_obj) },
-    // { MP_ROM_QSTR(MP_QSTR_recvfrom_into), MP_ROM_PTR(&socketpool_socket_recvfrom_into_obj) },
+    { MP_ROM_QSTR(MP_QSTR_sendto), MP_ROM_PTR(&socketpool_socket_sendto_obj) },
+    { MP_ROM_QSTR(MP_QSTR_recvfrom_into), MP_ROM_PTR(&socketpool_socket_recvfrom_into_obj) },
     { MP_ROM_QSTR(MP_QSTR_recv_into), MP_ROM_PTR(&socketpool_socket_recv_into_obj) },
     // { MP_ROM_QSTR(MP_QSTR_setsockopt), MP_ROM_PTR(&socketpool_socket_setsockopt_obj) },
     { MP_ROM_QSTR(MP_QSTR_settimeout), MP_ROM_PTR(&socketpool_socket_settimeout_obj) },
diff --git a/shared-bindings/socketpool/Socket.h b/shared-bindings/socketpool/Socket.h
index f0be95c92..54fbe59b2 100644
--- a/shared-bindings/socketpool/Socket.h
+++ b/shared-bindings/socketpool/Socket.h
@@ -35,6 +35,10 @@ void common_hal_socketpool_socket_settimeout(socketpool_socket_obj_t* self, mp_u
 bool common_hal_socketpool_socket_connect(socketpool_socket_obj_t* self, const char* host, size_t hostlen, mp_int_t port);
 mp_uint_t common_hal_socketpool_socket_send(socketpool_socket_obj_t* self, const uint8_t* buf, mp_uint_t len);
 mp_uint_t common_hal_socketpool_socket_recv_into(socketpool_socket_obj_t* self, const uint8_t* buf, mp_uint_t len);
+mp_uint_t common_hal_socketpool_socket_sendto(socketpool_socket_obj_t* self,
+    const char* host, size_t hostlen, uint8_t port, const uint8_t* buf, mp_uint_t len);
+mp_uint_t common_hal_socketpool_socket_recvfrom_into(socketpool_socket_obj_t* self,
+    uint8_t* buf, mp_uint_t len, uint8_t* ip, uint *port);
 void common_hal_socketpool_socket_close(socketpool_socket_obj_t* self);
 bool common_hal_socketpool_socket_get_closed(socketpool_socket_obj_t* self);
 bool common_hal_socketpool_socket_get_connected(socketpool_socket_obj_t* self);
diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c
index e81e8793c..991abd4f1 100644
--- a/shared-bindings/wifi/Radio.c
+++ b/shared-bindings/wifi/Radio.c
@@ -142,9 +142,25 @@ const mp_obj_property_t wifi_radio_hostname_obj = {
               (mp_obj_t)&mp_const_none_obj},
 };
 
-//|     def connect(self, ssid: ReadableBuffer, password: ReadableBuffer = b"", *, channel: Optional[int] = 0, timeout: Optional[float] = None) -> bool:
+//|     def connect(self,
+//|                 ssid: ReadableBuffer,
+//|                 password: ReadableBuffer = b"",
+//|                 *,
+//|                 channel: Optional[int] = 0,
+//|                 bssid: Optional[ReadableBuffer] = b"",
+//|                 timeout: Optional[float] = None) -> bool:
 //|         """Connects to the given ssid and waits for an ip address. Reconnections are handled
-//|            automatically once one connection succeeds."""
+//|            automatically once one connection succeeds.
+//|
+//|            By default, this will scan all channels and connect to the access point (AP) with the
+//|            given ``ssid`` and greatest signal strength (rssi).
+//|
+//|            If ``channel`` is given, the scan will begin with the given channel and connect to
+//|            the first AP with the given ``ssid``. This can speed up the connection time
+//|            significantly because a full scan doesn't occur.
+//|
+//|            If ``bssid`` is given, the scan will start at the first channel or the one given and
+//|            connect to the AP with the given ``bssid`` and ``ssid``."""
 //|         ...
 //|
 STATIC mp_obj_t wifi_radio_connect(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {