Changeset 838:7e78b8dfd899 in roaraudio for libroar/socket.c

Timestamp:

09/27/08 02:51:36 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

done som preperation for SSH Proxy code

File:

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

libroar/socket.c

@@ -601 +601 @@
  char * user = NULL, * pw = NULL, * opts = NULL;
  char * sep;
+ int    no_fh = 0;
  static struct passwd * passwd;
  int (* code)(int mode, int fh, char * host, int port, char * user, char * pw, char * opts) = NULL;
@@ -633 +634 @@
   if ( !strncmp(proxy_addr, "http://", 7) )
    proxy_addr += 7;
+ } else if ( !strncmp(proxy_type, "ssh", 3) ) {
+  proxy_port = 22;
+  proxy_addr = getenv("ssh_proxy");
+  no_fh      = 1;
  }
 
@@ -662 +667 @@
   proxy_port = atoi(&proxy_addr[i+1]);
 
- if ( (fh = roar_socket_open(mode, type, proxy_host, proxy_port)) == -1) {
-  return -1;
+ if ( ! no_fh ) {
+  if ( (fh = roar_socket_open(mode, type, proxy_host, proxy_port)) == -1) {
+   return -1;
+  }
  }
 
@@ -679 +686 @@
 
  if ( code != NULL ) {
-  if ( code(mode, fh, host, port, user, pw, opts) == -1 ) {
-   close(fh);
-   return -1;
+  if ( no_fh ) {
+   fh = code(mode, fh, host, port, user, pw, opts);
+  } else {
+   if ( code(mode, fh, host, port, user, pw, opts) == -1 ) {
+    close(fh);
+    return -1;
+   }
   }