MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-02-05 18:58:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

[streaming] A bit of fixing up

Browse Source
This commit is contained in:
ejurgensen 2019-09-22 23:07:36 +02:00
parent 586dc4342d
commit 8cff93ce55
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/httpd_streaming.c
View File

@ -115,9 +115,9 @@ streaming_close_cb(struct evhttp_connection *evcon, void *arg)
DPRINTF(E_INFO, L_STREAMING, "Stopping mp3 streaming to %s:%d\n", address, (int)port); DPRINTF(E_INFO, L_STREAMING, "Stopping mp3 streaming to %s:%d\n", address, (int)port);
pthread_mutex_lock(&streaming_sessions_lck); pthread_mutex_lock(&streaming_sessions_lck);
if (streaming_sessions == NULL) if (!streaming_sessions)
{ {
// This close comes duing deinit() - we don't free `this` since it is // This close comes during deinit() - we don't free `this` since it is
// already a dangling ptr (free'd in deinit()) at this stage // already a dangling ptr (free'd in deinit()) at this stage
pthread_mutex_unlock(&streaming_sessions_lck); pthread_mutex_unlock(&streaming_sessions_lck);
return; return;
@ -136,7 +136,7 @@ streaming_close_cb(struct evhttp_connection *evcon, void *arg)
{ {
DPRINTF(E_LOG, L_STREAMING, "Bug! Got a failure callback for an unknown stream (%s:%d)\n", address, (int)port); DPRINTF(E_LOG, L_STREAMING, "Bug! Got a failure callback for an unknown stream (%s:%d)\n", address, (int)port);
free(this); free(this);
pthread_mutex_unlock(&streaming_sessions_lck); pthread_mutex_unlock(&streaming_sessions_lck);
return; return;
} }
@ -148,9 +148,8 @@ streaming_close_cb(struct evhttp_connection *evcon, void *arg)
if (session->require_icy) if (session->require_icy)
--streaming_icy_clients; --streaming_icy_clients;
/* Possible libevent bug; ownership of evhttp_request with libevent // Valgrind says libevent doesn't free the request on disconnect (even though it owns it - libevent bug?),
* Workaround to force mem cleanup, prefered over evhttp_request_free() // so we do it with a reply end
*/
evhttp_send_reply_end(session->req); evhttp_send_reply_end(session->req);
free(session); free(session);
@ -160,7 +159,8 @@ streaming_close_cb(struct evhttp_connection *evcon, void *arg)
event_del(streamingev); event_del(streamingev);
event_del(metaev); event_del(metaev);
} }
pthread_mutex_unlock(&streaming_sessions_lck);
pthread_mutex_unlock(&streaming_sessions_lck);
} }
static void static void