Skip to content

Commit 7923aa0

Browse files
jeplerjepler
authored
Merge pull request #3708 from hierophect/esp32s2-udp
ESP32-S2: Add UDP with recvfrom_into and sendto
2 parents 6fd123a + 510f464 commit 7923aa0

File tree

6 files changed

+135
-78
lines changed

6 files changed

+135
-78
lines changed

‎locale/circuitpython.pot

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-11-11 16:30+0530\n"
11+
"POT-Creation-Date: 2020-11-24 15:40-0500\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -297,6 +297,7 @@ msgid "All I2C peripherals are in use"
297297
msgstr ""
298298

299299
#: ports/esp32s2/common-hal/countio/Counter.c
300+
#: ports/esp32s2/common-hal/frequencyio/FrequencyIn.c
300301
#: ports/esp32s2/common-hal/rotaryio/IncrementalEncoder.c
301302
msgid "All PCNT units in use"
302303
msgstr ""
@@ -333,6 +334,7 @@ msgstr ""
333334
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
334335
#: ports/atmel-samd/common-hal/pulseio/PulseOut.c
335336
#: ports/cxd56/common-hal/pulseio/PulseOut.c
337+
#: ports/esp32s2/common-hal/frequencyio/FrequencyIn.c
336338
#: ports/esp32s2/common-hal/neopixel_write/__init__.c
337339
#: ports/esp32s2/common-hal/pulseio/PulseIn.c
338340
#: ports/esp32s2/common-hal/pulseio/PulseOut.c
@@ -1086,6 +1088,7 @@ msgid "Invalid byteorder string"
10861088
msgstr ""
10871089

10881090
#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
1091+
#: ports/esp32s2/common-hal/frequencyio/FrequencyIn.c
10891092
msgid "Invalid capture period. Valid range: 1 - 500"
10901093
msgstr ""
10911094

@@ -1416,14 +1419,14 @@ msgstr ""
14161419
msgid "Only 8 or 16 bit mono with "
14171420
msgstr ""
14181421

1419-
#: ports/esp32s2/common-hal/socketpool/SocketPool.c
1420-
msgid "Only IPv4 SOCK_STREAM sockets supported"
1421-
msgstr ""
1422-
14231422
#: ports/esp32s2/common-hal/wifi/__init__.c
14241423
msgid "Only IPv4 addresses supported"
14251424
msgstr ""
14261425

1426+
#: ports/esp32s2/common-hal/socketpool/SocketPool.c
1427+
msgid "Only IPv4 sockets supported"
1428+
msgstr ""
1429+
14271430
#: shared-module/displayio/OnDiskBitmap.c
14281431
#, c-format
14291432
msgid ""

‎ports/esp32s2/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ SRC_C += \
190190
lib/utils/pyexec.c \
191191
lib/utils/stdout_helpers.c \
192192
lib/utils/sys_stdio_mphal.c \
193+
lib/netutils/netutils.c \
193194
peripherals/timer.c \
194195
peripherals/pcnt.c \
195196
peripherals/pins.c \

‎ports/esp32s2/common-hal/socketpool/Socket.c

Lines changed: 65 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@
3232
#include "py/runtime.h"
3333
#include "supervisor/shared/tick.h"
3434

35+
#include "components/lwip/lwip/src/include/lwip/err.h"
36+
#include "components/lwip/lwip/src/include/lwip/sockets.h"
37+
#include "components/lwip/lwip/src/include/lwip/sys.h"
38+
#include "components/lwip/lwip/src/include/lwip/netdb.h"
39+
3540
void common_hal_socketpool_socket_settimeout(socketpool_socket_obj_t* self, mp_uint_t timeout_ms) {
3641
self->timeout_ms = timeout_ms;
3742
}
@@ -124,16 +129,75 @@ mp_uint_t common_hal_socketpool_socket_recv_into(socketpool_socket_obj_t* self,
124129
return received;
125130
}
126131

