Jack Lau <jacklau1222gm-at-gmail....@ffmpeg.org> 于2025年7月2日周三 12:25写道：
>
> 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 <jacklau1...@qq.com>
> ---
> libavformat/whip.c | 13 +++++++++++++
> 1 file changed, 13 insertions(+)
>
> diff --git a/libavformat/whip.c b/libavformat/whip.c
> index 5fdbd6949d..be6ee9c951 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. */
> @@ -879,6 +884,7 @@ static int parse_answer(AVFormatContext *s)
> if (ptr && av_stristr(ptr, "host")) {
> char protocol[17], host[129];
> int priority, port;
#if HAVE_STRUCT_SOCKADDR_IN6
> + struct in6_addr addr6;
#endif
> 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",
> @@ -887,6 +893,11 @@ static int parse_answer(AVFormatContext *s)
> goto end;
> }
>
#if HAVE_STRUCT_SOCKADDR_IN6
> + if (whip->flags & WHIP_FLAG_IGNORE_IPV6 &&
> inet_pton(AF_INET6, host, &addr6) == 1) {
> + av_log(whip, AV_LOG_DEBUG, "Ignoring IPv6 ICE candidates
> %s, line %d %s \n", host, i, line);
> + continue;
> + }
> +
#endif
> 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);
> @@ -1898,6 +1909,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", "(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
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-requ...@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-requ...@ffmpeg.org with subject "unsubscribe".
