external/DAWN
1
0
Fork 0
mirror of https://github.com/berlin-open-wireless-lab/DAWN.git synced 2025-03-09 15:40:12 +00:00
Code Issues Releases Wiki Activity

tcpsocket: leave loop if we read 0 byte

Browse source 
It can happen that the callback is executed but there are 0 bytes to read. If this happens we leave the while-loop.

Ian Clowes:
- fix

Nick:
- commit message
This commit is contained in:
Ian Clowes 2020-08-07 11:32:08 +02:00 • committed by Polynomialdivision
parent dfbaa055a4
commit 50d54a6253
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/network/tcpsocket.c
View file

@ -139,18 +139,24 @@ static void client_read_cb(struct ustream *s, int bytes) {
str_tmp = NULL; // Aboutt o go out of scope, but just in case it gets moved around...
cl->state = READ_STATUS_COMMENCED;
}
if (cl->state == READ_STATUS_COMMENCED)
{
printf("tcp_socket: reading message...\n");
uint32_t read_len = ustream_pending_data(s, false);
if (read_len == 0)
break;
if (read_len > (cl->final_len - cl->curr_len))
read_len = cl->final_len - cl->curr_len;
printf("tcp_socket: reading %" PRIu32 " bytes to add to %" PRIu32 " of %" PRIu32 "...\n",
read_len, cl->curr_len, cl->final_len);
cl->curr_len += ustream_read(s, cl->str + cl->curr_len, read_len);
printf("tcp_socket: ...and we're back\n");
uint32_t this_read = ustream_read(s, cl->str + cl->curr_len, read_len);
cl->curr_len += this_read;
printf("tcp_socket: ...and we're back, now have %" PRIu32 " bytes\n", cl->curr_len);
if (cl->curr_len == cl->final_len){//ensure recv final_len bytes.
// Full message now received
cl->state = READ_STATUS_COMPLETE;