Changeset 1353:d3fff5536a2e in roaraudio for libroar/vio_proto.c

Timestamp:

03/23/09 19:52:54 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

we need to set access modes and init next->def in case of sockets, got tcp:...##gopher:##file:... working :)

File:

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

libroar/vio_proto.c

@@ -50 +50 @@
  }
 
+ if ( dstr == NULL )
+  dstr = "//";
+
  if ( roar_vio_dstr_init_defaults(def, ROAR_VIO_DEF_TYPE_SOCKET, O_RDWR, 0644) == -1 )
   return -1;
@@ -62 +65 @@
   *ed = 0;
 
+ ROAR_WARN("roar_vio_proto_init_def(*): def->o_flags=%i", def->o_flags);
+
  ret = roar_vio_socket_init_dstr_def(def, dstr, -1, SOCK_STREAM, def);
+
+ ROAR_WARN("roar_vio_proto_init_def(*): def->o_flags=%i", def->o_flags);
 
  if ( ed != NULL )
@@ -77 +84 @@
  ROAR_WARN("roar_vio_open_proto(calls=%p, dst=%p, dstr='%s', proto=%i, odef=%p) = ?", calls, dst, dstr, proto, odef);
 
- if ( calls == NULL || dst == NULL || dstr == NULL )
+ if ( calls == NULL || dst == NULL || odef == NULL )
   return -1;
 
+ ROAR_WARN("roar_vio_open_proto(*): odef->o_flags=%i", odef->o_flags);
  ROAR_DBG("roar_vio_open_proto(*) = ?");
 
@@ -85 +93 @@
   return -1;
 
- dstr += 2;
- host  = dstr;
+ ROAR_DBG("roar_vio_open_proto(*) = ?");
 
- if ( (tmp = strstr(dstr, "/")) == NULL )
-  return -1;
+ if ( dstr != NULL ) {
+  dstr += 2;
+  host  = dstr;
 
- *tmp++ = 0;
- dstr   = tmp;
+  if ( (tmp = strstr(dstr, "/")) == NULL )
+   return -1;
 
- if ( (tmp = strstr(dstr, "#")) != NULL )
-  *tmp = 0;
+  *tmp++ = 0;
+  dstr   = tmp;
+
+  if ( (tmp = strstr(dstr, "#")) != NULL )
+   *tmp = 0;
+ } else {
+  ROAR_DBG("roar_vio_open_proto(*): no dstr!, odef->type=%i", odef->type);
+  if ( odef->type == ROAR_VIO_DEF_TYPE_FILE ) {
+   dstr = odef->d.file;
+   host = "localhost";
+
+   for (; *dstr == '/'; dstr++);
+
+  } else if ( odef->type == ROAR_VIO_DEF_TYPE_SOCKET ) {
+   dstr = ""; // index document
+   host = odef->d.socket.host;
+  } else {
+   return -1;
+  }
+ }
 
  ROAR_DBG("roar_vio_open_proto(*) = ?");
+ ROAR_WARN("roar_vio_open_proto(*): proto=%i, host='%s', file='%s'", proto, host, dstr);
 
  switch (proto) {