Changeset 3825:0a66c056ac51 in roaraudio

Timestamp:

05/11/10 18:06:09 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

get INFO requets working at full speed

Location:

roard

Files:

• clients.c (modified) (1 diff)
• emul_rsound.c (modified) (4 diffs)

roard/clients.c

@@ -458 +458 @@
   case ROAR_PROTO_RSOUND:
     rv = emul_rsound_check_client(id, NULL);
+    if ( rv == 0 ) { // loop as long as we don't get an error.
+     while (rv == 0)
+      rv = emul_rsound_check_client(id, NULL);
+     rv = 0; // restore
+    } else { // in case of error delete the client
+     rv = clients_delete(id);
+    }
    break;
 #endif

roard/emul_rsound.c

@@ -39 +39 @@
   char c[16];
  } buf;
+
+ // TODO: add error handling
+ roar_socket_nonblock(fh, ROAR_SOCKET_NONBLOCK);
 
  if ( emul_rsound_lastcon == -1 ) {
@@ -212 +215 @@
  }
 
+ // we get called in a loop, in case this fails no problem, just
+ // return -1, caller will delete us in case of real error.
  if ( emul_rsound_vrecv_msg(&msg, vio) == -1 )
-  return clients_delete(client);
+  return -1;
 
  if ( !strncmp(msg.datasp, "INFO", 4) ) {
@@ -246 +251 @@
  } else if ( !strncmp(msg.datasp, "NULL", 4) ) {
   // NULL is simular to NOOP
-  return 0;
  } else if ( !strncmp(msg.datasp, "STOP", 4) ) {
   // This is quit.
@@ -253 +257 @@
   return clients_delete(client);
  }
+
+ return 0;
 }
 #endif