stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

iptv: udp - fix the mutex protection for the stop callback

Browse source
This commit is contained in:
Jaroslav Kysela 2014-07-07 19:55:10 +02:00
parent 069baa5ad9
commit 7af06e4d8b
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/input/mpegts/iptv/iptv.c
View file

@ -237,12 +237,12 @@ iptv_input_stop_mux ( mpegts_input_t *mi, mpegts_mux_instance_t *mmi )
iptv_mux_t *im = (iptv_mux_t*)mmi->mmi_mux;
mpegts_network_link_t *mnl;
pthread_mutex_lock(&iptv_lock);
/* Stop */
if (im->im_handler->stop)
im->im_handler->stop(im);
pthread_mutex_lock(&iptv_lock);
/* Close file */
if (im->mm_iptv_fd > 0) {
udp_close(im->mm_iptv_connection); // removes from poll
@ -292,19 +292,17 @@ iptv_input_thread ( void *aux )
pthread_mutex_lock(&iptv_lock);
/* No longer active */
if (!im->mm_active)
goto done;
/* Get data */
if ((n = im->im_handler->read(im)) < 0) {
tvhlog(LOG_ERR, "iptv", "read() error %s", strerror(errno));
im->im_handler->stop(im);
goto done;
/* Only when active */
if (im->mm_active) {
/* Get data */
if ((n = im->im_handler->read(im)) < 0) {
tvhlog(LOG_ERR, "iptv", "read() error %s", strerror(errno));
im->im_handler->stop(im);
break;
}
iptv_input_recv_packets(im, n);
}
iptv_input_recv_packets(im, n);
done:
pthread_mutex_unlock(&iptv_lock);
}
return NULL;