Remove left over HAVE_GETADDRINFO, fix ACL regression (1.2 only)

[vlc] / src / network / udp.c

diff --git a/src/network/udp.c b/src/network/udp.c
index ab1792e6de2a2587fd4b45cc3a2da4dd92050be0..5af1c0b634774a0851d4bc9b8acf7156dee058fb 100644 (file)
--- a/src/network/udp.c
+++ b/src/network/udp.c
@@ -155,7 +155,7 @@ static int net_ListenSingle (vlc_object_t *obj, const char *host, int port,
     if (val)
     {
         msg_Err (obj, "Cannot resolve %s port %d : %s", host, port,
-                 vlc_gai_strerror (val));
+                 gai_strerror (val));
         return -1;
     }
 
@@ -203,7 +203,7 @@ static int net_ListenSingle (vlc_object_t *obj, const char *host, int port,
         break;
     }
 
-    vlc_freeaddrinfo (res);
+    freeaddrinfo (res);
     return val;
 }
 
@@ -244,9 +244,13 @@ static int net_SetMcastHopLimit( vlc_object_t *p_this,
         /* BSD compatibility */
         unsigned char buf;
 
+        msg_Dbg( p_this, "cannot set hop limit (%d): %m", hlim );
         buf = (unsigned char)(( hlim > 255 ) ? 255 : hlim);
         if( setsockopt( fd, proto, cmd, &buf, sizeof( buf ) ) )
+        {
+            msg_Err( p_this, "cannot set hop limit (%d): %m", hlim );
             return VLC_EGENERIC;
+        }
     }
 
     return VLC_SUCCESS;
@@ -657,7 +661,7 @@ int net_ConnectDgram( vlc_object_t *p_this, const char *psz_host, int i_port,
     if( i_val )
     {
         msg_Err( p_this, "cannot resolve [%s]:%d : %s", psz_host, i_port,
-                 vlc_gai_strerror( i_val ) );
+                 gai_strerror( i_val ) );
         return -1;
     }
 
@@ -719,7 +723,7 @@ int net_ConnectDgram( vlc_object_t *p_this, const char *psz_host, int i_port,
         }
     }
 
-    vlc_freeaddrinfo( res );
+    freeaddrinfo( res );
 
     if( i_handle == -1 )
     {
@@ -760,7 +764,7 @@ int net_OpenDgram( vlc_object_t *obj, const char *psz_bind, int i_bind,
     if (val)
     {
         msg_Err (obj, "cannot resolve %s port %d : %s", psz_bind, i_bind,
-                 vlc_gai_strerror (val));
+                 gai_strerror (val));
         return -1;
     }
 
@@ -769,8 +773,8 @@ int net_OpenDgram( vlc_object_t *obj, const char *psz_bind, int i_bind,
     if (val)
     {
         msg_Err (obj, "cannot resolve %s port %d : %s", psz_bind, i_bind,
-                 vlc_gai_strerror (val));
-        vlc_freeaddrinfo (rem);
+                 gai_strerror (val));
+        freeaddrinfo (rem);
         return -1;
     }
 
@@ -813,8 +817,8 @@ int net_OpenDgram( vlc_object_t *obj, const char *psz_bind, int i_bind,
         net_Close (fd);
     }
 
-    vlc_freeaddrinfo (rem);
-    vlc_freeaddrinfo (loc);
+    freeaddrinfo (rem);
+    freeaddrinfo (loc);
     return val;
 }