From patchwork Mon Oct 12 20:36:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 22873 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 7BF7344AFE6 for ; Mon, 12 Oct 2020 23:36:35 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4A34C68BB62; Mon, 12 Oct 2020 23:36:35 +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 4F8DD68BB50 for ; Mon, 12 Oct 2020 23:36:29 +0300 (EEST) Received: by mail-qk1-f195.google.com with SMTP id s7so18833914qkh.11 for ; Mon, 12 Oct 2020 13:36:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=uqaI/PXfc6X/BgmmmQHsnDsP7bBg4CHP2y+LT9aQOpQ=; b=vS9l86FMcYzK4o/Z/xK2tzRANolnS2kAU3w8dltYvHMQdvVBKmGccR76NpfJ/0WQCu IXhShS8ieZXdhp8RDDCAIJjDWuC+2C/YGXKOYPzHIuDFgTVLZGgnskYjNYUKvp9wezHG qDaPEJLbfYWll89ZTfYewO2znO4JYEI1lB1Mfjy6q6sncYqxJ5JUrwcWuN1+RqvneYRM cPBduC9poUxVxfWffu0SLW8jWPBL7U1NBY1IYJx0NGAc35xr81EemHm/a2sKZMOOkVfw ZnVxjT7NdCQ6MhcfSacUZkn5oEnyPVzbFErAR0y05BP4ZjuMRg2MEuwydD3vJ/fOMCcp bQYQ== 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:mime-version :content-transfer-encoding; bh=uqaI/PXfc6X/BgmmmQHsnDsP7bBg4CHP2y+LT9aQOpQ=; b=JKN3d7DrfFpyw/YNMFPBCy5EfnQ/r0A5TBF2i3xFUqn5fxRWL9gMkwtQbjWSicgGQI J6GhcWI5RajTb5+p1QbbqhKQnqRW7M41+e43LSTxVrbDCuqOxB79XH3A2731jm34kCtL 1I7jkXar7LwhvwPRZbdClG+jezfPZLfkBYeLGQgoAqvLdczI5GYeGrrAbehM5VlWUNOZ EuINr3n4xpJ4pYqn6jPgSqsL2mgLPpzKLG/3pBY0hMb2368LuKpgOx7UCXtdxsOA05gq Ys1NI3ebQVCpYLamZE22mXX2wmczaRaJlGuB6+hiN7oiEZedKIt6osWX/gteK4NVP++X /tDA== X-Gm-Message-State: AOAM5309jnn3fJWy0KzifXXNMMKHQzt80N7ZexSFyRFoznQY0rMhNtyn rdKedu6jeTcApIB3uqxZhNXhKb0JTx4= X-Google-Smtp-Source: ABdhPJxk16qIGywvKLAyOldFU1nR7AnDzXXHEUdu3QJSyvzaj2LWxEwW2XJ8qfPycrjAgyiOY98tgQ== X-Received: by 2002:a37:8044:: with SMTP id b65mr11249308qkd.24.1602534987468; Mon, 12 Oct 2020 13:36:27 -0700 (PDT) Received: from localhost.localdomain (c-71-232-27-28.hsd1.ma.comcast.net. [71.232.27.28]) by smtp.gmail.com with ESMTPSA id p38sm13521826qtb.20.2020.10.12.13.36.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Oct 2020 13:36:27 -0700 (PDT) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Oct 2020 16:36:04 -0400 Message-Id: <20201012203609.41647-1-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 1/6] avformat/rtspdec: add network init to listen 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: Andriy Gelman Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Andriy Gelman As per the docs network initialization is required before ff_url_join(). Furthermore, because the ff_network_init() was skipped, this makes one additional call to ff_network_close() if the stream exits without errors. The was forgotten in the origin commit of the listen mode: a8ad6ffafe89e3a83f343f69249338e8245816f7 Signed-off-by: Andriy Gelman --- libavformat/rtspdec.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c index ef084a8b2b..1ff84cdd56 100644 --- a/libavformat/rtspdec.c +++ b/libavformat/rtspdec.c @@ -640,6 +640,9 @@ static int rtsp_listen(AVFormatContext *s) int ret; enum RTSPMethod methodcode; + if (!ff_network_init()) + return AVERROR(EIO); + /* extract hostname and port */ av_url_split(proto, sizeof(proto), auth, sizeof(auth), host, sizeof(host), &port, path, sizeof(path), s->url); @@ -664,19 +667,19 @@ static int rtsp_listen(AVFormatContext *s) &s->interrupt_callback, NULL, s->protocol_whitelist, s->protocol_blacklist, NULL)) { av_log(s, AV_LOG_ERROR, "Unable to open RTSP for listening\n"); - return ret; + goto fail; } rt->state = RTSP_STATE_IDLE; rt->rtsp_hd_out = rt->rtsp_hd; for (;;) { /* Wait for incoming RTSP messages */ ret = read_line(s, rbuf, sizeof(rbuf), &rbuflen); if (ret < 0) - return ret; + goto fail; ret = parse_command_line(s, rbuf, rbuflen, uri, sizeof(uri), method, sizeof(method), &methodcode); if (ret) { av_log(s, AV_LOG_ERROR, "RTSP: Unexpected Command\n"); - return ret; + goto fail; } if (methodcode == ANNOUNCE) { @@ -692,9 +695,13 @@ static int rtsp_listen(AVFormatContext *s) ret = rtsp_read_setup(s, host, uri); if (ret) { ffurl_close(rt->rtsp_hd); - return AVERROR_INVALIDDATA; + ret = AVERROR_INVALIDDATA; + goto fail; } } +fail: + ff_network_close(); + return ret; } static int rtsp_probe(const AVProbeData *p)