moonlight-stream/moonlight-common-c
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-common-c.git synced 2025-08-18 01:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix sign extension bug in connection termination error code

Browse Source
This commit is contained in:
Cameron Gutman 2019-02-12 22:24:18 -08:00
parent a016474acc
commit 83d7f675a7
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/ControlStream.c
View File

@ -422,7 +422,7 @@ static void controlReceiveThreadFunc(void* context) {
return;
}
unsigned short terminationReason = -1;
long terminationErrorCode = -1;
while (!PltIsThreadInterrupted(&controlReceiveThread)) {
ENetEvent event;
@ -508,10 +508,22 @@ static void controlReceiveThreadFunc(void* context) {
BbInitializeWrappedBuffer(&bb, event.packet->data, sizeof(*ctlHdr), event.packet->dataLength - sizeof(*ctlHdr), BYTE_ORDER_LITTLE);
unsigned short terminationReason;
BbGetShort(&bb, &terminationReason);
Limelog("Server notified termination reason: 0x%04x\n", terminationReason);
// SERVER_TERMINATED_INTENDED
if (terminationReason == 0x0100) {
// Pass error code 0 to notify the client that this was not an error
terminationErrorCode = 0;
}
else {
// Otherwise pass the reason unmodified
terminationErrorCode = terminationReason;
}
// We don't actually notify the connection listener until we receive
// the disconnect event from the server that confirms the termination.
}
@ -520,16 +532,7 @@ static void controlReceiveThreadFunc(void* context) {
}
else if (event.type == ENET_EVENT_TYPE_DISCONNECT) {
Limelog("Control stream received disconnect event\n");
// SERVER_TERMINATED_INTENDED
if (terminationReason == 0x0100) {
// Pass error code 0 to notify the client that this was not an error
ListenerCallbacks.connectionTerminated(0);
}
else {
ListenerCallbacks.connectionTerminated(terminationReason);
}
ListenerCallbacks.connectionTerminated(terminationErrorCode);
return;
}
}