RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-27 09:52:17 +00:00
Code Issues Projects Releases Wiki Activity

avformat/libsrt: close listen fd immediately after accept

Browse Source 
There is no reason to keep it open.

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2021-01-30 23:57:34 +01:00
parent bd5226704a
commit d4e4ffd348
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/libsrt.c
View File

@ -53,7 +53,6 @@ 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;
@ -363,7 +362,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, listen_fd = -1; int port, fd = -1;
SRTContext *s = h->priv_data; SRTContext *s = h->priv_data;
const char *p; const char *p;
char buf[256]; char buf[256];
@ -440,7 +439,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; srt_close(fd);
fd = ret; fd = ret;
} else { } else {
if (s->mode == SRT_MODE_RENDEZVOUS) { if (s->mode == SRT_MODE_RENDEZVOUS) {
@ -473,7 +472,6 @@ 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;
@ -484,16 +482,12 @@ 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);
srt_epoll_release(s->eid); srt_epoll_release(s->eid);
return ret; return ret;
@ -689,10 +683,6 @@ static int libsrt_close(URLContext *h)
SRTContext *s = h->priv_data; SRTContext *s = h->priv_data;
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();