132+
mp_uint_t common_hal_socketpool_socket_sendto(socketpool_socket_obj_t* self,
133+
const char* host, size_t hostlen, uint8_t port, const uint8_t* buf, mp_uint_t len) {
134+
135+
// Get the IP address string
136+
const struct addrinfo hints = {
137+
.ai_family = AF_INET,
138+
.ai_socktype = SOCK_STREAM,
139+
};
140+
struct addrinfo *result;
141+
int error = lwip_getaddrinfo(host, NULL, &hints, &result);
142+
if (error != 0 || result == NULL) {
143+
return 0;
144+
}
145+
#pragma GCC diagnostic push
146+
#pragma GCC diagnostic ignored "-Wcast-align"
147+
struct in_addr *addr = &((struct sockaddr_in *)result->ai_addr)->sin_addr;
148+
#pragma GCC diagnostic pop
149+
char ip_str[IP4ADDR_STRLEN_MAX];
150+
inet_ntoa_r(*addr, ip_str, IP4ADDR_STRLEN_MAX);
151+
freeaddrinfo(result);
152+
153+
// Set parameters
154+
struct sockaddr_in dest_addr;
155+
dest_addr.sin_addr.s_addr = inet_addr((const char *)ip_str);
156+
dest_addr.sin_family = AF_INET;
157+
dest_addr.sin_port = htons(port);
158+
159+
int bytes_sent = lwip_sendto(self->num, buf, len, 0, (struct sockaddr *)&dest_addr, sizeof(dest_addr));
160+
if (bytes_sent < 0) {
161+
mp_raise_BrokenPipeError();
162+
return 0;
163+
}
164+
return bytes_sent;
165+
}
166+
167+
mp_uint_t common_hal_socketpool_socket_recvfrom_into(socketpool_socket_obj_t* self,
168+
uint8_t* buf, mp_uint_t len, uint8_t* ip, uint *port) {
169+
170+
struct sockaddr_in source_addr;
171+
socklen_t socklen = sizeof(source_addr);
172+
int bytes_received = lwip_recvfrom(self->num, buf, len - 1, 0, (struct sockaddr *)&source_addr, &socklen);
173+
174+
memcpy((void *)ip, (void*)&source_addr.sin_addr.s_addr, sizeof source_addr.sin_addr.s_addr);
175+
*port = source_addr.sin_port;
176+
177+
if (bytes_received < 0) {
178+
mp_raise_BrokenPipeError();
179+
return 0;
180+
} else {
181+
buf[bytes_received] = 0; // Null-terminate whatever we received
182+
return bytes_received;
183+
}
184+
}
185+
127186
void common_hal_socketpool_socket_close(socketpool_socket_obj_t* self) {
128187
self->connected = false;
129188
if (self->tcp != NULL) {
130189
esp_tls_conn_destroy(self->tcp);
131190
self->tcp = NULL;
132191
}
192+
if (self->num >= 0) {
193+
lwip_shutdown(self->num, 0);
194+
lwip_close(self->num);
195+
self->num = -1;
196+
}
133197
}
134198

135199
bool common_hal_socketpool_socket_get_closed(socketpool_socket_obj_t* self) {
136-
return self->tcp == NULL;
200+
return self->tcp == NULL && self->num < 0;
137201
}
138202

139203

‎ports/esp32s2/common-hal/socketpool/SocketPool.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,14 @@ socketpool_socket_obj_t* common_hal_socketpool_socket(socketpool_socketpool_obj_
6161
socket_type = SOCK_RAW;
6262
}
6363

64-
if (socket_type == SOCK_DGRAM || socket_type == SOCK_RAW ||
65-
addr_family == AF_INET6 || ipproto == IPPROTO_IPV6) {
66-
mp_raise_NotImplementedError(translate("Only IPv4 SOCK_STREAM sockets supported"));
64+
if (addr_family == AF_INET6 || ipproto == IPPROTO_IPV6) {
65+
mp_raise_NotImplementedError(translate("Only IPv4 sockets supported"));
6766
}
6867

6968
int socknum = -1;
7069
esp_tls_t* tcp_handle = NULL;
7170
if (socket_type == SOCK_DGRAM || socket_type == SOCK_RAW) {
72-
// socknum = lwip_socket(addr_family, socket_type, ipproto);
71+
socknum = lwip_socket(addr_family, socket_type, ipproto);
7372
} else {
7473
tcp_handle = esp_tls_init();
7574

‎shared-bindings/socketpool/Socket.c

Lines changed: 54 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
#include "py/runtime.h"
3737
#include "py/mperrno.h"
3838

39+
#include "lib/netutils/netutils.h"
40+
3941
//| class Socket:
4042
//| """TCP, UDP and RAW socket. Cannot be created directly. Instead, call
4143
//| `SocketPool.socket()`.
@@ -274,79 +276,63 @@ STATIC mp_obj_t socketpool_socket_recv_into(size_t n_args, const mp_obj_t *args)
274276
}
275277
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socketpool_socket_recv_into_obj, 2, 3, socketpool_socket_recv_into);
276278

