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

Handle ENet disconnect events after receives

Browse Source
This commit is contained in:
Cameron Gutman 2019-02-10 01:42:49 -08:00
parent 6232935a1a
commit b7ce1bedbe
1 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/ControlStream.c
View File

@ -35,6 +35,7 @@ static int lossCountSinceLastReport;
static long lastGoodFrame; static long lastGoodFrame;
static long lastSeenFrame; static long lastSeenFrame;
static int stopping; static int stopping;
static int disconnectPending;
static int idrFrameRequired; static int idrFrameRequired;
static LINKED_BLOCKING_QUEUE invalidReferenceFrameTuples; static LINKED_BLOCKING_QUEUE invalidReferenceFrameTuples;
@ -188,6 +189,7 @@ int initializeControlStream(void) {
lastGoodFrame = 0; lastGoodFrame = 0;
lastSeenFrame = 0; lastSeenFrame = 0;
lossCountSinceLastReport = 0; lossCountSinceLastReport = 0;
disconnectPending = 0;
return 0; return 0;
} }
@ -391,6 +393,27 @@ static int sendMessageAndDiscardReply(short ptype, short paylen, const void* pay
return 1; return 1;
} }
// This intercept function drops disconnect events to allow us to process
// pending receives first. It works around what appears to be a bug in ENet
// where pending disconnects can cause loss of unprocessed received data.
static int ignoreDisconnectIntercept(ENetHost* host, ENetEvent* event) {
if (host->receivedDataLength == sizeof(ENetProtocolHeader) + sizeof(ENetProtocolDisconnect)) {
ENetProtocolHeader* protoHeader = (ENetProtocolHeader*)host->receivedData;
ENetProtocolDisconnect* disconnect = (ENetProtocolDisconnect*)(protoHeader + 1);
if ((disconnect->header.command & ENET_PROTOCOL_COMMAND_MASK) == ENET_PROTOCOL_COMMAND_DISCONNECT) {
Limelog("ENet disconnect event pending\n");
disconnectPending = 1;
if (event) {
event->type = ENET_EVENT_TYPE_NONE;
}
return 1;
}
}
return 0;
}
static void controlReceiveThreadFunc(void* context) { static void controlReceiveThreadFunc(void* context) {
int err; int err;
@ -407,6 +430,14 @@ static void controlReceiveThreadFunc(void* context) {
err = serviceEnetHost(client, &event, 0); err = serviceEnetHost(client, &event, 0);
PltUnlockMutex(&enetMutex); PltUnlockMutex(&enetMutex);
if (err == 0) { if (err == 0) {
// Handle a pending disconnect after unsuccessfully polling
// for new events to handle.
if (disconnectPending) {
Limelog("Dispatching pending ENet disconnect\n");
ListenerCallbacks.connectionTerminated(-1);
return;
}
// No events ready // No events ready
PltSleepMs(100); PltSleepMs(100);
continue; continue;
@ -688,6 +719,8 @@ int startControlStream(void) {
return -1; return -1;
} }
client->intercept = ignoreDisconnectIntercept;
// Connect to the host // Connect to the host
peer = enet_host_connect(client, &address, 1, 0); peer = enet_host_connect(client, &address, 1, 0);
if (peer == NULL) { if (peer == NULL) {