Attempt to work-around the Winsock bug-of-the-day

src/network/getaddrinfo.c

@@ -649,29 +649,40 @@ int vlc_getaddrinfo( vlc_object_t *p_this, const char *node,
     }
 
 #if defined( WIN32 ) && !defined( UNDER_CE )
-    {
-        typedef int (CALLBACK * GETADDRINFO) ( const char *, const char *,
+    typedef int (CALLBACK * GETADDRINFO) (const char *, const char *,
                                           const struct addrinfo *,
-                                            struct addrinfo ** );
-        HINSTANCE module;
-        GETADDRINFO ws2_getaddrinfo;
+                                          struct addrinfo **);
+    static GETADDRINFO ws2_getaddrinfo = NULL;
 
-        module = LoadLibrary( "ws2_32.dll" );
-        if( module != NULL )
+    if (ws2_getaddrinfo == NULL)
     {
-            ws2_getaddrinfo = (GETADDRINFO)GetProcAddress( module, "getaddrinfo" );
+        static HINSTANCE module = NULL;
 
-            if( ws2_getaddrinfo != NULL )
-            {
-                int i_ret;
+        if (module == NULL)
+            module = LoadLibrary( "ws2_32.dll" );
 
-                i_ret = ws2_getaddrinfo( psz_node, psz_service, &hints, res );
-                FreeLibrary( module ); /* is this wise ? */
-                return i_ret;
+        if (module != NULL)
+            ws2_getaddrinfo =
+                    (GETADDRINFO)GetProcAddress (module, "getaddrinfo");
     }
 
-            FreeLibrary( module );
+    if (ws2_getaddrinfo != NULL)
+    {
+        /*
+         * Winsock tries to resolve numerical IPv4 addresses as AAAA
+         * and IPv6 addresses as A... There comes the work around.
+         */
+        if ((hints.ai_flags & AI_NUMERICHOST) == 0)
+        {
+            hints.ai_flags |= AI_NUMERICHOST;
+
+            if (ws2_getaddrinfo (psz_node, psz_service, &hints, res) == 0)
+                return 0;
+
+            hints.ai_flags &= ~AI_NUMERICHOST;
         }
+
+        return ws2_getaddrinfo (psz_node, psz_service, &hints, res);
     }
 #endif
 #if defined( HAVE_GETADDRINFO ) || defined( UNDER_CE )