diff options
| author | Marton Balint <cus@passwd.hu> | 2021-01-30 23:57:34 +0100 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2021-02-07 19:42:22 +0100 |
| commit | d4e4ffd348ca39b66c79007ad1961f3303781d52 (patch) | |
| tree | 86a44bcf1234d42e8b6ae84181e02eca368255a7 | |
| parent | bd5226704ab5907ab2a318e29f95021be6ecf4c0 (diff) | |
| download | ffmpeg-d4e4ffd348ca39b66c79007ad1961f3303781d52.tar.gz | |
avformat/libsrt: close listen fd immediately after accept
There is no reason to keep it open.
Signed-off-by: Marton Balint <cus@passwd.hu>
| -rw-r--r-- | libavformat/libsrt.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c index f73e7dbfa5..28c06f130e 100644 --- a/libavformat/libsrt.c +++ b/libavformat/libsrt.c @@ -53,7 +53,6 @@ enum SRTMode { typedef struct SRTContext { const AVClass *class; int fd; - int listen_fd; int eid; int64_t rw_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) { struct addrinfo hints = { 0 }, *ai, *cur_ai; - int port, fd = -1, listen_fd = -1; + int port, fd = -1; SRTContext *s = h->priv_data; const char *p; char buf[256]; @@ -440,7 +439,7 @@ static int libsrt_setup(URLContext *h, const char *uri, int flags) // multi-client if ((ret = libsrt_listen(s->eid, fd, cur_ai->ai_addr, cur_ai->ai_addrlen, h, s->listen_timeout)) < 0) goto fail1; - listen_fd = fd; + srt_close(fd); fd = ret; } else { 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; s->fd = fd; - s->listen_fd = listen_fd; freeaddrinfo(ai); return 0; @@ -484,16 +482,12 @@ static int libsrt_setup(URLContext *h, const char *uri, int flags) cur_ai = cur_ai->ai_next; if (fd >= 0) srt_close(fd); - if (listen_fd >= 0) - srt_close(listen_fd); ret = 0; goto restart; } fail1: if (fd >= 0) srt_close(fd); - if (listen_fd >= 0) - srt_close(listen_fd); freeaddrinfo(ai); srt_epoll_release(s->eid); return ret; @@ -689,10 +683,6 @@ static int libsrt_close(URLContext *h) SRTContext *s = h->priv_data; srt_close(s->fd); - - if (s->listen_fd >= 0) - srt_close(s->listen_fd); - srt_epoll_release(s->eid); srt_cleanup(); |