djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3955 from caiokat/fix_recvfrom_into 

Fix socket.recvfrom_into()
This commit is contained in:
Scott Shawcroft 2021-01-11 15:20:56 -08:00 committed by GitHub
parent 1c12d8351c 7b4558b750
commit b0eb91dfef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ports/esp32s2/common-hal/socketpool/Socket.c
View File

@ -178,7 +178,7 @@ mp_uint_t common_hal_socketpool_socket_recvfrom_into(socketpool_socket_obj_t* se
struct sockaddr_in source_addr; struct sockaddr_in source_addr;
socklen_t socklen = sizeof(source_addr); socklen_t socklen = sizeof(source_addr);
int bytes_received = lwip_recvfrom(self->num, buf, len - 1, 0, (struct sockaddr *)&source_addr, &socklen); int bytes_received = lwip_recvfrom(self->num, buf, len, 0, (struct sockaddr *)&source_addr, &socklen);
memcpy((void *)ip, (void*)&source_addr.sin_addr.s_addr, sizeof source_addr.sin_addr.s_addr); memcpy((void *)ip, (void*)&source_addr.sin_addr.s_addr, sizeof source_addr.sin_addr.s_addr);
*port = source_addr.sin_port; *port = source_addr.sin_port;
@ -186,10 +186,9 @@ mp_uint_t common_hal_socketpool_socket_recvfrom_into(socketpool_socket_obj_t* se
if (bytes_received < 0) { if (bytes_received < 0) {
mp_raise_BrokenPipeError(); mp_raise_BrokenPipeError();
return 0; return 0;
} else {
buf[bytes_received] = 0; // Null-terminate whatever we received
return bytes_received;
} }
return bytes_received;
} }
void common_hal_socketpool_socket_close(socketpool_socket_obj_t* self) { void common_hal_socketpool_socket_close(socketpool_socket_obj_t* self) {