277-
// //| def sendto(self, bytes: ReadableBuffer, address: tuple) -> int:
278-
// //| """Send some bytes to a specific address.
279-
// //| Suits sockets of type SOCK_DGRAM
280-
// //|
281-
// //| :param ~bytes bytes: some bytes to send
282-
// //| :param ~tuple address: tuple of (remote_address, remote_port)"""
283-
// //| ...
284-
// //|
285-
286-
// STATIC mp_obj_t socketpool_socket_sendto(mp_obj_t self_in, mp_obj_t data_in, mp_obj_t addr_in) {
287-
// // mod_network_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
279+
//| def sendto(self, bytes: ReadableBuffer, address: Tuple[str, int]) -> int:
280+
//| """Send some bytes to a specific address.
281+
//| Suits sockets of type SOCK_DGRAM
282+
//|
283+
//| :param ~bytes bytes: some bytes to send
284+
//| :param ~tuple address: tuple of (remote_address, remote_port)"""
285+
//| ...
286+
//|
288287

289-
// // // get the data
290-
// // mp_buffer_info_t bufinfo;
291-
// // mp_get_buffer_raise(data_in, &bufinfo, MP_BUFFER_READ);
288+
STATIC mp_obj_t socketpool_socket_sendto(mp_obj_t self_in, mp_obj_t data_in, mp_obj_t addr_in) {
289+
socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
292290

293-
// // // get address
294-
// // uint8_t ip[MOD_NETWORK_IPADDR_BUF_SIZE];
295-
// // mp_uint_t port = netutils_parse_inet_addr(addr_in, ip, NETUTILS_BIG);
291+
// get the data
292+
mp_buffer_info_t bufinfo;
293+
mp_get_buffer_raise(data_in, &bufinfo, MP_BUFFER_READ);
296294

297-
// // // check if we need to select a NIC
298-
// // socket_select_nic(self, ip);
295+
mp_obj_t *addr_items;
296+
mp_obj_get_array_fixed_n(addr_in, 2, &addr_items);
299297

300-
// // // call the NIC to sendto
301-
// // int _errno;
302-
// // mp_int_t ret = self->nic_type->sendto(self, bufinfo.buf, bufinfo.len, ip, port, &_errno);
303-
// // if (ret == -1) {
304-
// // mp_raise_OSError(_errno);
305-
// // }
306-
// mp_int_t ret = 0;
298+
size_t hostlen;
299+
const char* host = mp_obj_str_get_data(addr_items[0], &hostlen);
300+
mp_int_t port = mp_obj_get_int(addr_items[1]);
307301

308-
// return mp_obj_new_int(ret);
309-
// }
310-
// STATIC MP_DEFINE_CONST_FUN_OBJ_3(socketpool_socket_sendto_obj, socketpool_socket_sendto);
302+
mp_int_t ret = common_hal_socketpool_socket_sendto(self, host, hostlen, port, bufinfo.buf, bufinfo.len);
303+
if (!ret) {
304+
mp_raise_OSError(0);
305+
}
311306

312-
// //| def recvfrom(self, bufsize: int) -> Tuple[bytes, tuple]:
313-
// //| """Reads some bytes from the connected remote address.
314-
// //| Suits sockets of type SOCK_STREAM
315-
// //|
316-
// //| Returns a tuple containing
317-
// //| * a bytes() of length <= bufsize
318-
// //| * a remote_address, which is a tuple of ip address and port number
319-
// //|
320-
// //| :param ~int bufsize: maximum number of bytes to receive"""
321-
// //| ...
322-
// //|
307+
return mp_obj_new_int_from_uint(ret);
308+
}
309+
STATIC MP_DEFINE_CONST_FUN_OBJ_3(socketpool_socket_sendto_obj, socketpool_socket_sendto);
323310

