Fixed client not fully stopping all connections on disconnect

bkacjios · bkacjios · commit 1ac5e452996a · 2025-01-03T16:11:51.000-05:00
diff --git a/mumble/mumble.c b/mumble/mumble.c
@@ -825,14 +825,21 @@ static void mumble_client_free(MumbleClient *client) {
 }
 
 static void mumble_client_cleanup(MumbleClient *client) {
+	if (uv_is_active((uv_handle_t*) &client->socket_udp)) {
+		uv_udp_recv_stop(&client->socket_udp);
+	}
 	uv_close((uv_handle_t*) &client->socket_udp, NULL);
+	if (uv_is_active((uv_handle_t*) &client->ssl_poll)) {
+		uv_poll_stop(&client->ssl_poll);
+	}
 	uv_close((uv_handle_t*) &client->socket_tcp, NULL);
 	if (uv_is_active((uv_handle_t*) &client->ping_timer)) {
 		uv_timer_stop(&client->ping_timer);
 	}
 	if (uv_is_active((uv_handle_t*) &client->audio_timer)) {
 		uv_timer_stop(&client->audio_timer);
 	}
+	uv_cancel((uv_req_t*)&client->tcp_connect_req);
 
 	LinkNode* current = client->stream_list;
 

Original file line number	Diff line number	Diff line change
`@@ -825,14 +825,21 @@ static void mumble_client_free(MumbleClient *client) {`
`825`	`825`	`}`
`826`	`826`
`827`	`827`	`static void mumble_client_cleanup(MumbleClient *client) {`
	`828`	`+ if (uv_is_active((uv_handle_t*) &client->socket_udp)) {`
	`829`	`+ uv_udp_recv_stop(&client->socket_udp);`
	`830`	`+ }`
`828`	`831`	`uv_close((uv_handle_t*) &client->socket_udp, NULL);`
	`832`	`+ if (uv_is_active((uv_handle_t*) &client->ssl_poll)) {`
	`833`	`+ uv_poll_stop(&client->ssl_poll);`
	`834`	`+ }`
`829`	`835`	`uv_close((uv_handle_t*) &client->socket_tcp, NULL);`
`830`	`836`	`if (uv_is_active((uv_handle_t*) &client->ping_timer)) {`
`831`	`837`	`uv_timer_stop(&client->ping_timer);`
`832`	`838`	`}`
`833`	`839`	`if (uv_is_active((uv_handle_t*) &client->audio_timer)) {`
`834`	`840`	`uv_timer_stop(&client->audio_timer);`
`835`	`841`	`}`
	`842`	`+ uv_cancel((uv_req_t*)&client->tcp_connect_req);`
`836`	`843`
`837`	`844`	`LinkNode* current = client->stream_list;`
`838`	`845`