Changeset e1cfc6b69e75c5f3ac564bf116e68bac9735db77

Timestamp:

18/08/07 19:55:51 (1 year ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1187459751 +0000

git-parent:

[c92a74565af6e57bbd6c29d00702ac04bdf3a5aa]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1187459751 +0000

Message:

Make sure SOCKS is only attempted with TCP

Files:

• src/network/tcp.c (modified) (6 diffs)

src/network/tcp.c

@@ -85 +85 @@
-    hints.ai_socktype = SOCK_STREAM;
-
-
-*psz_socks && *psz_socks != ':'
+NonEmpty
+psz_socks != NULL
-    {
-        char *psz = strchr( psz_socks, ':' );
@@ -96 +96 @@
-        i_realport = ( psz != NULL ) ? atoi( psz ) : 1080;
-
-
+(SOCKS) 
-                 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
@@ -109 +133 @@
-
-    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;
-    }
@@ -170 +195 @@
-                    net_Close( fd );
-                    vlc_freeaddrinfo( res );
-                    free( psz_socks );
-                    return -1;
-                }
@@ -231 +255 @@
-        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;
-    }
-
-
-
+
+
+
-        char *psz_user = var_CreateGetString( p_this, "socks-user" );
-        char *psz_pwd  = var_CreateGetString( p_this, "socks-pwd" );
@@ -251 +275 @@
-        free( psz_pwd );
-    }
-    free( psz_socks );
-
-    return i_handle;