Changeset 3737:e79803f4911d in roaraudio for roard/req.c

Timestamp:

04/26/10 13:55:19 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added clients_new_from_fh(), converted some code to use the function

File:

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

roard/req.c

@@ -291 +291 @@
 
 int req_on_passfh      (int client, struct roar_message * mes, char * data) {
- struct roar_client * c;
  int sock = clients_get_fh(client);
  int16_t * d = (int16_t*)mes->data;
@@ -351 +350 @@
   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);
-  }
+  if ( clients_new_from_fh(fh, d[2], d[3], 1) == -1 )
+   return -1;
  }