[vlc-devel] commit: Fix spurious "please select network protocol manually" error ( Rémi Denis-Courmont )

[git version control]

vlc | branch: 1.0-bugfix | Rémi Denis-Courmont <remi at remlab.net> | Sun Jul 19 22:00:16 2009 +0300| [10042bf2e1c55b4568b2b1f8b6f3b630455f8d9d] | committer: Rémi Denis-Courmont 

Fix spurious "please select network protocol manually" error

getaddrinfo() may list IPv4 before IPv6 depending on system
configuration.
(cherry picked from commit e5454831242abe2cf65ed4dda8694ac9767d7b35)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=10042bf2e1c55b4568b2b1f8b6f3b630455f8d9d
---

 src/network/udp.c |   37 +++++++++++++++++++++++++++----------
 1 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/network/udp.c b/src/network/udp.c
index f3e6098..2bbf4a1 100644
--- a/src/network/udp.c
+++ b/src/network/udp.c
@@ -164,6 +164,7 @@ static int net_ListenSingle (vlc_object_t *obj, const char *host, int port,
 
     val = -1;
 
+    int fd6 = -1;
     for (const struct addrinfo *ptr = res; ptr != NULL; ptr = ptr->ai_next)
     {
         int fd = net_Socket (obj, ptr->ai_family, ptr->ai_socktype,
@@ -174,18 +175,34 @@ static int net_ListenSingle (vlc_object_t *obj, const char *host, int port,
             continue;
         }
 
-        if (ptr->ai_next != NULL)
-        {
 #ifdef IPV6_V6ONLY
-            if ((ptr->ai_family != AF_INET6)
-             || setsockopt (fd, SOL_IPV6, IPV6_V6ONLY, &(int){ 0 },
-                            sizeof (int)))
-#endif
-            {
-                msg_Err (obj, "Multiple network protocols present");
-                msg_Err (obj, "Please select network protocol manually");
-            }
+        /* If IPv6 was forced, set IPv6-only mode.
+         * If IPv4 was forced, do nothing extraordinary.
+         * If nothing was forced, try dual-mode IPv6. */
+        if (ptr->ai_family == AF_INET6)
+        {
+            int on = (family == AF_INET6);
+            setsockopt (fd, SOL_IPV6, IPV6_V6ONLY, &on, sizeof (on));
+        }
+        else if (ptr->ai_family == AF_INET && family == AF_UNSPEC)
+        {
+            for (const struct addrinfo *p = ptr; p != NULL; p = p->ai_next)
+                if (p->ai_family == AF_INET6)
+                {
+                    net_Close (fd);
+                    fd = -1;
+                    break;
+                }
+            if (fd == -1)
+                continue;
+        }
+#else
+        if (family == AF_UNSPEC && ptr->ai_next != NULL)
+        {
+            msg_Warn (obj, "ambiguous network protocol specification");
+            msg_Warn (obj, "please select IP version explicitly");
         }
+#endif
 
         fd = net_SetupDgramSocket( obj, fd, ptr );
         if( fd == -1 )