From patchwork Tue Oct 2 23:47:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 10554 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:ab0:73d2:0:0:0:0:0 with SMTP id m18csp3523012uaq; Tue, 2 Oct 2018 16:47:39 -0700 (PDT) X-Google-Smtp-Source: ACcGV61v+fZc9iU/jZRIqhP2A5sUdg5L+rGTA3xSZ0OQ9+vo5Mywwldm4Xsyidy+2/Cu5b/oM3vf X-Received: by 2002:adf:c187:: with SMTP id x7-v6mr4418755wre.233.1538524059011; Tue, 02 Oct 2018 16:47:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538524058; cv=none; d=google.com; s=arc-20160816; b=Oia4ieAE1DKakmFsLhNYW4UoetMEjLb3OyNpMCiHiSYi54CoxiFD10oyJTNfhU5c8K L1KxF0f+bAZW3SNjryIcvcNFQONpocCV2IjFo4u1UkFgl2/adlPc/4GKzp+k4aD8onmG qOV0E+NjLzuD8vbalvlmu0XhHMaqgkrNQrLUnwqJQW/7XdIDOxouH93axSP2a4qhNO2M OQLxdHjm5yZZbcgJU9COqv3YdKzoj35mooqhwkDpc1aI1G+O4nFEwZjl+ZoESsKZPWyD zqircwF8Gy0nNUp5QPssse2wSUR652PWH52H0H07v/BtT307mk+em2RNKhWmu9SE7UhN 1hSA== 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=A2JsSVhO/HUrtxLVVsiogH9xPH5WFiN9pD/vjV4EEPE=; b=vKtsPPX/2VIq+YKEfLiBp70JtMEST3friq2LgfdaiYIxggAuALofDrNcAezasFN9+U /ppXghSasE7+4jGAkGeuzr+13+51dNSjeKcX11jgpDBDOSDFKg9m5VxxuwvaL6T62kse bH7ceBKyFNZTBJGdhDQTAH57tj1IJwq5gdHsv/9gqF3dqM9BVbBQ6kLsK83EvJPu8MuU DCNij0wBSh1D9Y6lH5h8j9nPYtDq4azzyndrpwYw6vmOomeNYstFh+dLwRE4l6POWHCR RR+/utuVJPQn1F5P4ZKOEK3BnIqWQUTCDG0kGthUyiznXxUwxzZGIk8chvMCrtSS2D8t iwfQ== 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 f10-v6si10970928wro.14.2018.10.02.16.47.37; Tue, 02 Oct 2018 16:47:38 -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 7310668A054; Wed, 3 Oct 2018 02:47:16 +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 21DC56899A1 for ; Wed, 3 Oct 2018 02:47:10 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 99C97E1589; Wed, 3 Oct 2018 01:47:28 +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 Aeb0OnxrzRR9; Wed, 3 Oct 2018 01:47:27 +0200 (CEST) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 9E723E1580; Wed, 3 Oct 2018 01:47:27 +0200 (CEST) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Wed, 3 Oct 2018 01:47:20 +0200 Message-Id: <20181002234720.12833-1-cus@passwd.hu> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180922215328.18053-4-cus@passwd.hu> References: <20180922215328.18053-4-cus@passwd.hu> Subject: [FFmpeg-devel] [PATCHv2 4/7] 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. v2: fixed addrlen value when calling recvfrom. 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 427128c431..8d0f7f1519 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 = sizeof(addr); 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 = sizeof(addr); #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)