[FFmpeg-devel] 答复: [PATCH] workaround for IOS9 getaddrinfo in IPv6 only network use hardcode IPv4 address can not resolve port number.

[liu jc]

 Did you mean empty line?


________________________________
发件人: Nicolas George <george at nsup.org>
发送时间: 2016年8月24日 10:01
收件人: FFmpeg development discussions and patches
抄送: liu jc
主题: Re: [FFmpeg-devel] [PATCH] workaround for IOS9 getaddrinfo in IPv6 only network use hardcode IPv4 address can not resolve port number.

L'octidi 8 fructidor, an CCXXIV, liu jc a écrit :
> Signed-off-by: liujingchao <jcliu at outlook.com>
> ---
>  libavformat/tcp.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
>  mode change 100644 => 100755 libavformat/tcp.c
>
> diff --git a/libavformat/tcp.c b/libavformat/tcp.c
> old mode 100644
> new mode 100755
> index c105479..9f7112d
> --- a/libavformat/tcp.c
> +++ b/libavformat/tcp.c
> @@ -122,6 +122,14 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
>      cur_ai = ai;
>
>   restart:
> +    //workaround for IOS9 getaddrinfo in IPv6 only network use hardcode IPv4 address can not resolve port number.
> +    if (cur_ai->ai_family == AF_INET6){
> +        struct sockaddr_in6 * sockaddr_v6 = (struct sockaddr_in6 *)cur_ai->ai_addr;
> +        if (sockaddr_v6->sin6_port == 0){
> +            sockaddr_v6->sin6_port = htons(port);
> +        }
> +    }
> +
>      fd = ff_socket(cur_ai->ai_family,
>                     cur_ai->ai_socktype,
>                     cur_ai->ai_protocol);

Please address all the comments in the previous reviews in a single patch.