Changeset 4948:29b5b41a1ca2 in roaraudio for roarclients/roarclientpass.c

Timestamp:

05/10/11 01:41:14 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

a first (not yet fully working) patch for non-stream execs (see #32)

File:

• roarclients/roarclientpass.c (modified) (5 diffs)

roarclients/roarclientpass.c

@@ -58 +58 @@
 #define F_STDERR _BV(ROAR_STDERR)
 
+int run (int client, int in, int out) {
+ struct roar_vio_calls socks[3];
+ struct roar_vio_select vios[3];
+ int alive = 1;
+ int ret;
+ ssize_t len;
+ char buf[1024];
+
+ roar_vio_open_fh_socket(&(socks[0]), client);
+ roar_vio_open_fh_socket(&(socks[1]), in);
+ roar_vio_open_fh_socket(&(socks[2]), out);
+
+ ROAR_VIO_SELECT_SETVIO(&(vios[0]), &(socks[0]), ROAR_VIO_SELECT_READ|ROAR_VIO_SELECT_WRITE);
+ ROAR_VIO_SELECT_SETVIO(&(vios[1]), &(socks[1]), ROAR_VIO_SELECT_READ);
+ ROAR_VIO_SELECT_SETVIO(&(vios[2]), &(socks[2]), ROAR_VIO_SELECT_WRITE);
+
+ while (alive) {
+  ret = roar_vio_select(vios, 3, NULL, NULL);
+  if ( ret < 0 )
+   break;
+
+  if ( ret == 0 )
+   continue;
+
+  if ( (vios[0].eventsa & ROAR_VIO_SELECT_READ) && (vios[2].eventsa & ROAR_VIO_SELECT_WRITE) ) {
+   len = roar_vio_read(&(socks[0]), buf, sizeof(buf));
+
+   if ( len < 1 ) {
+    alive = 0;
+   } else {
+    if ( roar_vio_write(&(socks[2]), buf, len) != len )
+     break;
+   }
+  }
+
+  if ( (vios[0].eventsa & ROAR_VIO_SELECT_WRITE) && (vios[1].eventsa & ROAR_VIO_SELECT_READ) ) {
+   len = roar_vio_read(&(socks[1]), buf, sizeof(buf));
+
+   if ( len < 1 ) {
+    alive = 0;
+   } else {
+    if ( roar_vio_write(&(socks[0]), buf, len) != len )
+     break;
+   }
+  }
+ }
+
+ roar_vio_close(&(socks[0]));
+ roar_vio_close(&(socks[1]));
+ roar_vio_close(&(socks[2]));
+
+ return 0;
+}
+
 int main (int argc, char * argv[]) {
  struct roar_connection    con;
@@ -73 +127 @@
  char * host      = NULL;
  int    port      = -1;
+ enum {PASSFH, EXEC} command = PASSFH;
 
  for (i = 1; i < argc; i++) {
@@ -95 +150 @@
   } else if ( !strcmp(k, "--listen") ) {
    flags |= ROAR_CLIENTPASS_FLAG_LISTEN;
+  } else if ( !strcmp(k, "--command") ) {
+   k = argv[++i];
+   if ( !strcasecmp(k, "passfh") ) {
+    command = PASSFH;
+   } else if ( !strcasecmp(k, "exec") ) {
+    command = EXEC;
+   } else {
+    ROAR_ERR("unknown command: %s", k);
+    return 1;
+   }
   } else if ( !strcmp(k, "--mode") ) {
    k = argv[++i];
@@ -161 +226 @@
 
  roar_client_new(&client);
- roar_client_set_fh(&client, clientfh);
  roar_client_set_proto(&client, proto, byteorder);
+
+ if ( command != EXEC )
+  roar_client_set_fh(&client, clientfh);
 
  if ( roar_simple_connect(&con, server, "roarclientpass") == -1 ) {
@@ -169 +236 @@
  }
 
- if ( roar_client_pass(&con, &client, flags) == -1 ) {
-  ROAR_ERR("Can not pass client fh to server");
-  roar_disconnect(&con);
-  return 20;
+ switch (command) {
+  case PASSFH:
+    if ( roar_client_pass(&con, &client, flags) == -1 ) {
+     ROAR_ERR("Can not pass client fh to server");
+     roar_disconnect(&con);
+     return 20;
+    }
+   break;
+  case EXEC:
+    if ( roar_client_exec(&con, &client, flags) == -1 ) {
+     ROAR_ERR("Can not exec client on server");
+     roar_disconnect(&con);
+     return 20;
+    }
+
+    if ( run(client.fh, clientfh, cflags & F_STDOUT ? ROAR_STDOUT : clientfh) == -1 ) {
+     ROAR_ERR("Can not run data copy runner");
+     return 20;
+    }
+
+    return 0;
+   break;
  }