Changeset 840:b45e02ef8f29 in roaraudio for libroar/socket.c

Timestamp:

09/27/08 03:36:43 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support for socat and for unix domain sockets via socat

File:

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

libroar/socket.c

@@ -812 +812 @@
  char   cmd[1024] = {0}, rcmd[1024] = {0};
  int    proxy_port = 22;
+ int    use_socat = 0;
  int r;
  int socks[2];
@@ -819 +820 @@
 
  if ( *host == '/' )
-  return -1;
+  use_socat = 1;
 
  if ( mode == MODE_LISTEN )
@@ -826 +827 @@
  if ( proxy_addr == NULL )
   return -1;
+
+ if ( opts != NULL ) {
+  if ( !strcmp(opts, "socat") ) {
+   use_socat = 1;
+  } else if ( !strcmp(opts, "netcat") ) {
+   use_socat = 0;
+  } else {
+   return -1;
+  }
+ }
 
  if ( (sep = strstr(proxy_addr, "@")) != NULL )
@@ -839 +850 @@
   strcpy(rcmd, "roard --no-listen --client-fh 0");
  } else {
-  snprintf(rcmd, 1023, "$(which netcat nc 2> /dev/null | grep -v \" \" | head -n 1) \"%s\" %i", host, port);
+  if ( use_socat ) {
+   if ( *host == '/' ) {
+    snprintf(rcmd, 1023, "socat stdio unix-connect:\"%s\"", host);
+   } else {
+    snprintf(rcmd, 1023, "socat stdio tcp:\"%s\":%i", host, port);
+   }
+  } else {
+   snprintf(rcmd, 1023, "$(which netcat nc 2> /dev/null | grep -v \" \" | head -n 1) \"%s\" %i", host, port);
+  }
+
   rcmd[1023] = 0;
  }