From patchwork Thu Sep 20 22:12:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 10423 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp54662jap; Thu, 20 Sep 2018 15:12:42 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZfdWrwRnvjEDmml5VjcI2JygFOJ1GTLO/eON8g2ju2vj1sCt1Q7FO9YQ+AavXXiLrfgsOC X-Received: by 2002:adf:e44e:: with SMTP id t14-v6mr34607039wrm.96.1537481562434; Thu, 20 Sep 2018 15:12:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537481562; cv=none; d=google.com; s=arc-20160816; b=XnmfoHF3uizne/Ix4DRhTOTYRtAr9f9gfnYgYT1VG5akWZjeAKnVBvfdISonUW+eza 6Sk9atl9MG74PqMfzkZwHYWy38qIWfx1ZbBZ0xunKQ+KUZow9cwO6iiTFr/7Of4oAmj/ 1sOyMeL97+iV8Ji8iINeICqSS1+HG/0Nm9AIdtzvxWBpnVN/eebcJVBwcmmN7paOKzF0 w9Ee7c4ZLgcmPgpN8HNOcWoIRJ4ZPWvxaaeTmZDpZdGN90eUgL4BByt0qqzb4W+sbnkC D1Vq0MG3InRc2J+rZSMLJ758fk6qnreb6pZIMlk+Eyq4iI3BoTSRHtVBtg8WAprkCM4o +ghw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=iUON9hA385jAXEv2Jza6GGTd7Nu3N1iVl1Pvj40lDOg=; b=W1NcyhHOLbLYTxwyCGBdlnUwibBnb/SOlhoairS+5mikohHfu4V74zVRavbT2ySwEh 8PPRRhovSWroQBoHB+B2cseTXASeLn/69ZrxMZMt7aALuSWItkdfG3dCWna5DmcoLY2L US/P9vQrzr5tOzYKOydrM+LV2p66l5rwajb9jBq3PpXZVit502gGDa6XGkLVYRzftzaz P09Ky8uymW5gyX5kaNYxV1YOD8+fsZ0u7RNjzXM/KY3DXiMD04UIO+RaJOTMlv/m993D qh83BLTmTTtCS6/LhGzejnHhAFWAhStfe6WKK/whf/bwlxGZNg6GyGahpGGxKl0HpWF1 AAgA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 188-v6si3547174wmm.111.2018.09.20.15.12.42; Thu, 20 Sep 2018 15:12:42 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 40CA868A6D3; Fri, 21 Sep 2018 01:12:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7613568A6B5 for ; Fri, 21 Sep 2018 01:12:04 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 90BABE11ED; Fri, 21 Sep 2018 00:12:18 +0200 (CEST) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id P2t3_6vSkY3B; Fri, 21 Sep 2018 00:12:17 +0200 (CEST) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id A672DE08BE; Fri, 21 Sep 2018 00:12:17 +0200 (CEST) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 Sep 2018 00:12:02 +0200 Message-Id: <20180920221202.1876-4-cus@passwd.hu> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180920221202.1876-1-cus@passwd.hu> References: <20180920221202.1876-1-cus@passwd.hu> Subject: [FFmpeg-devel] [PATCH 4/4] avformat/udp: add support for generic source filtering 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: Marton Balint MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This allows getting data only from a specific source IP. This is useful not only for unicast but for multicast as well because multicast source subscriptions do not act as source filters for the incoming packets. Signed-off-by: Marton Balint --- doc/protocols.texi | 8 ++++---- libavformat/udp.c | 17 +++++++++++++---- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/doc/protocols.texi b/doc/protocols.texi index fad6c44c24..7173bb173a 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -1569,12 +1569,12 @@ For receiving, this gives the benefit of only receiving packets from the specified peer address/port. @item sources=@var{address}[,@var{address}] -Only receive packets sent to the multicast group from one of the -specified sender IP addresses. +Only receive packets sent from the specified addresses. In case of multicast, +also subscribe to multicast traffic coming from these addresses only. @item block=@var{address}[,@var{address}] -Ignore packets sent to the multicast group from the specified -sender IP addresses. +Ignore packets sent from the specified addresses. In case of multicast, also +exclude the source addresses in the multicast subscription. @item fifo_size=@var{units} Set the UDP receiving circular buffer size, expressed as a number of diff --git a/libavformat/udp.c b/libavformat/udp.c index 3c413a2a05..2c82769b90 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -458,13 +458,15 @@ static void *circular_buffer_task_rx( void *_URLContext) } while(1) { int len; + struct sockaddr_storage addr; + socklen_t addr_len; pthread_mutex_unlock(&s->mutex); /* Blocking operations are always cancellation points; see "General Information" / "Thread Cancelation Overview" in Single Unix. */ pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &old_cancelstate); - len = recv(s->udp_fd, s->tmp+4, sizeof(s->tmp)-4, 0); + len = recvfrom(s->udp_fd, s->tmp+4, sizeof(s->tmp)-4, 0, (struct sockaddr *)&addr, &addr_len); pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_cancelstate); pthread_mutex_lock(&s->mutex); if (len < 0) { @@ -474,6 +476,8 @@ static void *circular_buffer_task_rx( void *_URLContext) } continue; } + if (ff_ip_check_source_lists(&addr, &s->filters)) + continue; AV_WL32(s->tmp, len); if(av_fifo_space(s->fifo) < len + 4) { @@ -926,6 +930,8 @@ static int udp_read(URLContext *h, uint8_t *buf, int size) { UDPContext *s = h->priv_data; int ret; + struct sockaddr_storage addr; + socklen_t addr_len; #if HAVE_PTHREAD_CANCEL int avail, nonblock = h->flags & AVIO_FLAG_NONBLOCK; @@ -976,9 +982,12 @@ static int udp_read(URLContext *h, uint8_t *buf, int size) if (ret < 0) return ret; } - ret = recv(s->udp_fd, buf, size, 0); - - return ret < 0 ? ff_neterrno() : ret; + ret = recvfrom(s->udp_fd, buf, size, 0, (struct sockaddr *)&addr, &addr_len); + if (ret < 0) + return ff_neterrno(); + if (ff_ip_check_source_lists(&addr, &s->filters)) + return AVERROR(EINTR); + return ret; } static int udp_write(URLContext *h, const uint8_t *buf, int size)