Changeset 3293:f8b44412b38d in roaraudio

Timestamp:

02/01/10 21:32:50 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support for listen sockets

Location:

libroar

Files:

• vio_dstr.c (modified) (1 diff)
• vio_socket.c (modified) (2 diffs)

libroar/vio_dstr.c

@@ -204 +204 @@
    break;
   case ROAR_VIO_DEF_TYPE_SOCKET:
-     if ( roar_vio_open_def_socket(calls, def) == -1 )
+     if ( roar_vio_open_def_socket(calls, def, opts) == -1 )
       return -1;
    break;

libroar/vio_socket.c

@@ -39 +39 @@
 #endif
 
-int     roar_vio_open_def_socket          (struct roar_vio_calls * calls, struct roar_vio_defaults * def) {
+int     roar_vio_open_def_socket          (struct roar_vio_calls * calls, struct roar_vio_defaults * def, char * opts) {
 #ifdef _CAN_OPERATE
  int       fh  = -1;
  socklen_t len =  0;
+ int       listening  = 0;
+ int       one_client = 0;
+ int       client;
 
  if ( calls == NULL || def == NULL )
   return -1;
+
+ if ( opts != NULL ) {
+  if ( strstr(opts, "listen") != NULL ) {
+   listening  = 1;
+   one_client = 1;
+  }
+ }
 
  if ( def->type != ROAR_VIO_DEF_TYPE_SOCKET )
@@ -132 +142 @@
   return -1;
 
- if ( connect(fh, &(def->d.socket.sa.sa), len) == -1 ) {
-  close(fh);
-  return -1;
+ if ( listening ) {
+  if ( bind(fh, &(def->d.socket.sa.sa), len) == -1 ) {
+   close(fh);
+   return -1;
+  }
+
+  if ( listen(fh, one_client ? 1 : 16) == -1 ) {
+   close(fh);
+   return -1;
+  }
+
+  if ( one_client ) {
+   client = accept(fh, NULL, NULL);
+   close(fh);
+
+   if ( client == -1 ) {
+    return -1;
+   }
+
+   fh = client;
+  }
+ } else {
+  if ( connect(fh, &(def->d.socket.sa.sa), len) == -1 ) {
+   close(fh);
+   return -1;
+  }
  }