Merge commit '8c76bfacf663ff71cee5264a74d0f9c86addd325'

* commit '8c76bfacf663ff71cee5264a74d0f9c86addd325':
  tcp: Use ff_connect_parallel for RFC 8305 style connecting

Merged-by: James Almer <jamrial@gmail.com>

diff --cc libavformat/tcp.c
index 8bff9a38671bd056bb54c5b271868a8dd23505df,7044d44f062d5b8dc2bfd0d21ba325dfea5d5809..ea41f2e9868b0ae2b48ed3caaa538c9f791b2041
--- 1/libavformat/tcp.c
--- 2/libavformat/tcp.c
+++ b/libavformat/tcp.c
@@@ -70,6 -55,6 +70,27 @@@ static const AVClass tcp_class = 
      .version    = LIBAVUTIL_VERSION_INT,
  };
  
++static void customize_fd(void *ctx, int fd)
++{
++    TCPContext *s = ctx;
++    /* Set the socket's send or receive buffer sizes, if specified.
++       If unspecified or setting fails, system default is used. */
++    if (s->recv_buffer_size > 0) {
++        setsockopt (fd, SOL_SOCKET, SO_RCVBUF, &s->recv_buffer_size, sizeof (s->recv_buffer_size));
++    }
++    if (s->send_buffer_size > 0) {
++        setsockopt (fd, SOL_SOCKET, SO_SNDBUF, &s->send_buffer_size, sizeof (s->send_buffer_size));
++    }
++    if (s->tcp_nodelay > 0) {
++        setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &s->tcp_nodelay, sizeof (s->tcp_nodelay));
++    }
++#if !HAVE_WINSOCK2_H
++    if (s->tcp_mss > 0) {
++        setsockopt (fd, IPPROTO_TCP, TCP_MAXSEG, &s->tcp_mss, sizeof (s->tcp_mss));
++    }
++#endif /* !HAVE_WINSOCK2_H */
++}
++
  /* return non zero if error */
  static int tcp_open(URLContext *h, const char *uri, int flags)
  {
@@@ -129,70 -108,28 +150,46 @@@
  
      cur_ai = ai;
  
-  restart:
 -    if (s->listen) {
 +#if HAVE_STRUCT_SOCKADDR_IN6
 +    // 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){
 +            sockaddr_v6->sin6_port = htons(port);
 +        }
 +    }
 +#endif
 +
-     fd = ff_socket(cur_ai->ai_family,
-                    cur_ai->ai_socktype,
-                    cur_ai->ai_protocol);
-     if (fd < 0) {
-         ret = ff_neterrno();
-         goto fail;
-     }
- 
-     /* Set the socket's send or receive buffer sizes, if specified.
-        If unspecified or setting fails, system default is used. */
-     if (s->recv_buffer_size > 0) {
-         if (setsockopt (fd, SOL_SOCKET, SO_RCVBUF, &s->recv_buffer_size, sizeof (s->recv_buffer_size))) {
-             ff_log_net_error(h, AV_LOG_WARNING, "setsockopt(SO_RCVBUF)");
-         }
-     }
-     if (s->send_buffer_size > 0) {
-         if (setsockopt (fd, SOL_SOCKET, SO_SNDBUF, &s->send_buffer_size, sizeof (s->send_buffer_size))) {
-             ff_log_net_error(h, AV_LOG_WARNING, "setsockopt(SO_SNDBUF)");
-         }
-     }
-     if (s->tcp_nodelay > 0) {
-         if (setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &s->tcp_nodelay, sizeof (s->tcp_nodelay))) {
-             ff_log_net_error(h, AV_LOG_WARNING, "setsockopt(TCP_NODELAY)");
-         }
-     }
- #if !HAVE_WINSOCK2_H
-     if (s->tcp_mss > 0) {
-         if (setsockopt (fd, IPPROTO_TCP, TCP_MAXSEG, &s->tcp_mss, sizeof (s->tcp_mss))) {
-             ff_log_net_error(h, AV_LOG_WARNING, "setsockopt(TCP_MAXSEG)");
++    if (s->listen > 0) {
+         while (cur_ai && fd < 0) {
+             fd = ff_socket(cur_ai->ai_family,
+                            cur_ai->ai_socktype,
+                            cur_ai->ai_protocol);
+             if (fd < 0) {
+                 ret = ff_neterrno();
+                 cur_ai = cur_ai->ai_next;
+             }
          }
- #endif /* !HAVE_WINSOCK2_H */
+         if (fd < 0)
+             goto fail1;
++        customize_fd(s, fd);
 +    }
  
 +    if (s->listen == 2) {
 +        // multi-client
 +        if ((ret = ff_listen(fd, cur_ai->ai_addr, cur_ai->ai_addrlen)) < 0)
 +            goto fail1;
 +    } else if (s->listen == 1) {
 +        // single client
          if ((ret = ff_listen_bind(fd, cur_ai->ai_addr, cur_ai->ai_addrlen,
 -                                  s->listen_timeout, h)) < 0) {
 +                                  s->listen_timeout, h)) < 0)
              goto fail1;
 -        }
 +        // Socket descriptor already closed here. Safe to overwrite to client one.
          fd = ret;
      } else {
-         if ((ret = ff_listen_connect(fd, cur_ai->ai_addr, cur_ai->ai_addrlen,
-                                      s->open_timeout / 1000, h, !!cur_ai->ai_next)) < 0) {
- 
-             if (ret == AVERROR_EXIT)
-                 goto fail1;
-             else
-                 goto fail;
-         }
 -        ret = ff_connect_parallel(ai, s->timeout, 3, h, &fd, NULL, NULL);
++        ret = ff_connect_parallel(ai, s->open_timeout / 1000, 3, h, &fd, customize_fd, s);
+         if (ret < 0)
+             goto fail1;
      }
  
      h->is_streamed = 1;