TheCloneArmy/mcrcon
1
0
Fork 0
mirror of https://github.com/Tiiffi/mcrcon.git synced 2025-10-28 11:51:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from upstream develop

Browse Source
This commit is contained in:
Tiiffi
2019-10-20 15:39:44 +03:00
parent 408ec3b1c1 4dc7361641
commit f0580220e3
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mcrcon.c
View File

@ -435,19 +435,18 @@ rc_packet *net_recv_packet(int sd)
packet.size = psize; packet.size = psize;
ret = recv(sd, (char *) &packet + sizeof(int), psize, 0); int received = 0;
if (ret == 0) while (received < psize)
{
ret = recv(sd, (char *) &packet + sizeof(int) + received, psize - received, 0);
if (ret == 0) /* connection closed before completing receving */
{ {
fprintf(stderr, "Connection lost.\n"); fprintf(stderr, "Connection lost.\n");
global_connection_alive = 0; global_connection_alive = 0;
return NULL; return NULL;
} }
if(ret != psize) received += ret;
{
fprintf(stderr, "Warning: recv() return value (%d) does not match expected packet size (%d).\n", ret, psize);
net_clean_incoming(sd, DATA_BUFFSIZE); /* Should be enough. Needs some checking */
return NULL;
} }
return &packet; return &packet;