eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-19 05:20:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

avformat/libsrt: close listen fd in listener mode

Browse Source 
In listener mode the first fd is not closed when libsrt_close() is called
because it is overwritten by the new accept fd.  Added the listen_fd to the
context to properly close it when libsrt_close() is called.

Fixes trac ticket #8372.

Signed-off-by: Nicolas Sugino <nsugino@3way.com.ar>
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Nicolas Sugino
2020-08-13 22:18:26 -03:00
committed by Marton Balint
parent 8931c55789
commit 86f5fd471d
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/libsrt.c
View File

@@ -53,6 +53,7 @@ enum SRTMode {
typedef struct SRTContext { typedef struct SRTContext {
const AVClass *class; const AVClass *class;
int fd; int fd;
int listen_fd;
int eid; int eid;
int64_t rw_timeout; int64_t rw_timeout;
int64_t listen_timeout; int64_t listen_timeout;
@@ -362,7 +363,7 @@ static int libsrt_set_options_pre(URLContext *h, int fd)
static int libsrt_setup(URLContext *h, const char *uri, int flags) static int libsrt_setup(URLContext *h, const char *uri, int flags)
{ {
struct addrinfo hints = { 0 }, *ai, *cur_ai; struct addrinfo hints = { 0 }, *ai, *cur_ai;
int port, fd = -1; int port, fd = -1, listen_fd = -1;
SRTContext *s = h->priv_data; SRTContext *s = h->priv_data;
const char *p; const char *p;
char buf[256]; char buf[256];
@@ -439,6 +440,7 @@ static int libsrt_setup(URLContext *h, const char *uri, int flags)
// multi-client // multi-client
if ((ret = libsrt_listen(s->eid, fd, cur_ai->ai_addr, cur_ai->ai_addrlen, h, s->listen_timeout)) < 0) if ((ret = libsrt_listen(s->eid, fd, cur_ai->ai_addr, cur_ai->ai_addrlen, h, s->listen_timeout)) < 0)
goto fail1; goto fail1;
listen_fd = fd;
fd = ret; fd = ret;
} else { } else {
if (s->mode == SRT_MODE_RENDEZVOUS) { if (s->mode == SRT_MODE_RENDEZVOUS) {
@@ -471,6 +473,7 @@ static int libsrt_setup(URLContext *h, const char *uri, int flags)
h->is_streamed = 1; h->is_streamed = 1;
s->fd = fd; s->fd = fd;
s->listen_fd = listen_fd;
freeaddrinfo(ai); freeaddrinfo(ai);
return 0; return 0;
@@ -481,12 +484,16 @@ static int libsrt_setup(URLContext *h, const char *uri, int flags)
cur_ai = cur_ai->ai_next; cur_ai = cur_ai->ai_next;
if (fd >= 0) if (fd >= 0)
srt_close(fd); srt_close(fd);
if (listen_fd >= 0)
srt_close(listen_fd);
ret = 0; ret = 0;
goto restart; goto restart;
} }
fail1: fail1:
if (fd >= 0) if (fd >= 0)
srt_close(fd); srt_close(fd);
if (listen_fd >= 0)
srt_close(listen_fd);
freeaddrinfo(ai); freeaddrinfo(ai);
return ret; return ret;
} }
@@ -676,6 +683,9 @@ static int libsrt_close(URLContext *h)
srt_close(s->fd); srt_close(s->fd);
if (s->listen_fd >= 0)
srt_close(s->listen_fd);
srt_epoll_release(s->eid); srt_epoll_release(s->eid);
srt_cleanup(); srt_cleanup();