Changeset 5061:df215e585134 in roaraudio for libroar/simple.c

Timestamp:

06/17/11 22:12:21 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added control connection to select() to detect errors without waiting for the timeout

File:

• libroar/simple.c (modified) (4 diffs)

libroar/simple.c

@@ -164 +164 @@
 #endif
 #ifdef ROAR_HAVE_SELECT
+ int confh;
  fd_set fds;
  struct timeval timeout = {10, 0};
@@ -276 +277 @@
    FD_SET(listen, &fds);
 
-   if ( select(listen + 1, &fds, &fds, &fds, &timeout) < 1 ) {
+   confh = roar_get_connection_fh(con);
+
+   if ( confh != -1 ) {
+    FD_SET(confh, &fds);
+   }
+
+   if ( select((confh > listen ? confh : listen) + 1, &fds, &fds, &fds, &timeout) < 1 ) {
     close(listen);
 
@@ -289 +296 @@
    }
 
-   if ( (fh = accept(listen, NULL, NULL)) != -1 ) {
-    /* errr, do we need we any error handling here? */
+   if ( FD_ISSET(listen, &fds) ) {
+    if ( (fh = accept(listen, NULL, NULL)) != -1 ) {
+     /* errr, do we need we any error handling here? */
+    }
+   } else {
+    // we don't need to check the content as we know it failed...
+    if ( roar_recv_message(con, &mes, NULL) == -1 )
+     return -1;
+
+    if ( roar_kick(con, ROAR_OT_STREAM, s->id) == -1 )
+     return -1;
+
+    return roar_simple_new_stream_attachexeced_obj(con, s, rate, channels, bits, codec, dir);
    }
    if ( roar_recv_message(con, &mes, NULL) == -1 ) {
@@ -335 +353 @@
 */
 
- if ( dir == ROAR_DIR_PLAY ) {
-  (void)ROAR_SHUTDOWN(fh, SHUT_RD);
- } else if ( dir == ROAR_DIR_MONITOR || dir == ROAR_DIR_RECORD ) {
-  (void)ROAR_SHUTDOWN(fh, SHUT_WR);
+ if ( fh != -1 ) {
+  if ( dir == ROAR_DIR_PLAY ) {
+   (void)ROAR_SHUTDOWN(fh, SHUT_RD);
+  } else if ( dir == ROAR_DIR_MONITOR || dir == ROAR_DIR_RECORD ) {
+   (void)ROAR_SHUTDOWN(fh, SHUT_WR);
+  }
  }