Remove unused parameter

[vlc] / src / network / udp.c

diff --git a/src/network/udp.c b/src/network/udp.c
index 624d28e662dcad529f8094a97ca13bbd9e9cfb3c..f063e2ffbbfd5a39b395117e87216ed9b0c24d15 100644 (file)
--- a/src/network/udp.c
+++ b/src/network/udp.c
@@ -27,7 +27,11 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
 
 #include <errno.h>
 
@@ -93,6 +97,47 @@
 extern int net_Socket( vlc_object_t *p_this, int i_family, int i_socktype,
                        int i_protocol );
 
+/* */
+static int net_SetupDgramSocket( vlc_object_t *p_obj, int fd, const struct addrinfo *ptr )
+{
+#ifdef SO_REUSEPORT
+    setsockopt (fd, SOL_SOCKET, SO_REUSEPORT, &(int){ 1 }, sizeof (int));
+#endif
+
+#ifdef SO_RCVBUF
+    /* Increase the receive buffer size to 1/2MB (8Mb/s during 1/2s)
+     * to avoid packet loss caused in case of scheduling hiccups */
+    setsockopt (fd, SOL_SOCKET, SO_RCVBUF,
+                (void *)&(int){ 0x80000 }, sizeof (int));
+    setsockopt (fd, SOL_SOCKET, SO_SNDBUF,
+                (void *)&(int){ 0x80000 }, sizeof (int));
+#endif
+
+#if defined (WIN32) || defined (UNDER_CE)
+    if (net_SockAddrIsMulticast (ptr->ai_addr, ptr->ai_addrlen)
+     && (sizeof (struct sockaddr_storage) >= ptr->ai_addrlen))
+    {
+        // This works for IPv4 too - don't worry!
+        struct sockaddr_in6 dumb =
+        {
+            .sin6_family = ptr->ai_addr->sa_family,
+            .sin6_port =  ((struct sockaddr_in *)(ptr->ai_addr))->sin_port
+        };
+
+        bind (fd, (struct sockaddr *)&dumb, ptr->ai_addrlen);
+    }
+    else
+#endif
+    if (bind (fd, ptr->ai_addr, ptr->ai_addrlen))
+    {
+        msg_Err( p_obj, "socket bind error (%m)" );
+        net_Close (fd);
+        return -1;
+    }
+    return fd;
+}
+
+/* */
 static int net_ListenSingle (vlc_object_t *obj, const char *host, int port,
                              int family, int protocol)
 {
@@ -141,26 +186,9 @@ static int net_ListenSingle (vlc_object_t *obj, const char *host, int port,
             }
         }
 
-        /* Bind the socket */
-#if defined (WIN32) || defined (UNDER_CE)
-        if (net_SockAddrIsMulticast (ptr->ai_addr, ptr->ai_addrlen)
-         && (sizeof (struct sockaddr_storage) >= ptr->ai_addrlen))
-        {
-            struct sockaddr_in6 dumb =
-            {
-                .sin6_family = ptr->ai_addr->sa_family,
-                .sin6_port =  ((struct sockaddr_in *)(ptr->ai_addr))->sin_port
-            };
-            bind (fd, (struct sockaddr *)&dumb, ptr->ai_addrlen);
-        }
-        else
-#endif
-        if (bind (fd, ptr->ai_addr, ptr->ai_addrlen))
-        {
-            msg_Err (obj, "socket bind error (%m)");
-            net_Close (fd);
+        fd = net_SetupDgramSocket( obj, fd, ptr );
+        if( fd == -1 )
             continue;
-        }
 
         if (net_SockAddrIsMulticast (ptr->ai_addr, ptr->ai_addrlen)
          && net_Subscribe (obj, fd, ptr->ai_addr, ptr->ai_addrlen))
