Changeset 833:7c11ae15df0d in roaraudio for libroar/socket.c

Timestamp:

09/27/08 01:21:03 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

done a lot cleanup in proxy code

File:

• libroar/socket.c (modified) (2 diffs)

libroar/socket.c

@@ -599 +599 @@
  int    i;
  int    fh = -1;
+ int (* code)(int mode, int fh, char * host, int port) = NULL;
 
  // TODO: change this so we support listen() proxys (ssh -R)
@@ -639 +640 @@
 
  if ( !strcmp(proxy_type, "socks4a") ) { // for TOR, the only supported type at the moment
-  if ( roar_socket_open_socks4a(mode, fh, host, port) == -1 ) {
-   close(fh);
-   return -1;
-  }
-
-  return fh;
+  code = roar_socket_open_socks4a;
  } else if ( !strcmp(proxy_type, "socks4d") ) { // DECnet
-  if ( roar_socket_open_socks4d(mode, fh, host, port) == -1 ) {
-   close(fh);
-   return -1;
-  }
-
-  return fh;
+  code = roar_socket_open_socks4d;
  } else if ( !strcmp(proxy_type, "socks4") ) { // good old SOCKS4
-  if ( roar_socket_open_socks4(mode, fh, host, port) == -1 ) {
-   close(fh);
-   return -1;
-  }
-
-  return fh;
+  code = roar_socket_open_socks4;
  } else if ( !strcmp(proxy_type, "http") ) { // HTTP CONNECT
-  if ( roar_socket_open_http(mode, fh, host, port) == -1 ) {
-   close(fh);
-   return -1;
-  }
-
-  return fh;
+  code = roar_socket_open_http;
  } else {
   return -1; // unknown type
  }
+
+ if ( code != NULL ) {
+  if ( code(mode, fh, host, port) == -1 ) {
+   close(fh);
+   return -1;
+  }
+
+  return fh;
+ }
+
+ close(fh);
+ return -1;
 }