Removes trailing spaces. Removes tabs.

[vlc] / src / network / tcp.c

diff --git a/src/network/tcp.c b/src/network/tcp.c
index 415ee6aade8cfa62cbb26c735aed4e5ee6841b40..7bfd3a99d5ab575d4816baabd4d13d3b9d0011b3 100644 (file)
--- a/src/network/tcp.c
+++ b/src/network/tcp.c
@@ -26,7 +26,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>
 #include <vlc/vlc.h>
 
 #include <errno.h>
@@ -75,8 +74,7 @@ int __net_Connect( vlc_object_t *p_this, const char *psz_host, int i_port,
     struct addrinfo hints, *res, *ptr;
     const char      *psz_realhost;
     char            *psz_socks;
-    int             i_realport, i_val, i_handle = -1, i_saved_errno = 0;
-    unsigned        u_errstep = 0;
+    int             i_realport, i_val, i_handle = -1;
 
     if( i_port == 0 )
         i_port = 80; /* historical VLC thing */
@@ -84,8 +82,8 @@ int __net_Connect( vlc_object_t *p_this, const char *psz_host, int i_port,
     memset( &hints, 0, sizeof( hints ) );
     hints.ai_socktype = SOCK_STREAM;
 
-    psz_socks = var_CreateGetString( p_this, "socks" );
-    if( *psz_socks && *psz_socks != ':' )
+    psz_socks = var_CreateGetNonEmptyString( p_this, "socks" );
+    if( psz_socks != NULL )
     {
         char *psz = strchr( psz_socks, ':' );
 
@@ -94,9 +92,35 @@ int __net_Connect( vlc_object_t *p_this, const char *psz_host, int i_port,
 
         psz_realhost = psz_socks;
         i_realport = ( psz != NULL ) ? atoi( psz ) : 1080;
+        hints.ai_flags &= ~AI_NUMERICHOST;
 
-        msg_Dbg( p_this, "net: connecting to %s port %d for %s port %d",
-                 psz_realhost, i_realport, psz_host, i_port );
+        msg_Dbg( p_this, "net: connecting to %s port %d (SOCKS) "
+                 "for %s port %d", psz_realhost, i_realport,
+                 psz_host, i_port );
+
+        /* We only implement TCP with SOCKS */
+        switch( type )
+        {
+            case 0:
+                type = SOCK_STREAM;
+            case SOCK_STREAM:
+                break;
+            default:
+                msg_Err( p_this, "Socket type not supported through SOCKS" );
+                free( psz_socks );
+                return -1;
+        }
+        switch( proto )
+        {
+            case 0:
+                proto = IPPROTO_TCP;
+            case IPPROTO_TCP:
+                break;
+            default:
+                msg_Err( p_this, "Transport not supported through SOCKS" );
+                free( psz_socks );
+                return -1;
+        }
     }
     else
     {
@@ -108,11 +132,12 @@ int __net_Connect( vlc_object_t *p_this, const char *psz_host, int i_port,
     }
 
     i_val = vlc_getaddrinfo( p_this, psz_realhost, i_realport, &hints, &res );
+    free( psz_socks );
+
     if( i_val )
     {
         msg_Err( p_this, "cannot resolve %s port %d : %s", psz_realhost,
                  i_realport, vlc_gai_strerror( i_val ) );
-        free( psz_socks );
         return -1;
     }
 
@@ -122,11 +147,6 @@ int __net_Connect( vlc_object_t *p_this, const char *psz_host, int i_port,
                              proto ?: ptr->ai_protocol );
         if( fd == -1 )
         {
-            if( u_errstep <= 0 )
-            {
-                u_errstep = 1;
-                i_saved_errno = net_errno;
-            }
             msg_Dbg( p_this, "socket error: %s", strerror( net_errno ) );
             continue;
         }
@@ -139,12 +159,8 @@ int __net_Connect( vlc_object_t *p_this, const char *psz_host, int i_port,
 
             if( net_errno != EINPROGRESS )
             {
-                if( u_errstep <= 1 )
-                {
-                    u_errstep = 2;
-                    i_saved_errno = net_errno;
-                }
-                msg_Dbg( p_this, "connect error: %s", strerror( net_errno ) );
+                msg_Err( p_this, "connection failed: %s",
+                         strerror( net_errno ) );
                 goto next_ai;
             }
 
@@ -169,7 +185,6 @@ int __net_Connect( vlc_object_t *p_this, const char *psz_host, int i_port,
                     msg_Dbg( p_this, "connection aborted" );
                     net_Close( fd );
                     vlc_freeaddrinfo( res );
-                    free( psz_socks );
                     return -1;
                 }
 
@@ -184,19 +199,14 @@ int __net_Connect( vlc_object_t *p_this, const char *psz_host, int i_port,
 
                 if( ( i_ret == -1 ) && ( net_errno != EINTR ) )
                 {
-                    msg_Warn( p_this, "select error: %s",
+                    msg_Err( p_this, "connection polling error: %s",
                               strerror( net_errno ) );
                     goto next_ai;
                 }
 
                 if( d.quot <= 0 )
                 {
-                    msg_Dbg( p_this, "select timed out" );
-                    if( u_errstep <= 2 )
-                    {
-                        u_errstep = 3;
-                        i_saved_errno = ETIMEDOUT;
-                    }
+                    msg_Warn( p_this, "connection timed out" );
                     goto next_ai;
                 }
 
@@ -207,9 +217,7 @@ int __net_Connect( vlc_object_t *p_this, const char *psz_host, int i_port,
             if( getsockopt( fd, SOL_SOCKET, SO_ERROR, (void*)&i_val,
                             &i_val_size ) == -1 || i_val != 0 )
             {
-                u_errstep = 4;
-                i_saved_errno = i_val;
-                msg_Dbg( p_this, "connect error (via getsockopt): %s",
+                msg_Err( p_this, "connection failed: %s",
                          net_strerror( i_val ) );
                 goto next_ai;
             }
@@ -227,22 +235,18 @@ next_ai: /* failure */
     vlc_freeaddrinfo( res );
 
     if( i_handle == -1 )
-    {
-        msg_Err( p_this, "Connection to %s port %d failed: %s", psz_host,
-                 i_port, net_strerror( i_saved_errno ) );
-        free( psz_socks );
         return -1;
-    }
 
-    if( *psz_socks && *psz_socks != ':' )
+    if( psz_socks != NULL )
     {
+        /* NOTE: psz_socks already free'd! */
         char *psz_user = var_CreateGetString( p_this, "socks-user" );
         char *psz_pwd  = var_CreateGetString( p_this, "socks-pwd" );
 
         if( SocksHandshakeTCP( p_this, i_handle, 5, psz_user, psz_pwd,
                                psz_host, i_port ) )
         {
-            msg_Err( p_this, "Failed to use the SOCKS server" );
+            msg_Err( p_this, "SOCKS handshake failed" );
             net_Close( i_handle );
             i_handle = -1;
         }
@@ -250,7 +254,6 @@ next_ai: /* failure */
         free( psz_user );
         free( psz_pwd );
     }
-    free( psz_socks );
 
     return i_handle;
 }
@@ -435,7 +438,7 @@ static int SocksHandshakeTCP( vlc_object_t *p_obj,
         i_socks_version = 5;
     }
 
-    if( i_socks_version == 5 && 
+    if( i_socks_version == 5 &&
         SocksNegociate( p_obj, fd, i_socks_version,
                         psz_socks_user, psz_socks_passwd ) )
         return VLC_EGENERIC;
@@ -445,7 +448,7 @@ static int SocksHandshakeTCP( vlc_object_t *p_obj,
         struct addrinfo hints, *p_res;
 
         /* v4 only support ipv4 */
-       memset (&hints, 0, sizeof (hints));
+    memset (&hints, 0, sizeof (hints));
         hints.ai_family = AF_INET;
         if( vlc_getaddrinfo( p_obj, psz_host, 0, &hints, &p_res ) )
             return VLC_EGENERIC;
@@ -510,7 +513,7 @@ static int SocksHandshakeTCP( vlc_object_t *p_obj,
             i_len = buffer[4] + 2;
         else if( buffer[3] == 0x04 )
             i_len = 16-1+2;
-        else 
+        else
             return VLC_EGENERIC;
 
         if( net_Read( p_obj, fd, NULL, buffer, i_len, VLC_TRUE ) != i_len )