Changeset 1161:3a4d2d9604ae in roaraudio for libroar/simple.c

Timestamp:

01/24/09 01:26:07 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added a 10 sec timeout for creating new streams via connect_to

File:

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

libroar/simple.c

@@ -112 +112 @@
  struct sockaddr_in   socket_addr;
  socklen_t            len            = sizeof(struct sockaddr_in);
+ fd_set fds;
+ struct timeval timeout = {10, 0};
 
  if ( getsockname(con->fh, (struct sockaddr *)&socket_addr, &len) == -1 ) {
@@ -178 +180 @@
  if ( roar_stream_connect_to_ask(con, s, type, file, port) != -1 ) {
 
+  FD_ZERO(&fds);
+  FD_SET(listen, &fds);
+
+  if ( select(listen + 1, &fds, &fds, &fds, &timeout) < 1 ) {
+   close(listen);
+   if ( roar_kick(con, ROAR_OT_STREAM, s->id) == -1 )
+    return -1;
+
+   return -1;
+  }
+
   if ( (fh = accept(listen, NULL, NULL)) != -1 ) {
    if ( dir == ROAR_DIR_PLAY ) {