From patchwork Fri Aug 14 01:18:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Sugino X-Patchwork-Id: 21645 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 9067A4483D2 for ; Fri, 14 Aug 2020 04:18:43 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6A0A66881E5; Fri, 14 Aug 2020 04:18:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A1E8C6880C3 for ; Fri, 14 Aug 2020 04:18:36 +0300 (EEST) Received: by mail-qk1-f195.google.com with SMTP id p25so7084555qkp.2 for ; Thu, 13 Aug 2020 18:18:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=3way-com-ar.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=vkb3Zi8itwOwdumqB9wtf9eWDIuwugq6zpHYFazNvKs=; b=LhadOKXFikviF5LN2tP5/g4vklLj+ecsKhS9zAv8odV5wMzm1BBFfccWtPyo8BQFnP KL2VAbfAHHOJMuj1rcoAaSs+70NF+VU1KhGrfY7UN8ekEBr3bhHJJjlnLdVL1BgT6Ii8 grqvtKjhMCugC8Jkd4q3UfBcrkB3AvSxhvTXmQQWdCxRkk68zwK26A53/OgbJgM9pxVO mffAkFKd3T1pWAMH/NpRMDwR2PIxUOdDRdKltUxkThkYOgNBzgW7xhBxFbP69dM+m7qo hIepSEjKa2rnoNMt9Pssq10zisuqVKdRztnodSc59A3yNOPqetrkCHsns9T9hbEnV5Og /SvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=vkb3Zi8itwOwdumqB9wtf9eWDIuwugq6zpHYFazNvKs=; b=CYlr4x8KjqdCAewZnMs/d8ulEGaYiJDqC0OhJOik+NNwPDmhUI7lACTpYhbRAYcqJY vdAH9Pzc1SmhwpwcrBbU33YrS4o1NTYX6v8OBUdb343Hx0b+38h4cZABHxTMnlFGpbJR KNuMwqUqd8gN8yYPcfceo5I12oan0AO9c+QTy4ZfR7CMYzSxbOu3mpTIaLdsPOsPOQiA hk3uqoOevF+Jobz9QC9sgV1gvid3riyP6C+1JMrQ5Y6He6eg3LIQRSnC5+1A3GYZOmFl WCJEuEFPncdrklIDc9f5+EEB8Y1MGXK/MAeZHIJ8yyMXYCt6THYlgJoPI0jbNN/q5oGH 3KPQ== X-Gm-Message-State: AOAM530lS86bVSsHw2YlkSbyF2syCzgcHWsIdgYQkv78P1PBdYjHeF5k vryn+droHRnal8V0RYanudwFHaMwIlyeKTCT X-Google-Smtp-Source: ABdhPJwbIdD9DvxYAyDEjApa3owL4lQQfdAJxAwDlfFet86IUwbALGiyV6GGy1ACqC2Nq/Ta6YkmXA== X-Received: by 2002:a37:e89:: with SMTP id 131mr4727qko.279.1597367914787; Thu, 13 Aug 2020 18:18:34 -0700 (PDT) Received: from DESKTOP-7F99H9A.localdomain ([181.169.172.160]) by smtp.gmail.com with ESMTPSA id y24sm8080038qtv.71.2020.08.13.18.18.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Aug 2020 18:18:33 -0700 (PDT) From: Nicolas Sugino To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Aug 2020 22:18:26 -0300 Message-Id: <20200814011826.11681-1-nsugino@3way.com.ar> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v4] avformat/libsrt: Close listen fd in listener mode X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Nicolas Sugino MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 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 --- libavformat/libsrt.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c index 4719ce0d4b..4025b24976 100644 --- a/libavformat/libsrt.c +++ b/libavformat/libsrt.c @@ -53,6 +53,7 @@ enum SRTMode { typedef struct SRTContext { const AVClass *class; int fd; + int listen_fd; int eid; int64_t rw_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) { struct addrinfo hints = { 0 }, *ai, *cur_ai; - int port, fd = -1; + int port, fd = -1, listen_fd = -1; SRTContext *s = h->priv_data; const char *p; char buf[256]; @@ -439,6 +440,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; fd = ret; } else { 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; s->fd = fd; + s->listen_fd = listen_fd; freeaddrinfo(ai); return 0; @@ -481,12 +484,16 @@ 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); return ret; } @@ -676,6 +683,9 @@ static int libsrt_close(URLContext *h) srt_close(s->fd); + if (s->listen_fd >= 0) + srt_close(s->listen_fd); + srt_epoll_release(s->eid); srt_cleanup();