324-
// STATIC mp_obj_t socketpool_socket_recvfrom_into(mp_obj_t self_in, mp_obj_t len_in) {
325-
// // mod_network_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
326-
// // if (self->nic == MP_OBJ_NULL) {
327-
// // // not connected
328-
// // mp_raise_OSError(MP_ENOTCONN);
329-
// // }
330-
// // vstr_t vstr;
331-
// // vstr_init_len(&vstr, mp_obj_get_int(len_in));
332-
// // byte ip[4];
333-
// // mp_uint_t port;
334-
// // int _errno;
335-
// // mp_int_t ret = self->nic_type->recvfrom(self, (byte*)vstr.buf, vstr.len, ip, &port, &_errno);
336-
// // if (ret == -1) {
337-
// // mp_raise_OSError(_errno);
338-
// // }
339-
// mp_obj_t tuple[2];
340-
// // if (ret == 0) {
341-
// // tuple[0] = mp_const_empty_bytes;
342-
// // } else {
343-
// // vstr.len = ret;
344-
// // tuple[0] = mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
345-
// // }
346-
// // tuple[1] = netutils_format_inet_addr(ip, port, NETUTILS_BIG);
347-
// return mp_obj_new_tuple(2, tuple);
348-
// }
349-
// STATIC MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_recvfrom_into_obj, socketpool_socket_recvfrom_into);
311+
//| def recvfrom_into(self, buffer: WriteableBuffer) -> Tuple[int, Tuple[str, int]]:
312+
//| """Reads some bytes from a remote address.
313+
//|
314+
//| Returns a tuple containing
315+
//| * the number of bytes received into the given buffer
316+
//| * a remote_address, which is a tuple of ip address and port number
317+
//|
318+
//| :param object buffer: buffer to read into"""
319+
//| ...
320+
//|
321+
STATIC mp_obj_t socketpool_socket_recvfrom_into(mp_obj_t self_in, mp_obj_t data_in) {
322+
socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
323+
mp_buffer_info_t bufinfo;
324+
mp_get_buffer_raise(data_in, &bufinfo, MP_BUFFER_WRITE);
325+
326+
byte ip[4];
327+
mp_uint_t port;
328+
mp_int_t ret = common_hal_socketpool_socket_recvfrom_into(self,
329+
(byte*)bufinfo.buf, bufinfo.len, ip, &port);
330+
mp_obj_t tuple_contents[2];
331+
tuple_contents[0] = mp_obj_new_int_from_uint(ret);
332+
tuple_contents[1] = netutils_format_inet_addr(ip, port, NETUTILS_BIG);
333+
return mp_obj_new_tuple(2, tuple_contents);
334+
}
335+
STATIC MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_recvfrom_into_obj, socketpool_socket_recvfrom_into);
350336

351337
// //| def setsockopt(self, level: int, optname: int, value: int) -> None:
352338
// //| """Sets socket options"""
@@ -449,8 +435,8 @@ STATIC const mp_rom_map_elem_t socketpool_socket_locals_dict_table[] = {
449435
// { MP_ROM_QSTR(MP_QSTR_accept), MP_ROM_PTR(&socketpool_socket_accept_obj) },
450436
{ MP_ROM_QSTR(MP_QSTR_connect), MP_ROM_PTR(&socketpool_socket_connect_obj) },
451437
{ MP_ROM_QSTR(MP_QSTR_send), MP_ROM_PTR(&socketpool_socket_send_obj) },
452-
// { MP_ROM_QSTR(MP_QSTR_sendto), MP_ROM_PTR(&socketpool_socket_sendto_obj) },
453-
// { MP_ROM_QSTR(MP_QSTR_recvfrom_into), MP_ROM_PTR(&socketpool_socket_recvfrom_into_obj) },
438+
{ MP_ROM_QSTR(MP_QSTR_sendto), MP_ROM_PTR(&socketpool_socket_sendto_obj) },
439+
{ MP_ROM_QSTR(MP_QSTR_recvfrom_into), MP_ROM_PTR(&socketpool_socket_recvfrom_into_obj) },
454440
{ MP_ROM_QSTR(MP_QSTR_recv_into), MP_ROM_PTR(&socketpool_socket_recv_into_obj) },
455441
// { MP_ROM_QSTR(MP_QSTR_setsockopt), MP_ROM_PTR(&socketpool_socket_setsockopt_obj) },
456442
{ MP_ROM_QSTR(MP_QSTR_settimeout), MP_ROM_PTR(&socketpool_socket_settimeout_obj) },

‎shared-bindings/socketpool/Socket.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ void common_hal_socketpool_socket_settimeout(socketpool_socket_obj_t* self, mp_u
3535
bool common_hal_socketpool_socket_connect(socketpool_socket_obj_t* self, const char* host, size_t hostlen, mp_int_t port);
3636
mp_uint_t common_hal_socketpool_socket_send(socketpool_socket_obj_t* self, const uint8_t* buf, mp_uint_t len);
3737
mp_uint_t common_hal_socketpool_socket_recv_into(socketpool_socket_obj_t* self, const uint8_t* buf, mp_uint_t len);
38+
mp_uint_t common_hal_socketpool_socket_sendto(socketpool_socket_obj_t* self,
39+
const char* host, size_t hostlen, uint8_t port, const uint8_t* buf, mp_uint_t len);
40+
mp_uint_t common_hal_socketpool_socket_recvfrom_into(socketpool_socket_obj_t* self,
41+
uint8_t* buf, mp_uint_t len, uint8_t* ip, uint *port);
3842
void common_hal_socketpool_socket_close(socketpool_socket_obj_t* self);
3943
bool common_hal_socketpool_socket_get_closed(socketpool_socket_obj_t* self);
4044
bool common_hal_socketpool_socket_get_connected(socketpool_socket_obj_t* self);

0 commit comments

Comments
 (0)