@@ -612,23 +640,20 @@ int __net_ConnectDgram( vlc_object_t *p_this, const char *psz_host, int i_port,
 {
     struct addrinfo hints, *res, *ptr;
     int             i_val, i_handle = -1;
-    vlc_bool_t      b_unreach = VLC_FALSE;
-
-    if( i_port == 0 )
-        i_port = 1234; /* historical VLC thing */
+    bool      b_unreach = false;
 
-    if( i_hlim < 1 )
+    if( i_hlim < 0 )
         i_hlim = var_CreateGetInteger( p_this, "ttl" );
 
     memset( &hints, 0, sizeof( hints ) );
     hints.ai_socktype = SOCK_DGRAM;
 
-    msg_Dbg( p_this, "net: connecting to %s port %d", psz_host, i_port );
+    msg_Dbg( p_this, "net: connecting to [%s]:%d", psz_host, i_port );
 
     i_val = vlc_getaddrinfo( p_this, psz_host, i_port, &hints, &res );
     if( i_val )
     {
-        msg_Err( p_this, "cannot resolve %s port %d : %s", psz_host, i_port,
+        msg_Err( p_this, "cannot resolve [%s]:%d : %s", psz_host, i_port,
                  vlc_gai_strerror( i_val ) );
         return -1;
     }
@@ -651,7 +676,7 @@ int __net_ConnectDgram( vlc_object_t *p_this, const char *psz_host, int i_port,
         setsockopt (fd, SOL_SOCKET, SO_BROADCAST, &(int){ 1 }, sizeof (int));
 #endif
 
-        if( i_hlim > 0 )
+        if( i_hlim >= 0 )
             net_SetMcastHopLimit( p_this, fd, ptr->ai_family, i_hlim );
 
         str = var_CreateGetNonEmptyString (p_this, "miface");
@@ -682,7 +707,7 @@ int __net_ConnectDgram( vlc_object_t *p_this, const char *psz_host, int i_port,
 #else
         if( errno == ENETUNREACH )
 #endif
-            b_unreach = VLC_TRUE;
+            b_unreach = true;
         else
         {
             msg_Warn( p_this, "%s port %d : %m", psz_host, i_port);
@@ -752,39 +777,9 @@ int __net_OpenDgram( vlc_object_t *obj, const char *psz_bind, int i_bind,
         if (fd == -1)
             continue; // usually, address family not supported
 
-#ifdef SO_REUSEPORT
-        setsockopt (fd, SOL_SOCKET, SO_REUSEPORT, &(int){ 1 }, sizeof (int));
-#endif
-
-#ifdef SO_RCVBUF
-        /* Increase the receive buffer size to 1/2MB (8Mb/s during 1/2s)
-         * to avoid packet loss caused in case of scheduling hiccups */
-        setsockopt (fd, SOL_SOCKET, SO_RCVBUF,
-                    (void *)&(int){ 0x80000 }, sizeof (int));
-        setsockopt (fd, SOL_SOCKET, SO_SNDBUF,
-                    (void *)&(int){ 0x80000 }, sizeof (int));
-#endif
-
-#if defined (WIN32) || defined (UNDER_CE)
-        if (net_SockAddrIsMulticast (ptr->ai_addr, ptr->ai_addrlen)
-         && (sizeof (struct sockaddr_storage) >= ptr->ai_addrlen))
-        {
-            // This works for IPv4 too - don't worry!
-            struct sockaddr_in6 dumb =
-            {
-                .sin6_family = ptr->ai_addr->sa_family,
-                .sin6_port =  ((struct sockaddr_in *)(ptr->ai_addr))->sin_port
-            };
-
-            bind (fd, (struct sockaddr *)&dumb, ptr->ai_addrlen);
-        }
-        else
-#endif
-        if (bind (fd, ptr->ai_addr, ptr->ai_addrlen))
-        {
-            net_Close (fd);
+        fd = net_SetupDgramSocket( obj, fd, ptr );
+        if( fd == -1 )
             continue;
-        }
 
         val = -1;
         for (struct addrinfo *ptr2 = rem; ptr2 != NULL; ptr2 = ptr2->ai_next)
@@ -811,7 +806,7 @@ int __net_OpenDgram( vlc_object_t *obj, const char *psz_bind, int i_bind,
         if (val != -1)
             break;
 
-        close (fd);
+        net_Close (fd);
     }
 
     vlc_freeaddrinfo (rem);
@@ -878,6 +873,10 @@ int net_SetCSCov (int fd, int sendcov, int recvcov)
             return VLC_SUCCESS;
 #endif
     }
+#if !defined( UDPLITE_RECV_CSCOV ) && !defined( DCCP_SOCKOPT_SEND_CSCOV )
+    VLC_UNUSED(sendcov);
+    VLC_UNUSED(recvcov);
+#endif
 
     return VLC_EGENERIC;
 }