From patchwork Thu Aug 13 22:07:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Sugino X-Patchwork-Id: 21641 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 4D88A44B608 for ; Fri, 14 Aug 2020 01:13:37 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 15A6068AF9C; Fri, 14 Aug 2020 01:13:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f68.google.com (mail-qv1-f68.google.com [209.85.219.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DFDC868A062 for ; Fri, 14 Aug 2020 01:13:30 +0300 (EEST) Received: by mail-qv1-f68.google.com with SMTP id j10so3394281qvo.13 for ; Thu, 13 Aug 2020 15:13:30 -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=gL4E7LmRHG0ILTtubwaHq54F7qftQTOMwn9N+pJzrCU=; b=OKaGNVTGIr1h0PUhjkxMW9kL8JuraCqtb6v7eV8Re72x3r30lri+IV0JG8xxqUXkpx cdSERhRQi43DYUyew5d2RQFH8nHLA1y4hPNoffUgS/iS7CKCs0b50zwVcSU4KNhZG4gz cNsuDMPfRJmv/w76o2mL0Xo3KmpXGLBi0j3+S7+gSneMfQRGXYr8dGlZjkqxTi42vru7 btp9y6D0UstY5LkHozeuf3pYL7k+jEl5bAor5MuCS6xVXRO5WExBxgXyvFjZdhkRVW+K oXD8mySLt9ZF/wlWobK8R7QVlinyHvYee38WSJjMRTwrsJ9cwBccmcSvhHCg9iFlhJbW MUPw== 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=gL4E7LmRHG0ILTtubwaHq54F7qftQTOMwn9N+pJzrCU=; b=g+yhxy5yDI34Bz5OSki78xhbiXKtW80l1A/+erTL1Qn21o1wrqn2U8y4LpKfcxZ9qx A5eWr9RAD9Zz28Z5atPggcLzb1VvxoOGC1e41B2cYuh3OhCOKaoPz1wOrcIXuhydsja2 GrIv3IG1bo3w2qPwmvjLGRKrRTGrqBy9zmYRQhVQPb4J3N2JaYFnxk9LkGJrBSIFfOtX m6kO9OdJQd6CYji5fJFiSMfO61wNeJMPBXhp9q6a9SPPRTS/cCQQ2OMtqPGUhwJ3HEcD zRsMG3+cDlcJ1sTRd8BlLp/uYG03L7LwiELjbNYlI8Cj3iHpC6TaFeiUa5RPj3pRpTKo 5vpQ== X-Gm-Message-State: AOAM532p73Oas5M0pE9n/nmSecoULX5kY0TkbWs2/GCLx5lJLx8f7vzQ cy6H1d4JhomhrJ7Ixbk4akGitXiytSRtKQyQ X-Google-Smtp-Source: ABdhPJwHbkAFGUTkbGbRlVqcV4c3CerltxPuCxPLuAVfdQOPye+MNXNTCzR09QIeExIe4/LHfmF0Ww== X-Received: by 2002:a05:6214:10e8:: with SMTP id q8mr6452357qvt.59.1597356450839; Thu, 13 Aug 2020 15:07:30 -0700 (PDT) Received: from DESKTOP-7F99H9A.localdomain ([181.169.172.160]) by smtp.gmail.com with ESMTPSA id r6sm7689680qtu.93.2020.08.13.15.07.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Aug 2020 15:07:30 -0700 (PDT) From: Nicolas Sugino To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Aug 2020 19:07:12 -0300 Message-Id: <20200813220712.891-1-nsugino@3way.com.ar> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v2] 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 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c index 4719ce0d4b..f3fdfd1711 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; @@ -487,6 +490,8 @@ static int libsrt_setup(URLContext *h, const char *uri, int flags) fail1: if (fd >= 0) srt_close(fd); + if (listen_fd >= 0) + srt_close(fd); freeaddrinfo(ai); return ret; } @@ -676,6 +681,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();