Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
* [FFmpeg-devel] [PATCH v3 2/3] avformat/whip: add whip_flags ignore_ipv6 to skip IPv6 candidates
@ 2025-06-13  8:56 Jack Lau via ffmpeg-devel
  2025-06-27 14:03 ` Marvin Scholz
  0 siblings, 1 reply; 3+ messages in thread
From: Jack Lau via ffmpeg-devel @ 2025-06-13  8:56 UTC (permalink / raw)
  To: ffmpeg-devel; +Cc: Jack Lau

[-- Attachment #1: Type: message/rfc822, Size: 5334 bytes --]

From: Jack Lau <jacklau1222@qq.com>
To: ffmpeg-devel@ffmpeg.org
Cc: Jack Lau <jacklau1222@qq.com>
Subject: [PATCH v3 2/3] avformat/whip: add whip_flags ignore_ipv6 to skip IPv6 candidates
Date: Fri, 13 Jun 2025 16:56:15 +0800
Message-ID: <tencent_C4EA8474E46F76830F638C094A51CBFFE505@qq.com>

mark this ignore_ipv6 flag could ignore any ipv6 ICE candidate,
preventing “No route to host” errors on devices without IPv6 connectivity.

Signed-off-by: Jack Lau <jacklau1222@qq.com>
---
 libavformat/whip.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/libavformat/whip.c b/libavformat/whip.c
index a6827d3478..84c2092e5e 100644
--- a/libavformat/whip.c
+++ b/libavformat/whip.c
@@ -193,9 +193,14 @@ enum WHIPState {
     WHIP_STATE_FAILED,
 };
 
+typedef enum WHIPFlags {
+    WHIP_FLAG_IGNORE_IPV6  = (1 << 0) // Ignore ipv6 candidate
+} WHIPFlags;
+
 typedef struct WHIPContext {
     AVClass *av_class;
 
+    uint32_t flags;        // enum WHIPFlags
     /* The state of the RTC connection. */
     enum WHIPState state;
     /* The callback return value for DTLS. */
@@ -871,6 +876,7 @@ static int parse_answer(AVFormatContext *s)
             if (ptr && av_stristr(ptr, "host")) {
                 char protocol[17], host[129];
                 int priority, port;
+                struct in6_addr addr6;
                 ret = sscanf(ptr, "%16s %d %128s %d typ host", protocol, &priority, host, &port);
                 if (ret != 4) {
                     av_log(whip, AV_LOG_ERROR, "WHIP: Failed %d to parse line %d %s from %s\n",
@@ -879,6 +885,11 @@ static int parse_answer(AVFormatContext *s)
                     goto end;
                 }
 
+                if (whip->flags & WHIP_FLAG_IGNORE_IPV6 && inet_pton(AF_INET6, host, &addr6) == 1) {
+                    av_log(whip, AV_LOG_DEBUG, "WHIP: Ignore ipv6 %s, line %d %s \n", host, i, line);
+                    continue;
+                }
+
                 if (av_strcasecmp(protocol, "udp")) {
                     av_log(whip, AV_LOG_ERROR, "WHIP: Protocol %s is not supported by RTC, choose udp, line %d %s of %s\n",
                         protocol, i, line, whip->sdp_answer);
@@ -1892,6 +1903,8 @@ static const AVOption options[] = {
     { "authorization",      "The optional Bearer token for WHIP Authorization",         OFFSET(authorization),      AV_OPT_TYPE_STRING, { .str = NULL },     0,       0, ENC },
     { "cert_file",          "The optional certificate file path for DTLS",              OFFSET(cert_file),          AV_OPT_TYPE_STRING, { .str = NULL },     0,       0, ENC },
     { "key_file",           "The optional private key file path for DTLS",              OFFSET(key_file),      AV_OPT_TYPE_STRING, { .str = NULL },     0,       0, ENC },
+    { "whip_flags",         "Set flags affecting WHIP connection behavior",             OFFSET(flags),              AV_OPT_TYPE_FLAGS,  { .i64 = 0 },        0, UINT_MAX, ENC, .unit = "flags" },
+    { "ignore_ipv6",        "The optional ignore any IPv6 ICE candidate", 0, AV_OPT_TYPE_CONST,  { .i64 = WHIP_FLAG_IGNORE_IPV6 }, 0, UINT_MAX, ENC, .unit = "flags" },
     { NULL },
 };
 
-- 
2.49.0


[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
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".

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [FFmpeg-devel] [PATCH v3 2/3] avformat/whip: add whip_flags ignore_ipv6 to skip IPv6 candidates
  2025-06-13  8:56 [FFmpeg-devel] [PATCH v3 2/3] avformat/whip: add whip_flags ignore_ipv6 to skip IPv6 candidates Jack Lau via ffmpeg-devel
@ 2025-06-27 14:03 ` Marvin Scholz
  2025-06-28  2:20   ` Jack Lau
  0 siblings, 1 reply; 3+ messages in thread
From: Marvin Scholz @ 2025-06-27 14:03 UTC (permalink / raw)
  To: FFmpeg development discussions and patches

On 13 Jun 2025, at 10:56, Jack Lau via ffmpeg-devel wrote:

> mark this ignore_ipv6 flag could ignore any ipv6 ICE candidate,
> preventing “No route to host” errors on devices without IPv6 connectivity.
>
> Signed-off-by: Jack Lau <jacklau1222@qq.com>
> ---
>  libavformat/whip.c | 13 +++++++++++++
>  1 file changed, 13 insertions(+)
>
> diff --git a/libavformat/whip.c b/libavformat/whip.c
> index a6827d3478..84c2092e5e 100644
> --- a/libavformat/whip.c
> +++ b/libavformat/whip.c
> @@ -193,9 +193,14 @@ enum WHIPState {
>      WHIP_STATE_FAILED,
>  };
>
> +typedef enum WHIPFlags {
> +    WHIP_FLAG_IGNORE_IPV6  = (1 << 0) // Ignore ipv6 candidate
> +} WHIPFlags;
> +
>  typedef struct WHIPContext {
>      AVClass *av_class;
>
> +    uint32_t flags;        // enum WHIPFlags
>      /* The state of the RTC connection. */
>      enum WHIPState state;
>      /* The callback return value for DTLS. */
> @@ -871,6 +876,7 @@ static int parse_answer(AVFormatContext *s)
>              if (ptr && av_stristr(ptr, "host")) {
>                  char protocol[17], host[129];
>                  int priority, port;
> +                struct in6_addr addr6;
>                  ret = sscanf(ptr, "%16s %d %128s %d typ host", protocol, &priority, host, &port);
>                  if (ret != 4) {
>                      av_log(whip, AV_LOG_ERROR, "WHIP: Failed %d to parse line %d %s from %s\n",
> @@ -879,6 +885,11 @@ static int parse_answer(AVFormatContext *s)
>                      goto end;
>                  }
>
> +                if (whip->flags & WHIP_FLAG_IGNORE_IPV6 && inet_pton(AF_INET6, host, &addr6) == 1) {
> +                    av_log(whip, AV_LOG_DEBUG, "WHIP: Ignore ipv6 %s, line %d %s \n", host, i, line);

Nit: "Ignoring IPv6"
Also why the WHIP prefix? Your log context would already add the whip demux name to the message, no?

> +                    continue;
> +                }
> +
>                  if (av_strcasecmp(protocol, "udp")) {
>                      av_log(whip, AV_LOG_ERROR, "WHIP: Protocol %s is not supported by RTC, choose udp, line %d %s of %s\n",
>                          protocol, i, line, whip->sdp_answer);
> @@ -1892,6 +1903,8 @@ static const AVOption options[] = {
>      { "authorization",      "The optional Bearer token for WHIP Authorization",         OFFSET(authorization),      AV_OPT_TYPE_STRING, { .str = NULL },     0,       0, ENC },
>      { "cert_file",          "The optional certificate file path for DTLS",              OFFSET(cert_file),          AV_OPT_TYPE_STRING, { .str = NULL },     0,       0, ENC },
>      { "key_file",           "The optional private key file path for DTLS",              OFFSET(key_file),      AV_OPT_TYPE_STRING, { .str = NULL },     0,       0, ENC },
> +    { "whip_flags",         "Set flags affecting WHIP connection behavior",             OFFSET(flags),              AV_OPT_TYPE_FLAGS,  { .i64 = 0 },        0, UINT_MAX, ENC, .unit = "flags" },
> +    { "ignore_ipv6",        "The optional ignore any IPv6 ICE candidate", 0, AV_OPT_TYPE_CONST,  { .i64 = WHIP_FLAG_IGNORE_IPV6 }, 0, UINT_MAX, ENC, .unit = "flags" },

Nit: The description grammar is a bit confusing, maybe just: "Ignore any IPv6 ICE candidates".

>      { NULL },
>  };

> _______________________________________________
> 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".

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [FFmpeg-devel] [PATCH v3 2/3] avformat/whip: add whip_flags ignore_ipv6 to skip IPv6 candidates
  2025-06-27 14:03 ` Marvin Scholz
