Changeset 4948:29b5b41a1ca2 in roaraudio for roard/req.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:

• roard/req.c (modified) (2 diffs)

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;