Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix net reads when len < available packet size

Browse Source
This commit is contained in:
K. Lange 2018-07-01 10:02:33 +09:00
parent 9c93040303
commit 0d295aff28
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/net.c
View File

@ -743,7 +743,7 @@ size_t net_recv(struct socket* socket, uint8_t* buffer, size_t len) {
free(node); free(node);
} }
size_to_read = MIN(len, offset + socket->bytes_available); size_to_read = MIN(len, socket->bytes_available);
if (tcpdata->payload != 0) { if (tcpdata->payload != 0) {
memcpy(buffer + offset, tcpdata->payload + socket->bytes_read, size_to_read); memcpy(buffer + offset, tcpdata->payload + socket->bytes_read, size_to_read);
@ -752,8 +752,8 @@ size_t net_recv(struct socket* socket, uint8_t* buffer, size_t len) {
offset += size_to_read; offset += size_to_read;
if (size_to_read < socket->bytes_available) { if (size_to_read < socket->bytes_available) {
socket->bytes_available = socket->bytes_available - size_to_read; socket->bytes_available -= size_to_read;
socket->bytes_read = size_to_read; socket->bytes_read += size_to_read;
socket->current_packet = tcpdata; socket->current_packet = tcpdata;
} else { } else {
socket->bytes_available = 0; socket->bytes_available = 0;