@ 2025-06-28  2:20   ` Jack Lau
  0 siblings, 0 replies; 3+ messages in thread
From: Jack Lau @ 2025-06-28  2:20 UTC (permalink / raw)
  To: FFmpeg development discussions and patches



> On Jun 27, 2025, at 22:03, Marvin Scholz <epirat07-at-gmail.com@ffmpeg.org> wrote:
> 
> On 13 Jun 2025, at 10:56, Jack Lau via ffmpeg-devel wrote:
> 
>> mark this ignore_ipv6 flag could ignore any ipv6 ICE candidate,
>> preventing “No route to host” errors on devices without IPv6 connectivity.
>> 
>> Signed-off-by: Jack Lau <jacklau1222@qq.com>
>> ---
>> libavformat/whip.c | 13 +++++++++++++
>> 1 file changed, 13 insertions(+)
>> 
>> diff --git a/libavformat/whip.c b/libavformat/whip.c
>> index a6827d3478..84c2092e5e 100644
>> --- a/libavformat/whip.c
>> +++ b/libavformat/whip.c
>> @@ -193,9 +193,14 @@ enum WHIPState {
>>     WHIP_STATE_FAILED,
>> };
>> 
>> +typedef enum WHIPFlags {
>> +    WHIP_FLAG_IGNORE_IPV6  = (1 << 0) // Ignore ipv6 candidate
>> +} WHIPFlags;
>> +
>> typedef struct WHIPContext {
>>     AVClass *av_class;
>> 
>> +    uint32_t flags;        // enum WHIPFlags
>>     /* The state of the RTC connection. */
>>     enum WHIPState state;
>>     /* The callback return value for DTLS. */
>> @@ -871,6 +876,7 @@ static int parse_answer(AVFormatContext *s)
>>             if (ptr && av_stristr(ptr, "host")) {
>>                 char protocol[17], host[129];
>>                 int priority, port;
>> +                struct in6_addr addr6;
>>                 ret = sscanf(ptr, "%16s %d %128s %d typ host", protocol, &priority, host, &port);
>>                 if (ret != 4) {
>>                     av_log(whip, AV_LOG_ERROR, "WHIP: Failed %d to parse line %d %s from %s\n",
>> @@ -879,6 +885,11 @@ static int parse_answer(AVFormatContext *s)
>>                     goto end;
>>                 }
>> 
>> +                if (whip->flags & WHIP_FLAG_IGNORE_IPV6 && inet_pton(AF_INET6, host, &addr6) == 1) {
>> +                    av_log(whip, AV_LOG_DEBUG, "WHIP: Ignore ipv6 %s, line %d %s \n", host, i, line);
> 
> Nit: "Ignoring IPv6"
> Also why the WHIP prefix? Your log context would already add the whip demux name to the message, no?
> 
>> +                    continue;
>> +                }
>> +
>>                 if (av_strcasecmp(protocol, "udp")) {
>>                     av_log(whip, AV_LOG_ERROR, "WHIP: Protocol %s is not supported by RTC, choose udp, line %d %s of %s\n",
>>                         protocol, i, line, whip->sdp_answer);
>> @@ -1892,6 +1903,8 @@ static const AVOption options[] = {
>>     { "authorization",      "The optional Bearer token for WHIP Authorization",         OFFSET(authorization),      AV_OPT_TYPE_STRING, { .str = NULL },     0,       0, ENC },
>>     { "cert_file",          "The optional certificate file path for DTLS",              OFFSET(cert_file),          AV_OPT_TYPE_STRING, { .str = NULL },     0,       0, ENC },
>>     { "key_file",           "The optional private key file path for DTLS",              OFFSET(key_file),      AV_OPT_TYPE_STRING, { .str = NULL },     0,       0, ENC },
>> +    { "whip_flags",         "Set flags affecting WHIP connection behavior",             OFFSET(flags),              AV_OPT_TYPE_FLAGS,  { .i64 = 0 },        0, UINT_MAX, ENC, .unit = "flags" },
>> +    { "ignore_ipv6",        "The optional ignore any IPv6 ICE candidate", 0, AV_OPT_TYPE_CONST,  { .i64 = WHIP_FLAG_IGNORE_IPV6 }, 0, UINT_MAX, ENC, .unit = "flags" },
> 
> Nit: The description grammar is a bit confusing, maybe just: "Ignore any IPv6 ICE candidates".
I totally agree with your ideas, I’ve already send the v4 patchset https://patchwork.ffmpeg.org/project/ffmpeg/list/?series=14867

Thanks for your reviews!
Jack
> 
>>     { NULL },
>> };
> 
>> _______________________________________________
>> 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".

_______________________________________________
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".

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2025-06-28  2:20 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-06-13  8:56 [FFmpeg-devel] [PATCH v3 2/3] avformat/whip: add whip_flags ignore_ipv6 to skip IPv6 candidates Jack Lau via ffmpeg-devel
2025-06-27 14:03 ` Marvin Scholz
2025-06-28  2:20   ` Jack Lau

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git