[FFmpeg-devel] [PATCH v2 1/2] avformat/whip: add whip_flags ignore_ipv6 to skip IPv6 candidates

[Steven Liu]

Jack Lau via ffmpeg-devel <ffmpeg-devel at ffmpeg.org> 于2025年6月13日周五 13:05写道：
>
>
>
>
> ---------- Forwarded message ----------
> From: Jack Lau <jacklau1222 at qq.com>
> To: ffmpeg-devel at ffmpeg.org
> Cc: Jack Lau <jacklau1222 at qq.com>
> Bcc:
> Date: Fri, 13 Jun 2025 13:03:35 +0800
> Subject: [PATCH v2 1/2] avformat/whip: add whip_flags ignore_ipv6 to skip IPv6 candidates
> replace AV_OPT_FLAG_DECODING_PARAM to ENCODING
>
> 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 at qq.com>
> ---
>  libavformat/whip.c | 25 +++++++++++++++++++------
>  1 file changed, 19 insertions(+), 6 deletions(-)
>
> diff --git a/libavformat/whip.c b/libavformat/whip.c
> index 710f24fc5a..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);
> @@ -1885,13 +1896,15 @@ static int whip_check_bitstream(AVFormatContext *s, AVStream *st, const AVPacket
>  }
>
>  #define OFFSET(x) offsetof(WHIPContext, x)
> -#define DEC AV_OPT_FLAG_DECODING_PARAM
> +#define ENC AV_OPT_FLAG_ENCODING_PARAM
>  static const AVOption options[] = {
> -    { "handshake_timeout",  "Timeout in milliseconds for ICE and DTLS handshake.",      OFFSET(handshake_timeout),  AV_OPT_TYPE_INT,    { .i64 = 5000 },    -1, INT_MAX, DEC },
> -    { "pkt_size",           "The maximum size, in bytes, of RTP packets that send out", OFFSET(pkt_size),           AV_OPT_TYPE_INT,    { .i64 = 1200 },    -1, INT_MAX, DEC },
> -    { "authorization",      "The optional Bearer token for WHIP Authorization",         OFFSET(authorization),      AV_OPT_TYPE_STRING, { .str = NULL },     0,       0, DEC },
> -    { "cert_file",          "The optional certificate file path for DTLS",              OFFSET(cert_file),          AV_OPT_TYPE_STRING, { .str = NULL },     0,       0, DEC },
> -    { "key_file",           "The optional private key file path for DTLS",              OFFSET(key_file),      AV_OPT_TYPE_STRING, { .str = NULL },     0,       0, DEC },
> +    { "handshake_timeout",  "Timeout in milliseconds for ICE and DTLS handshake.",      OFFSET(handshake_timeout),  AV_OPT_TYPE_INT,    { .i64 = 5000 },    -1, INT_MAX, ENC },
> +    { "pkt_size",           "The maximum size, in bytes, of RTP packets that send out", OFFSET(pkt_size),           AV_OPT_TYPE_INT,    { .i64 = 1200 },    -1, INT_MAX, ENC },
> +    { "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 },
Not sure this should be sperate two patch?
otherwise this patch looks ok to me.
> +    { "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
>
>
>
>
> ---------- Forwarded message ----------
> From: Jack Lau via ffmpeg-devel <ffmpeg-devel at ffmpeg.org>
> To: ffmpeg-devel at ffmpeg.org
> Cc: Jack Lau <jacklau1222 at qq.com>
> Bcc:
> Date: Fri, 13 Jun 2025 13:03:35 +0800
> Subject: [FFmpeg-devel] [PATCH v2 1/2] avformat/whip: add whip_flags ignore_ipv6 to skip IPv6 candidates
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".