From patchwork Thu Aug 13 05:28:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Sugino X-Patchwork-Id: 21624 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 A99D544AF9C for ; Thu, 13 Aug 2020 08:53:30 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 89946689E5C; Thu, 13 Aug 2020 08:53:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f196.google.com (mail-qk1-f196.google.com [209.85.222.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 48AAA689E5C for ; Thu, 13 Aug 2020 08:53:23 +0300 (EEST) Received: by mail-qk1-f196.google.com with SMTP id n129so4290920qkd.6 for ; Wed, 12 Aug 2020 22:53:23 -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=dj0GQ7RZ2IArfB3+8gDxihQbH8l6ce0+ogkMlEetSm0=; b=AK4ZvFlNj/1vEq47CY3YBrwHGH/4epIimI7JaGuABIrk9NHcvu4NxdTdjaLKTSOxJg O7uES2dPaMUCZVwA56x5kuwxf2A5THZny56JZoCWViHI3KmEtV05KvE7Qtw74whGlFCu 8b84HfrY+oSZdN+i2ywshM+Qwe2+EDxuWDZyVp6XGc/+//CRRAA9DCuLyB+wSzcO9Yk1 iMuJfDRlUrI3OMoCqfL1/o/JH7k3eno9JQ+or+OrwpEBeXXwAXoi5dgNEjqbLpIwOPgg gHpwuYFplKsZvW4TVkFGevUMJJag+Z3XRN4BwMcwg9MzSPyj7EN3TLytQhJreZO6RQ3i BKvQ== 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=dj0GQ7RZ2IArfB3+8gDxihQbH8l6ce0+ogkMlEetSm0=; b=UZWabbnfjPWP1lgUR/YH1PdX72D6uIpSKmXn/Klu2vdMngRxO7wopTFZrA6oQGKXF6 AUgVLHi5Mb/VrNAUMHlnEPpycD1t3IHS1+L0QhOALVUIGzvMhkYKe/YaBFnfbjhybv5R BstpgNNaoyzixg9366fHFZaGSyWBLhLD/5j//YNFkVW1zrvmbEdtTcQLcaa7CMvVgk0M OlSEmaNSkZ8PTx4AXpjXU6xrStRKadHpr8y/yQ+bN6ROAu3s+GJb/E8uJUAsw3v7Cv8j WJHDccd8+3FBQq6JppaAA5tbmIsXTn9IUFGMRZGFuMUWwqE/WkoVl/5/Ai5aYCIbsvxC Q+jg== X-Gm-Message-State: AOAM5337eMKHgGje3SJeypqE5GXrlYSh8IcZ3qaL56swNl5BPHUI6H4U iCHKfkMXuC/CDfzn9gV4ZEGnOho8aqXwzQ== X-Google-Smtp-Source: ABdhPJxcROcHSpHvwOCyoOPHaDSAsIely+g7L/uzCUk4I447w6HzQC+3cq2sRoVPYjQEZx3WxjdAbg== X-Received: by 2002:ac8:6bc1:: with SMTP id b1mr3349960qtt.42.1597296531543; Wed, 12 Aug 2020 22:28:51 -0700 (PDT) Received: from DESKTOP-7F99H9A.localdomain ([181.169.172.160]) by smtp.gmail.com with ESMTPSA id y3sm5510530qtj.55.2020.08.12.22.28.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Aug 2020 22:28:50 -0700 (PDT) From: Nicolas Sugino To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Aug 2020 02:28:14 -0300 Message-Id: <20200813052814.4300-1-nsugino@3way.com.ar> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] 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. Signed-off-by: Nicolas Sugino --- libavformat/libsrt.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c index 4719ce0d4b..02dab64e36 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 > -1 ? listen_fd : -1; freeaddrinfo(ai); return 0; @@ -676,6 +679,9 @@ static int libsrt_close(URLContext *h) srt_close(s->fd); + if (s->listen_fd > -1) + srt_close(s->listen_fd); + srt_epoll_release(s->eid); srt_cleanup();