jyapayne/moonlight-common-c
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Return a better error code when the control stream connection fails

Browse source
This commit is contained in:
Cameron Gutman 2022-08-09 23:26:33 -05:00
commit ef9c5a65cf
1 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/ControlStream.c
View file

@ -1214,13 +1214,25 @@ int startControlStream(void) {
else { else {
Limelog("Failed to establish ENet connection on UDP port %u: unexpected event %d (error: %d)\n", ControlPortNumber, event.type, LastSocketError()); Limelog("Failed to establish ENet connection on UDP port %u: unexpected event %d (error: %d)\n", ControlPortNumber, event.type, LastSocketError());
} }
stopping = true; stopping = true;
enet_peer_reset(peer); enet_peer_reset(peer);
peer = NULL; peer = NULL;
enet_host_destroy(client); enet_host_destroy(client);
client = NULL; client = NULL;
if (err == 0) {
return ETIMEDOUT; return ETIMEDOUT;
} }
else if (err > 0 && event.type != ENET_EVENT_TYPE_CONNECT && LastSocketError() == 0) {
// If we got an unexpected event type and have no other error to return, return the event type
LC_ASSERT(event.type != ENET_EVENT_TYPE_NONE);
return event.type != ENET_EVENT_TYPE_NONE ? event.type : LastSocketFail();
}
else {
return LastSocketFail();
}
}
// Ensure the connect verify ACK is sent immediately // Ensure the connect verify ACK is sent immediately
enet_host_flush(client); enet_host_flush(client);