Changeset 4948:29b5b41a1ca2 in roaraudio

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)

Files:

• include/libroar/client.h (modified) (1 diff)
• libroar/client.c (modified) (1 diff)
• roarclients/roarclientpass.c (modified) (5 diffs)
• roard/req.c (modified) (2 diffs)

include/libroar/client.h

@@ -63 +63 @@
 int roar_client_pass     (struct roar_connection * con, struct roar_client * client, uint16_t flags);
 
+int roar_client_exec     (struct roar_connection * con, struct roar_client * client, uint16_t flags);
+
 #endif
 

libroar/client.c

@@ -128 +128 @@
 }
 
+int roar_client_exec     (struct roar_connection * con, struct roar_client * client, uint16_t flags) {
+ struct roar_message m;
+ int16_t * d = (int16_t *)m.data;
+ int i;
+
+ memset(&m,  0, sizeof(m));
+
+ m.cmd     = ROAR_CMD_EXEC_STREAM;
+ m.stream  =  -1; // client (non-stream) passs
+ m.pos     =   0;
+ m.datalen = 4*2;
+
+ d[0] = 0; // version
+ d[1] = flags;
+ d[2] = client->proto;
+ d[3] = client->byteorder;
+
+ for (i = 0; i < 4; i++)
+  d[i] = ROAR_HOST2NET16(d[i]);
+
+ if ( roar_req(con, &m, NULL) == -1 )
+  return -1;
+
+ client->fh = roar_get_connection_fh(con);
+
+ return 0;
+}
+
 //ll

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;
  }
 

roard/req.c

@@ -343 +343 @@
 
 int req_on_exec_stream (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) {
+ struct roar_message    m;
+ struct roar_client   * c;
+ struct roar_connection con;
+ int16_t * d = (int16_t*)mes->data;
+ int sock;
+ int i;
  int r;
 
@@ -348 +354 @@
 
 
- if ( streams_is_ready(mes->stream) ) {
-  flags[1] |= COMMAND_FLAG_OUT_CLOSECON;
- } else {
-  if ( (r = client_stream_exec(client, mes->stream)) == -1 )
-   return -1;
- }
-
- ROAR_DBG("req_on_exec_stream(client=%i, mes={stream=%i,...},...): returning (OK)...", client, mes->stream);
- mes->cmd     = ROAR_CMD_OK;
- mes->datalen = 0;
+ if ( mes->stream != -1 ) {
+  if ( streams_is_ready(mes->stream) ) {
+   flags[1] |= COMMAND_FLAG_OUT_CLOSECON;
+  } else {
+   if ( (r = client_stream_exec(client, mes->stream)) == -1 )
+    return -1;
+  }
+
+  ROAR_DBG("req_on_exec_stream(client=%i, mes={stream=%i,...},...): returning (OK)...", client, mes->stream);
+  mes->cmd     = ROAR_CMD_OK;
+  mes->datalen = 0;
+  return 0;
+ }
+
+ if ( mes->datalen < 4*2 )
+  return -1;
+
+ for (i = 0; i < 4; i++) {
+  d[i] = ROAR_NET2HOST16(d[i]);
+ }
+
+ if ( d[0] != 0 ) // version
+  return -1;
+
+ if ( d[1] != 0 ) // flags
+  return -1;
+
+ memset(&m, 0, sizeof(m));
+
+ m.cmd = ROAR_CMD_OK;
+
+ flags[1] |= COMMAND_FLAG_OUT_NOSEND;
+
+ c = ROAR_CLIENT(g_clients[client]);
+
+ sock = c->fh;
+
+ if ( sock == -1 )
+  return -1;
+
+ roar_connect_fh(&con, sock);
+
+ roar_send_message(&con, &m, NULL);
+
+ clients_set_fh(client, -1);
+ clients_delete(client);
+
+ clients_new_from_fh(sock, d[2], d[3], 1);
 
  return 0;