Jika/oc2r-native-networking
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix a weird bug on windows

Browse Source
This commit is contained in:
Un1q32
2025-04-25 15:49:17 -04:00
parent 3031d967ba
commit 7f7f301b9d
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
oc2rnet.c
View File

@@ -166,7 +166,13 @@ static ssize_t doPing(uint32_t ip, size_t size, char *data, char *response,
if (ret > 0) {
PICMP_ECHO_REPLY echoReply = (PICMP_ECHO_REPLY)replyBuffer;
size_t bytesReceived = echoReply->DataSize;
if (bytesReceived > size)
if (bytesReceived == 0) { // Windows sometimes succeeds with a 0 byte reply
// when it should fail
cliprinterr("Zero-size reply\n");
free(replyBuffer);
IcmpCloseHandle(hIcmp);
return -1;
} else if (bytesReceived > size)
bytesReceived = size;
memcpy(response, echoReply->Data, bytesReceived);
result = bytesReceived;
@@ -177,7 +183,7 @@ static ssize_t doPing(uint32_t ip, size_t size, char *data, char *response,
if (error == 11010)
fprintf(stderr, "Timed out\n");
else
fprintf(stderr, "IcmpCreateFile failed with error %ld\n", error);
fprintf(stderr, "IcmpSendEcho failed with error %ld\n", error);
}
#endif