Changeset 84:cd538d13337e in roaraudio

Timestamp:

07/12/08 21:55:02 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

fixed some bugs with multible streams per client

Location:

roard

Files:

• clients.c (modified) (2 diffs)
• req.c (modified) (1 diff)
• streams.c (modified) (2 diffs)

roard/clients.c

@@ -135 +135 @@
    if ( fh > max_fh )
     max_fh = fh;
-  } else {
-
-   for (j = 0; j < ROAR_CLIENTS_MAX_STREAMS_PER_CLIENT; j++) {
-    if ( (fh = streams_get_fh(g_clients[i]->streams[j])) != -1 ) {
-     FD_SET(fh, &r);
-
-     if ( fh > max_fh )
-      max_fh = fh;
-    }
-   }
+  }
+
+  for (j = 0; j < ROAR_CLIENTS_MAX_STREAMS_PER_CLIENT; j++) {
+   if ( (fh = streams_get_fh(g_clients[i]->streams[j])) != -1 ) {
+    FD_SET(fh, &r);
+
+    if ( fh > max_fh )
+     max_fh = fh;
+   }
+   //printf("D: client=%i, stream=%i, fh=%i\n", i, j, fh);
   }
 
@@ -166 +166 @@
    }
 
-   if ( FD_ISSET(fh, &e) )
+   if ( FD_ISSET(fh, &e) ) {
     clients_delete(i);
-  } else {
-   for (j = 0; j < ROAR_CLIENTS_MAX_STREAMS_PER_CLIENT; j++) {
-    if ( (fh = streams_get_fh(g_clients[i]->streams[j])) != -1 ) {
-     if ( FD_ISSET(fh, &r) ) {
-      streams_check(g_clients[i]->streams[j]);
-     }
+    continue;
+   }
+  }
+
+  if ( g_clients[i] == NULL )
+   continue;
+
+  for (j = 0; j < ROAR_CLIENTS_MAX_STREAMS_PER_CLIENT; j++) {
+   //printf("D: client=%i, stream=%i, g_clients[i=%i] = %p\n", i, j, i, g_clients[i]);
+   if ( (fh = streams_get_fh(g_clients[i]->streams[j])) != -1 ) {
+    if ( FD_ISSET(fh, &r) ) {
+     streams_check(g_clients[i]->streams[j]);
     }
    }

roard/req.c

@@ -107 +107 @@
  len = mes->datalen - 4;
 
- strncmp(host, &(mes->data[4]), len);
+ strncpy(host, &(mes->data[4]), len);
  host[len] = 0;
 

roard/streams.c

@@ -122 +122 @@
 
 int streams_get_fh     (int id) {
+ if ( id < 0 )
+  return -1;
+
  if ( g_streams[id] == NULL )
   return -1;
@@ -360 +363 @@
 
 int streams_get_mixbuffers (void *** bufferlist, struct roar_audio_info * info, unsigned int pos) {
- static void * bufs[ROAR_STREAMS_MAX];
+ static void * bufs[ROAR_STREAMS_MAX+1];
  int i;
  int have = 0;