Skip to content

Display and control your Android device

Interrupt and close sockets on server stop

Romain Vimontddb939674307
diff --git a/app/src/server.c b/app/src/server.c
index 8453f959..e89a6f10 100644
--- a/app/src/server.c
+++ b/app/src/server.c
@@ -763,6 +763,17 @@ run_server(void *data) {
}
sc_mutex_unlock(&server->mutex);
+ // Interrupt sockets to wake up socket blocking calls on the server
+ assert(server->video_socket != SC_SOCKET_NONE);
+ net_interrupt(server->video_socket);
+ net_close(server->video_socket);
+
+ if (server->control_socket != SC_SOCKET_NONE) {
+ // There is no control_socket if --no-control is set
+ net_interrupt(server->control_socket);
+ net_close(server->control_socket);
+ }
+
// Give some delay for the server to terminate properly
#define WATCHDOG_DELAY SC_TICK_FROM_SEC(1)
sc_tick deadline = sc_tick_now() + WATCHDOG_DELAY;