From patchwork Sun Jul 4 15:40:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 28757 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3387003ios; Sun, 4 Jul 2021 08:41:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwzQ66LRNV40NLT4XUf+Q4qOA7HShuv82HkDHSZHCnmrkleKWSt+pvO9/pXE7obhBJBcZL/ X-Received: by 2002:a17:907:d88:: with SMTP id go8mr9188412ejc.485.1625413268123; Sun, 04 Jul 2021 08:41:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625413268; cv=none; d=google.com; s=arc-20160816; b=uat+GZZJ718lpqxy7szsZ+FOLYqQq1fjx+dS7o1EDjdEmDi7F/Vr3TSeehlYWYHO3N VNVCXGT3ERTOYoXj74vOUHVuyHmJ1/WCe5iIKljddAkmCajHq6nK30EHMrGVmU/tK7Jk jG7WW5iHtu5eWnbLuM+CpiWUgqvC0999hLpgFHwKUGocGdWfYPoXPNc6g7TTHuMzYjpI wsO+tWYgazVcujFkt1fJq9jh2+TkZhQVF5xgIOwJqQA9jKTywPmDYeFYZ27vsxdFHWuW n2z/O+HdNk2MNRQv+8K8ZrN7JqyeuOHV5wVnCZk06aS1Q9V6GdbJpfRBMiShnz3GJM4B oYRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=Ad11XMeQWa9WSNR9u+lybgNN+09KPgLGSX+/RJE2gYk=; b=WHUMBNdKwHAEcaTcQu9Hiyi098qZtS3WwMBC597e+a/p2zAU94xaawlt7dUGuBnbXf FcdRLF7bVrIRvB9QrErBjZJ0PYwB7nRShGe4eF0JmGA7xXmUlTCHzLlpyWNfJQpSV6pI njW4LBR0bY8zH3MxtKNxGAc89bAe3Xw3uNZCXj671c0ERgEAlOqTLixlfu/Fz+7JTrBs MbuRvo71fht1CHvjIQtn5HhGyuiozpzyyLtwrJz5bjNrsjXd2tCDdfuIOrKkH7b8IuKP V1zfC9FXYhfOmZMoFakeDHa7UtG0cbjKOlfl8B5SZfQvuo4YhZdLRuEad+3LTwWfnuoz GNNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Xt7UBKaz; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v16si9901134edd.315.2021.07.04.08.41.07; Sun, 04 Jul 2021 08:41:08 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Xt7UBKaz; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4F3F768A5B8; Sun, 4 Jul 2021 18:41:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f176.google.com (unknown [209.85.160.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8A49C68A309 for ; Sun, 4 Jul 2021 18:40:57 +0300 (EEST) Received: by mail-qt1-f176.google.com with SMTP id f20so10512972qtk.10 for ; Sun, 04 Jul 2021 08:40:57 -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=6Zy07NTcyEbti+FNGVlUYsaH7nHDzEj1wzva0rNxMX4=; b=Xt7UBKazZEAEh02XAH/qnROlEpy1VYkRHczlmKdjNqeyUBfnFA9lT0cMaUa6iZp3S+ ks0P02uLkeVeFxFftTCqlrHvvWMqUqzFjkSNzX8345cuhrkN7ltPPO3yD/rIs0nrEhwE X0XLQ/hxRDfiXi7+1r33JmE5ChTp/l6y6+gSj9dFOK93drhyUePALfHxykCyXYDTdDcd CqCa2MySNbrCAA+BAf6IpvGG9e2f/sw24D6FwL2YIL2z7bA8la+tlFzJsuMDgc7I3dNj yKO8L09Rf82iFJrJXKOTKH7bg49tH/mjZarMhzCKwfCxLvwdqH224SdRkmr68BTGPJWK iJPQ== 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=6Zy07NTcyEbti+FNGVlUYsaH7nHDzEj1wzva0rNxMX4=; b=Ltz2Aqc/GCbYcfj0m8/jToBKmIxkflnIyvVMfXQZtPD1/m+YjMUhq+Udm/guByRxXw 1K8dPsXIsOAY/0iGe1de/e8C5nNppTFpiZHUdf/RNMhlSsXfq56whWWcAAZa9CQhYyqk WOBUtM1dvqqjPaZKjbuMaGSxNF7ZOAg320rPHTKXgZrpZMFkl66q6oFlyZfR96SCHvkp YyN73rIRaefXkxrHVClnVnNpGQ0oFz58GNEfuvFgr+qmGsewXBv1PHAtWviaeRi9qXbK +W6wwnfS1+ozQWc+pOaZfl6DhctruFoW1bnNKelvSoDE+wx6lo8YUv9RQjMcIgUpJ84n /M2Q== X-Gm-Message-State: AOAM532OU/o9EK5MK45ezDFjxXBOyMc45ZVFWR51abuQR6QmQNQVS4s2 uAwyCKluKfFPvG3KIvD6X27Dq7QsMtA= X-Received: by 2002:ac8:7d04:: with SMTP id g4mr9043187qtb.332.1625413246104; Sun, 04 Jul 2021 08:40:46 -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 s13sm4215304qkm.87.2021.07.04.08.40.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Jul 2021 08:40:45 -0700 (PDT) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Sun, 4 Jul 2021 11:40:25 -0400 Message-Id: <20210704154027.13380-1-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/3] avformat/rtsp: Set port_off to zero for low min/max port range X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: B4NfHLkfwYas From: Andriy Gelman Fixes: $ ffmpeg -min_port 32000 -max_port 32001 -i rtsp://wowzaec2demo.streamlock.net/vod/mp4:BigBuckBunny_115k.mov -f null - [1] 303871 floating point exception (core dumped) Signed-off-by: Andriy Gelman --- libavformat/rtsp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 9f509a229f..0185baca8e 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1438,7 +1438,7 @@ int ff_rtsp_make_setup_request(AVFormatContext *s, const char *host, int port, int lower_transport, const char *real_challenge) { RTSPState *rt = s->priv_data; - int rtx = 0, j, i, err, interleave = 0, port_off; + int rtx = 0, j, i, err, interleave = 0, port_off = 0; RTSPStream *rtsp_st; RTSPMessageHeader reply1, *reply = &reply1; char cmd[MAX_URL_SIZE]; @@ -1457,9 +1457,11 @@ int ff_rtsp_make_setup_request(AVFormatContext *s, const char *host, int port, /* Choose a random starting offset within the first half of the * port range, to allow for a number of ports to try even if the offset * happens to be at the end of the random range. */ + if (rt->rtp_port_max - rt->rtp_port_min >= 4) { port_off = av_get_random_seed() % ((rt->rtp_port_max - rt->rtp_port_min)/2); /* even random offset */ port_off -= port_off & 0x01; + } for (j = rt->rtp_port_min + port_off, i = 0; i < rt->nb_rtsp_streams; ++i) { char transport[MAX_URL_SIZE]; From patchwork Sun Jul 4 15:40:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 28758 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3387086ios; Sun, 4 Jul 2021 08:41:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx4kvbGxIWpHOdbwTgYQ7hQt+1zAU5Z9FJTwBnKKDzkUEq9tt1YRN3TOo+IO/gu8hFtC53i X-Received: by 2002:a17:906:cc89:: with SMTP id oq9mr3213931ejb.418.1625413277085; Sun, 04 Jul 2021 08:41:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625413277; cv=none; d=google.com; s=arc-20160816; b=eIei34ok27Of5RL0M78R+jgnXGLuUUdHvIjH6kiRsLlkOodHNo/vXl6nP+5tFXmqNe I4w93Arb9dcvEhp51In41S4+dGD+tKKyShGVy9VmBpso6zs5OfSkxkKT6CtbuajNyO/Z 5Mu7PwcfIqpjvNGE9QU3WkhCV0FuxrZeRdtYMzhVxu75rktlIZFHRNH5pfPK1lcfxIqM QtButtD5IEpy15xW981MsR48nsObu45x2J1svdLDXvy5zEdNzfpjTBHhte1mv6kn7trV 7sRUWHisprwEanqdFu8Cx3lbW63jupIAxn0vf734PNL/Dm1M+p4alstl2CQEp4mLqLcK zAFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=DILcx0XN+dw0ksvQl0KJTB2Yg0wT9YXVcTw8E4WAn00=; b=Epcr66/CcMX5LwqaYLsTVCjxs8LXC1z5jcECpsditLQSiBQ/k0IdonFE1DQPncCqWf hQbV/GSF7mUYmi6eTtsImGGtAH7CdDtFhrqG7IBJGcOC9n6NlvRgt3AXy3nARBY4ynxZ Jjk3bVjIZqdArsFaN7KzJykHTS28NX3tcUis4wQMiD5SFUT1dLiB0wPH1FnYHnCLSYpk WXpTOdC/1V1qeXc4iTd4TSSQIoFeFgcCG+fiqcdEXlrQ4Hc2tapyYEsi5f6pGthqfvU3 H6UsJwgjR+Zz0dLBr9aLIku8LejRDL5oD61b95QCIgM0nDAmV+5ORe5v7IVp9T5p4u52 lGoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=D6KMjWGx; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r22si8477314edi.451.2021.07.04.08.41.16; Sun, 04 Jul 2021 08:41:17 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=D6KMjWGx; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7173968A5D9; Sun, 4 Jul 2021 18:41:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 51F4A68A3B8 for ; Sun, 4 Jul 2021 18:41:02 +0300 (EEST) Received: by mail-qk1-f178.google.com with SMTP id q16so14617888qke.10 for ; Sun, 04 Jul 2021 08:41:02 -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=J3FCAiZUzG6bxm9GfHYs6vOmfWVQJLrQb7/KIcFvuhU=; b=D6KMjWGxzGXX6+l3XI7rFu+B1Kq42It60CX5qpns4O3XwE6Udo8ZRPNkfuLHiGZSSR t05xVfyGsaEwUkAu2pOcKWEHssTW0m1wR3nnzkO78kE+L/CD5Z8/foXaSjy0dv9Ek3NK amIC7bpSA4cx8gn6DG9lMs3CJZ66vwRoQjS9gFf1SL1IdvkI+ShS9EOiNUfXVO8H7rxG aQdS/cb463E87hdFgi9BvPaFT8kEzCj9GAGmQpxt5jNlHGGAalDLnigfj7xZMMLM+PCA UB56oZ8j1SMvZkeZ1eerhdOTJE2S4sOoBmR2wzDfZVhXiyYdnx5pw/2FmaF1vP9rJcWu zeTg== 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=J3FCAiZUzG6bxm9GfHYs6vOmfWVQJLrQb7/KIcFvuhU=; b=I1l1W9/hQQlYa0zR9FBYn9WkKsNrzsGA8gGYVFFnafhfuWMBy6PX2Z6YtgkpuXXipB VzTpk4fLYSmCOAONQDEJBDCNJTQm3NmMgEDbBXhy4vEOE/dkF2AbhWTTfEFWVxcqjB4f wh8ynAa0iYop4Za0GShW3e9yvkBPTyNADbW7baMYQGZSRcpEGBJvxtsYB9zqVCWWumgm mNfpwc01qRTfxA+KZmY88dCV//FQPJLos5V5V4KVO7muHpzT4f/sjEvCZmWUhaY9M0rK 31bCkhwL6oN4yx2B4LOPtFGIEDJ7l4V9hQcwE/osa4sbf/k3sDmVX+ypHKTbZQRVeZk8 LS+w== X-Gm-Message-State: AOAM533u/vAm2tAHFcR7pzy62Uk6jHQ+xrMDRTFM0GTftBI1Fmz25Yet f2QhYzDRs21swgo6zm82/bfcUVFqR1M= X-Received: by 2002:a37:8345:: with SMTP id f66mr9735293qkd.396.1625413260898; Sun, 04 Jul 2021 08:41:00 -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 s13sm4215304qkm.87.2021.07.04.08.41.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Jul 2021 08:41:00 -0700 (PDT) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Sun, 4 Jul 2021 11:40:26 -0400 Message-Id: <20210704154027.13380-2-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210704154027.13380-1-andriy.gelman@gmail.com> References: <20210704154027.13380-1-andriy.gelman@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/3] avformat/rtsp: Reindent after previous commit X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: rdvtkSX7oahE From: Andriy Gelman Signed-off-by: Andriy Gelman --- libavformat/rtsp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 0185baca8e..bedb75c7bd 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1458,9 +1458,9 @@ int ff_rtsp_make_setup_request(AVFormatContext *s, const char *host, int port, * port range, to allow for a number of ports to try even if the offset * happens to be at the end of the random range. */ if (rt->rtp_port_max - rt->rtp_port_min >= 4) { - port_off = av_get_random_seed() % ((rt->rtp_port_max - rt->rtp_port_min)/2); - /* even random offset */ - port_off -= port_off & 0x01; + port_off = av_get_random_seed() % ((rt->rtp_port_max - rt->rtp_port_min)/2); + /* even random offset */ + port_off -= port_off & 0x01; } for (j = rt->rtp_port_min + port_off, i = 0; i < rt->nb_rtsp_streams; ++i) { From patchwork Sun Jul 4 15:40:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 28756 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3387140ios; Sun, 4 Jul 2021 08:41:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwRGyxjRQvVQ+mQtkYDwxwt8yE2+/cbxZ0BdgTAobZ8eBPF41syl9vbUQoRQhxqqNppz3ct X-Received: by 2002:a17:906:bb0e:: with SMTP id jz14mr9121974ejb.285.1625413286616; Sun, 04 Jul 2021 08:41:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625413286; cv=none; d=google.com; s=arc-20160816; b=qV+UMusoUh6kx7Yyzkb388sMxaLJrF8z5mdJ1bcnxo4Pr45lLsgFJ2hZVmc1YLom84 UkuBQy0DssB0fb9q9W3pp7t26pcB6sZviZdu4/N69Pa7xid9CcXvWQ27odBnwpIcOInC bwSnxh5yruwDmWvDZm+W5LVqN9GJAVoZN8j51SNxXwRdkLhlvTQ2I4KACWqRYDrhmOeB SIbQc3TdU+GGMI2r5YN8PsXWTmTNH0u4PLRu5uTuXO0ZLhock2TinRbhqZamHIwP7Kmu 61N/fVUAJqZ1+7Q1yJCJlrX1HAcPJmmsSFO0JRWNOze7FTtHn2Ckug/ekToXyax5XSG3 u9WQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=UP/jWH79oKayXBuVuy9+y3qwQT2f49ixE/iqEuS5Sg4=; b=oBIuwMmoGpEJdgHUu0PSEHwuJf7x9EJT9dufB+5uxpCylrI1jsnpY6Tr5vFHqNvshc 5KmvGJMKeW/kU+JwlHmf+2EJbD3PNaGU16PUhV1J2wSVQ/ZxRMvBRGa56UH7eirieFW6 Q0IpZ/lb2gAhT+HlWqdlvxjjU48nvTXu0czUmB3HkfVLkTttwj9eNucppo+LbM9fc+26 AOlSpswyNPia4suYJ6ZeO8kMyuoqyandTrNBaNzvlPlYkDeodObbTgCieV8i47yvJtqC fcdndv/MlkfYazLyfrUcmR9ZKTUN8Pz5TXvlmE2IqRLLUqDkL471zNMKpCYhOYGN0+TG RsYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=uAebWqr1; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u12si8879431edq.493.2021.07.04.08.41.26; Sun, 04 Jul 2021 08:41:26 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=uAebWqr1; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 83E0D68A5E4; Sun, 4 Jul 2021 18:41:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f181.google.com (mail-qt1-f181.google.com [209.85.160.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E2FC768A5CC for ; Sun, 4 Jul 2021 18:41:04 +0300 (EEST) Received: by mail-qt1-f181.google.com with SMTP id w22so4602568qtj.8 for ; Sun, 04 Jul 2021 08:41:04 -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=wGhtDIpDHIRLrTJ2witXc672TBgfiJDb2jx4BcS6kwI=; b=uAebWqr1cOihIMlWeoX9NynLNrTwF4+2xQqLk36q0Gtg3Vn0EJcyIUtOI2L4QAR4ud dvhIi6HDGHBICPeH47WUAII12VIdc4wHR6RP1JPkGyZUKZc8Fn3YAMB9yguIVAS2NAAO hYvmZxVEJ0eQXe92a9oYkfTmevUOFv5jQSzD8AAsg54XPkrfhmMenwSGYR8l4WK+iNbm agxjWuuPT65Agu7C4gpMxnlVR0lihrkrJW8YzTAyahHuJTE96xARK5ffIZwlMoYTiX3u vMfUjlETszVn4HppON57qTqDmnl9rN6euz49Zz/hP9SNenNBh71+RkB6pN+jsXQWzXfB XeJw== 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=wGhtDIpDHIRLrTJ2witXc672TBgfiJDb2jx4BcS6kwI=; b=GZhNgn6bXeSLFAMqdQ9Ael8VOtkdw1AI4P07vci0YsPflbMfljPNBMxIjKjelOWYtm 0TSDdnnpYlsNnalB8EgWGQdYFIi1dCcLU+SfjFSXEcrAm/Q4MJyQxO/m0BaLsEPcXUAB +F8E9uw8Ob9x0nMMqaYH/wkR/NRzzV5MRuRryrlRVWz5g6TXz4wunxEM7EJ2vEjzQkNN ivs7EI3VLFVqbrcfEL5DsvcxWF+FhUBkO0WZm2Jv+Q7IAK59VP8FzXVVxPkVhSHFneIe UoDq6hwHEtoyXG00c5pc3G1+Fw5LVh5EV9r0DoNFUZexn5mefu8MwnK3MwoAfEi7HJ22 rvaw== X-Gm-Message-State: AOAM532LfUccP6GQ8iEh7Eedsa4GONrGrpecLuOXSqdudeBJ0m8itkDO rWCl1qJPtYgImzoIJmlf9+k8oEt8gmQ= X-Received: by 2002:ac8:67d5:: with SMTP id r21mr8890210qtp.92.1625413263716; Sun, 04 Jul 2021 08:41:03 -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 s13sm4215304qkm.87.2021.07.04.08.41.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Jul 2021 08:41:03 -0700 (PDT) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Sun, 4 Jul 2021 11:40:27 -0400 Message-Id: <20210704154027.13380-3-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210704154027.13380-1-andriy.gelman@gmail.com> References: <20210704154027.13380-1-andriy.gelman@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/3] avformat/rtsp: Include rtcp in port range check X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: anMkx5Ml5a8X From: Andriy Gelman Currently it is only checked that the rtp port does not exceed rtp_port_max. Signed-off-by: Andriy Gelman --- libavformat/rtsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index bedb75c7bd..a3026f8b73 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1500,7 +1500,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,