From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 20A434DEC9 for ; Sun, 6 Jul 2025 06:31:18 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 7E3BB690F2A; Sun, 6 Jul 2025 09:31:15 +0300 (EEST) Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id C9997690F26 for ; Sun, 6 Jul 2025 09:31:08 +0300 (EEST) Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-23633a6ac50so28850655ad.2 for ; Sat, 05 Jul 2025 23:31:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751783467; x=1752388267; darn=ffmpeg.org; h=message-id:in-reply-to:to:references:date:subject:mime-version :content-transfer-encoding:from:from:to:cc:subject:date:message-id :reply-to; bh=cMkUFwFcpXW2lijU0in/FwpioESJeovcEm55EnzK0A8=; b=RiJHFe6294U1jCOoEjRYjakUh3nYuL0MIJ3LJxx8+evfJFnlJGZ7MW+rMjMf2zwafU uhuo4vKQ1yUr9o4GAKmCx3EWk1jzJA/cAiFSE6nau/ZnRB+d2ghocuixf/2iBFYhSsQS wfbFvqvMGesCp+QukLFM6AGxsA9yWS6Vs/FS6FNKN0l7whxQGmasfMJm4+YkI0TJGScW ogaCtuiYPSOG9zZVUNi0ZPj2AG6OPWE2yK4XfJedNwuxEQZ3C5mu27csyUjibv1SXfvN YSIUyIzijqe5/i5fL659Pb2udvCHNJvkwxlAxXlDZDvK+IH2eLnQ/labuTQccuJd9EYU K0zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751783467; x=1752388267; h=message-id:in-reply-to:to:references:date:subject:mime-version :content-transfer-encoding:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cMkUFwFcpXW2lijU0in/FwpioESJeovcEm55EnzK0A8=; b=JtZUA8OPHhigy6ag/xx0lmwCGEeRLoq+vDFdmMZvozDAZAqDUpCCH+cXmPoEK2sbj8 nn/gC+7TYyeL4DSrH96r08fRDC3+dBtZtXHRGo1xcLOiOQBjZjfi0DUA5Ec7BsF/wnuQ CW5Y+666sy23fq4nHEqedSNFW0C361j+8kiVUnZApucOWCXkcAPn1grdaTLaj6lUTaYh 1UOxGrbqQ2TfpBMTli1aqtZszLGIME7T82DFWK4c1AluIUyQ1NuxMWWZk/6JLV+Gf+3n N8djwsC3F2fYSt7Bhp9hU0Y0XyOWUq6T9M4RFXgezQhzObWB0jqFutuL5VfIXGMWjnr+ fLeg== X-Gm-Message-State: AOJu0YzZJkmz+0fr9B1GqdISM1kdhrukOUAiJHvmnMVqDNArjb9K5j/9 8D4i/ND3rvipHLrqWIxg+I6FC8fhxppl7T38Oiv9Le6icm8IfNQFFnioXwraWaPuqZg= X-Gm-Gg: ASbGncvl4WqRw3lGVu9lvVGf40SPdu5793McAknEksbsEt89r51Oh1xfHN46BKFVXsE /Z6IMXecslCdpzU04hUumz4JziwTVSaIkNI/RzkQY2UERFovCvbpzJezUXb98Cp+M3Wapf5hJek EXxU4aG/+VixFEaMOYC+n26yQnBTK24KreCJ23ijc7H86aubVBHL+1fARarsqmq9E4Fo/BDkiS9 68kyJuaz4xg5oqp/0RxD5IP50fgMYZKh+F3f3mpPp7W4iEJYJYx8lNfVHjfqfZqAt8rpbpAVX15 aL9cFxAI1Id+PTNPrE4llLmw52hYyJGtlbKzcC26rpWSdpzWTifzAAasIOwCwnA739h5RXiAl+6 ecs6V9bE= X-Google-Smtp-Source: AGHT+IHcI9BEExxl51uep1o/3Ey6iQkGyX+hcYWAyCvAfzx9KcHwu8s7c6FJvBEkKyGOGrfUT/n7sw== X-Received: by 2002:a17:902:db07:b0:23c:77fd:1b84 with SMTP id d9443c01a7336-23c90f370f7mr67711685ad.5.1751783466621; Sat, 05 Jul 2025 23:31:06 -0700 (PDT) Received: from smtpclient.apple ([38.99.248.174]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23c8459899fsm57946235ad.194.2025.07.05.23.31.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 05 Jul 2025 23:31:06 -0700 (PDT) From: Jack Lau Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.600.51.1.1\)) Date: Sun, 6 Jul 2025 14:30:52 +0800 References: <20250702165655.1325-1-timo@rothenpieler.org> <20250702165655.1325-12-timo@rothenpieler.org> To: FFmpeg development discussions and patches In-Reply-To: <20250702165655.1325-12-timo@rothenpieler.org> Message-Id: X-Mailer: Apple Mail (2.3826.600.51.1.1) Subject: Re: [FFmpeg-devel] [PATCH 11/18] avformat/udp: make recv addr of each packet available 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: > On Jul 3, 2025, at 00:56, Timo Rothenpieler wrote: > > --- > libavformat/network.h | 2 ++ > libavformat/udp.c | 25 +++++++++++++++++-------- > 2 files changed, 19 insertions(+), 8 deletions(-) > > diff --git a/libavformat/network.h b/libavformat/network.h > index ca214087fc..48bb75a758 100644 > --- a/libavformat/network.h > +++ b/libavformat/network.h > @@ -338,4 +338,6 @@ int ff_connect_parallel(struct addrinfo *addrs, int timeout_ms_per_address, > int parallel, URLContext *h, int *fd, > int (*customize_fd)(void *, int, int), void *customize_ctx); > > +void ff_udp_get_last_recv_addr(URLContext *h, struct sockaddr_storage *addr); > + > #endif /* AVFORMAT_NETWORK_H */ > diff --git a/libavformat/udp.c b/libavformat/udp.c > index 30f075de8e..7d64ff07ed 100644 > --- a/libavformat/udp.c > +++ b/libavformat/udp.c > @@ -107,7 +107,7 @@ typedef struct UDPContext { > pthread_cond_t cond; > int thread_started; > #endif > - uint8_t tmp[UDP_MAX_PKT_SIZE+4]; > + uint8_t tmp[UDP_MAX_PKT_SIZE + 4 + sizeof(struct sockaddr_storage)]; > int remaining_in_dg; > char *localaddr; > int timeout; > @@ -115,6 +115,7 @@ typedef struct UDPContext { > char *sources; > char *block; > IPSourceFilters filters; > + struct sockaddr_storage last_recv_addr; Should we add socklen_t last_recv_len also? > > } UDPContext; > > #define OFFSET(x) offsetof(UDPContext, x) > @@ -467,6 +468,12 @@ int ff_udp_get_local_port(URLContext *h) > return s->local_port; > } > > +void ff_udp_get_last_recv_addr(URLContext *h, struct sockaddr_storage *addr) > +{ > + UDPContext *s = h->priv_data; > + *addr = s->last_recv_addr; > +} > + > /** > * Return the udp file handle for select() usage to wait for several RTP > * streams at the same time. > @@ -498,13 +505,14 @@ static void *circular_buffer_task_rx( void *_URLContext) > int len; > struct sockaddr_storage addr; > socklen_t addr_len = sizeof(addr); > + const int header_sz = 4 + 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 = recvfrom(s->udp_fd, s->tmp+4, sizeof(s->tmp)-4, 0, (struct sockaddr *)&addr, &addr_len); > + len = recvfrom(s->udp_fd, s->tmp + header_sz, sizeof(s->tmp) - header_sz, 0, (struct sockaddr *)&addr, &addr_len); > pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_cancelstate); > pthread_mutex_lock(&s->mutex); > if (len < 0) { > @@ -517,8 +525,9 @@ static void *circular_buffer_task_rx( void *_URLContext) > if (ff_ip_check_source_lists(&addr, &s->filters)) > continue; > AV_WL32(s->tmp, len); > + memcpy(s->tmp + 4, &addr, sizeof(addr)); > > - if (av_fifo_can_write(s->fifo) < len + 4) { > + if (av_fifo_can_write(s->fifo) < len + header_sz) { > /* No Space left */ > if (s->overrun_nonfatal) { > av_log(h, AV_LOG_WARNING, "Circular buffer overrun. " > @@ -532,7 +541,7 @@ static void *circular_buffer_task_rx( void *_URLContext) > goto end; > } > } > - av_fifo_write(s->fifo, s->tmp, len + 4); > + av_fifo_write(s->fifo, s->tmp, len + header_sz); > pthread_cond_signal(&s->cond); > } > > @@ -991,8 +1000,7 @@ 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); > + socklen_t addr_len = sizeof(s->last_recv_addr); s->last_recv_len = sizeof(s->last_recv_addr); > #if HAVE_PTHREAD_CANCEL > int avail, nonblock = h->flags & AVIO_FLAG_NONBLOCK; > > @@ -1004,6 +1012,7 @@ static int udp_read(URLContext *h, uint8_t *buf, int size) > uint8_t tmp[4]; > > av_fifo_read(s->fifo, tmp, 4); > + av_fifo_read(s->fifo, &s->last_recv_addr, sizeof(s->last_recv_addr)); > avail = AV_RL32(tmp); > if(avail > size){ > av_log(h, AV_LOG_WARNING, "Part of datagram lost due to insufficient buffer size\n"); > @@ -1043,10 +1052,10 @@ static int udp_read(URLContext *h, uint8_t *buf, int size) > if (ret < 0) > return ret; > } > - ret = recvfrom(s->udp_fd, buf, size, 0, (struct sockaddr *)&addr, &addr_len); > + ret = recvfrom(s->udp_fd, buf, size, 0, (struct sockaddr *)&s->last_recv_addr, &addr_len); ret = recvfrom(s->udp_fd, buf, size, 0, (struct sockaddr *)&s->last_recv_addr, &s->last_recv_len); > if (ret < 0) > return ff_neterrno(); > - if (ff_ip_check_source_lists(&addr, &s->filters)) > + if (ff_ip_check_source_lists(&s->last_recv_addr, &s->filters)) > return AVERROR(EINTR); > return ret; > } > -- > 2.49.0 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".