From patchwork Sun Apr 4 15:36:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 26736 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 B189A44AEEE for ; Sun, 4 Apr 2021 18:37:23 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 959ED687FBB; Sun, 4 Apr 2021 18:37:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f169.google.com (mail-qt1-f169.google.com [209.85.160.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3F4C36802C0 for ; Sun, 4 Apr 2021 18:37:16 +0300 (EEST) Received: by mail-qt1-f169.google.com with SMTP id h7so6947519qtx.3 for ; Sun, 04 Apr 2021 08:37:16 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=ezNwH/IFZidkchMl5vIzKlofiD04/4fziBMZjKcoyN0=; b=IX8MADOWfC7Je1NGYgpHg7lQLMLf90MTZhMEfLbEVfstlQ49dkSTXIPN6+Uq7eFySE YMTKCzWpaxHpT8/mf/JAwz38bbOBmrIj5i3Tm3xZYmoQi3nx3IJI9hDSoFTD63xRewLI WDgNkjRh/3RNmv+4kR0HeR6UfxSrWdceEwTpsAEc0wCg+und5BAYSYx5E1YilKJSocfQ bWfx0Hlg/HLjwLnU+eGX0QT8RnT8kVPjK1a7Rps2cMStnuPVEx/8jQJVQTkBRdQNjh76 dmL0LovLtLh/M1Lw4N5+W3kqzuzKm1xrn5l+0myJbWQl1hqN9p9xK9FQzt+LKCPKw4Gq m+ug== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=ezNwH/IFZidkchMl5vIzKlofiD04/4fziBMZjKcoyN0=; b=FNgI6gyBEctJ40v0D9wTxbgjh2m2FKwPJEcL296xuukJ2w00elHxojPx7uW6ktJpmA /mDEITtMkApm7O3OtFdDsJIK48ppV3g1PsPTuUZj7EpVnwRTR30hn8TMxA5slpjCEwG2 bgluSmp0NXdynf/tOWZuhay7HpDZ/+7EJPkA0zLaw291f03C2bqnQMlJrRJHAPmWaTUB FbG04Dcnv7vZHkaPg8TrJLI5rsYd/goyrm8Lv67FtgVPWDKlsXsp11aXo5kg0EQNufgc LVJWipbM21dzCatdLNdE83NrTmysQu2MTJO9fKm0txdtuk5JtgDrKlQitN4JZDPXp6H9 Onvg== X-Gm-Message-State: AOAM532bjz92LJGFbMURnPxxBIz8YthUwYlj+PrN1R80O0ZIaIc/Uvib ccqvbwoQyiq9vkajbUMZeyBseIr33YI= X-Google-Smtp-Source: ABdhPJx6xCty4aXD7SN048/P3UArXvMvrC/SUmeJXLhCc/+0GkvLk8AUMu+H+c9F1+xwy7rDQoxCMw== X-Received: by 2002:a05:622a:1052:: with SMTP id f18mr2519051qte.232.1617550634999; Sun, 04 Apr 2021 08:37:14 -0700 (PDT) Received: from localhost.localdomain (c-73-149-98-40.hsd1.ma.comcast.net. [73.149.98.40]) by smtp.gmail.com with ESMTPSA id m13sm11294372qkk.16.2021.04.04.08.37.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Apr 2021 08:37:14 -0700 (PDT) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Sun, 4 Apr 2021 11:36:45 -0400 Message-Id: <20210404153645.565251-3-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210404153645.565251-1-andriy.gelman@gmail.com> References: <20210404153645.565251-1-andriy.gelman@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avformat/rtsp: Include rtcp in port range check 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 Currently it is only checked that the rtp port does not exceed rtp_port_max. --- libavformat/rtsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 6438e2edb8..e6a068148b 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1508,7 +1508,7 @@ int ff_rtsp_make_setup_request(AVFormatContext *s, const char *host, int port, } /* first try in specified port range */ - while (j <= rt->rtp_port_max) { + while (j + 1 <= rt->rtp_port_max) { AVDictionary *opts = map_to_opts(rt); ff_url_join(buf, sizeof(buf), "rtp", NULL, host, -1,