Changeset 835:2dd85f8453a7 in roaraudio for libroar/socket.c

Timestamp:

09/27/08 02:32:53 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

get a username from the system, send the current user via SOCKS4x

File:

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

libroar/socket.c

@@ -599 +599 @@
  int    i;
  int    fh = -1;
+ char * user = NULL, * pw = NULL, * opts = NULL;
+ static struct passwd * passwd;
  int (* code)(int mode, int fh, char * host, int port, char * user, char * pw, char * opts) = NULL;
+
+ if ( passwd == NULL ) {
+  passwd = getpwuid(getuid());
+ }
+
+ if ( passwd != NULL )
+  user = passwd->pw_name;
+
+ if ( user == NULL )
+  user = getenv("USER");
 
  // TODO: change this so we support listen() proxys (ssh -R)
@@ -652 +664 @@
 
  if ( code != NULL ) {
-  if ( code(mode, fh, host, port, NULL, NULL, NULL) == -1 ) {
+  if ( code(mode, fh, host, port, user, pw, opts) == -1 ) {
    close(fh);
    return -1;
@@ -699 +711 @@
 int roar_socket_open_socks4x(int mode, int fh, char host[4], int port, char * app, size_t app_len, char * user) {
  char buf[9];
+ int len;
 
  buf[0] = 0x04;
@@ -704 +717 @@
  *((uint16_t*)&buf[2]) = htons(port);
  memcpy(buf+4, host, 4);
- buf[8] = 0x00;
-
- if ( write(fh, buf, 9) != 9 )
-  return -1;
+
+ if ( user == NULL ) {
+  buf[8] = 0x00;
+  len = 9;
+ } else {
+  len = 8;
+ }
+
+ if ( write(fh, buf, len) != len )
+  return -1;
+
+ if ( user != NULL ) {
+  len = strlen(user) + 1;
+  if ( write(fh, user, len) != len )
+   return -1;
+ }
 
  if ( app_len > 0 )