Changeset 3732:4525972e9c84 in roaraudio

Timestamp:

04/25/10 22:36:06 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support to pass listen sockets

Files:

• include/roaraudio/client.h (modified) (1 diff)
• roard/req.c (modified) (2 diffs)

include/roaraudio/client.h

@@ -59 +59 @@
 #endif
 
+#define ROAR_CLIENTPASS_FLAG_NONE    0x0000
+#define ROAR_CLIENTPASS_FLAG_LISTEN  0x0001
+
 #endif
 

roard/req.c

@@ -294 +294 @@
  int sock = clients_get_fh(client);
  int16_t * d = (int16_t*)mes->data;
+ struct roard_listen * lsock;
+ int listening;
  int fh;
  int i;
@@ -332 +334 @@
   return -1;
 
+ listening = d[1] & ROAR_CLIENTPASS_FLAG_LISTEN;
+
+ if ( listening )
+  d[1] -= ROAR_CLIENTPASS_FLAG_LISTEN;
+
  if ( d[1] != 0 ) // flags
   return -1;
 
- if ( d[2] != ROAR_PROTO_ROARAUDIO ) // protocol
-  return -1;
-
- if ( d[3] != ROAR_BYTEORDER_NETWORK ) // byte order
-  return -1;
-
- if ( (client = clients_new()) == -1 )
-  return -1;
-
- if ( clients_set_fh(client, fh) == -1 ) {
-  clients_delete(client);
-  return -1;
- }
-
- if ( clients_get(client, &c) != -1 ) {
-  roar_nnode_new_from_fh(&(c->nnode), fh, 1);
+ if ( listening ) {
+  if ( get_listen(&lsock, NULL) == -1 )
+   return -1;
+
+  lsock->socket = fh;
+  lsock->proto  = d[2];
+ } else {
+  if ( d[2] != ROAR_PROTO_ROARAUDIO ) // protocol
+   return -1;
+
+  if ( d[3] != ROAR_BYTEORDER_NETWORK ) // byte order
+   return -1;
+
+  if ( (client = clients_new()) == -1 )
+   return -1;
+
+  if ( clients_set_fh(client, fh) == -1 ) {
+   clients_delete(client);
+   return -1;
+  }
+
+  if ( clients_get(client, &c) != -1 ) {
+   roar_nnode_new_from_fh(&(c->nnode), fh, 1);
+  }
  }