Changeset 1008:08abe13974ad in roaraudio for libroar/socket.c

Timestamp:

12/20/08 15:25:11 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

don't modify our ENV

File:

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

libroar/socket.c

@@ -624 +624 @@
  char * sep;
  int    no_fh = 0;
+ char   proxy_addr_buf[1024];
  static struct passwd * passwd;
  int (* code)(int mode, int fh, char * host, int port, char * user, char * pw, char * opts) = NULL;
@@ -662 +663 @@
  }
 
+ proxy_addr_buf[1023] = 0;
+ strncpy(proxy_addr_buf, proxy_addr, 1023);
+ proxy_addr = proxy_addr_buf;
+
  if ( (sep = strstr(proxy_type, "/")) != NULL )
   opts = sep+1;
@@ -678 +683 @@
   }
  }
+
+ ROAR_DBG("roar_socket_open_proxy(*): proxy_type='%s', opts='%s', user='%s', pw=(not shown), proxy_addr='%s'", proxy_type, opts, user, proxy_addr);
 
  for (i = 0; proxy_addr[i] != 0 && proxy_addr[i] != ':' && i < ROAR_SOCKET_MAX_HOSTNAMELEN; i++)
@@ -860 +867 @@
  }
 
+ ROAR_DBG("roar_socket_open_ssh(*): proxy_addr='%s'", proxy_addr);
+
  if ( (sep = strstr(proxy_addr, "@")) != NULL )
   proxy_addr = sep+1;
@@ -885 +894 @@
  }
 
+ ROAR_DBG("roar_socket_open_ssh(*): proxy_port=%i, user='%s', proxy_addr='%s'", proxy_port, user, proxy_addr);
  snprintf(cmd, 1023, "ssh -p %i -l '%s' '%s' '%s'", proxy_port, user, proxy_addr, rcmd);
  cmd[1023] = 0;