Changeset 1337:133222591226 in roaraudio

Timestamp:

03/23/09 14:26:01 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support sockets with no dst to use defaults from parent object

Location:

libroar

Files:

• vio_dstr.c (modified) (3 diffs)
• vio_socket.c (modified) (4 diffs)

libroar/vio_dstr.c

@@ -430 +430 @@
      next->def->d.fh = tmp[1];
     break;
+#ifdef ROAR_HAVE_UNIX
    case ROAR_VIO_DSTR_OBJT_UNIX:
      c->need_vio = 0;
      next->def = &(next->store_def);
 
-     if ( c->def != NULL ) {
-      roar_vio_dstr_init_defaults(next->def, ROAR_VIO_DEF_TYPE_SOCKET, c->def->o_flags, c->def->o_mode);
-     } else {
-      roar_vio_dstr_init_defaults(next->def, ROAR_VIO_DEF_TYPE_SOCKET, O_WRONLY, 0644);
+     if ( c->dst == NULL ) { // we don't have a destination? -> slow way
+      if ( roar_vio_socket_init_dstr_def(next->def, c->dst, AF_UNIX, SOCK_STREAM, c->def) == -1 )
+       return -1;
+     } else {                // we have a destination? -> fast way
+      if ( c->def != NULL ) {
+       roar_vio_dstr_init_defaults(next->def, ROAR_VIO_DEF_TYPE_SOCKET, c->def->o_flags, c->def->o_mode);
+      } else {
+       roar_vio_dstr_init_defaults(next->def, ROAR_VIO_DEF_TYPE_SOCKET, O_WRONLY, 0644);
+      }
+
+      if ( roar_vio_socket_init_unix_def(next->def, c->dst) == -1 )
+       return -1;
      }
-
-     if ( roar_vio_socket_init_unix_def(next->def, c->dst) == -1 )
-      return -1;
-    break;
+    break;
+#endif
    case ROAR_VIO_DSTR_OBJT_SOCKET:
      c->need_vio = 0;
@@ -532 +539 @@
   }
 
+  if ( roar_vio_init_calls(tc) == -1 ) {
+   free(tc);
+   _ret(-1);
+  }
+
   if ( roar_vio_stack_add(calls, tc) == -1 ) {
    _ret(-1);
@@ -548 +560 @@
   if ( c->need_vio ) {
    if ( (tc = malloc(sizeof(struct roar_vio_calls))) == NULL ) {
+    _ret(-1);
+   }
+
+   if ( roar_vio_init_calls(tc) == -1 ) {
+    free(tc);
     _ret(-1);
    }

libroar/vio_socket.c

@@ -152 +152 @@
  int    port;
 
- if ( def == NULL || dstr == NULL )
-  return -1;
+ if ( def == NULL )
+  return -1;
+
+ if ( dstr == NULL && odef == NULL )
+  return -1;
+
+ if ( dstr == NULL )
+  dstr = "";
 
  ROAR_WARN("roar_vio_socket_init_dstr_def(def=%p, dstr='%s', hint=%i, type=%i, odef=%p) = ?", def, dstr, hint, type, odef);
@@ -203 +209 @@
 #endif
 
+ if ( *dstr == 0 ) {
+  if ( roar_vio_socket_conv_def(odef, hint) == -1 )
+   return -1;
+
+  if ( odef->d.socket.type != type )
+   return -1;
+
+  memcpy(def, odef, sizeof(struct roar_vio_defaults));
+  return 0;
+ }
+
  for (; *dstr == '/'; dstr++);
 
@@ -246 +263 @@
 
 int     roar_vio_socket_conv_def          (struct roar_vio_defaults * def, int domain) {
+ if ( def == NULL || domain == -1 )
+  return -1;
+
+#ifdef ROAR_HAVE_UNIX
+ if ( domain == AF_UNIX ) {
+  if ( def->type == ROAR_VIO_DEF_TYPE_SOCKET ) {
+   if ( def->d.socket.domain == AF_UNIX )
+    return 0;
+
+   return -1;
+  } else {
+   return -1;
+  }
+ }
+#endif
+
+ if ( def->type != ROAR_VIO_DEF_TYPE_SOCKET )
+  return -1;
+
+ if ( def->d.socket.domain == domain )
+  return 0;
+
  return -1;
 }
@@ -260 +299 @@
 int     roar_vio_socket_init_unix_def     (struct roar_vio_defaults * def, char * path) {
 #ifdef ROAR_HAVE_UNIX
+ if ( def == NULL || path == NULL )
+  return -1;
+
  if ( roar_vio_socket_init_socket_def(def, AF_UNIX, SOCK_STREAM) == -1 )
   return -1;