Changeset 1650:432469c37b16 in roaraudio for libroar/vio_proto.c

Timestamp:

05/05/09 15:19:20 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

got HTTP for non default port working, tool, Defaults based sockets striped everything behind the first colon

File:

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

libroar/vio_proto.c

@@ -74 +74 @@
  if ( ed != NULL )
   *ed = '/';
+
+ ROAR_DBG("roar_vio_proto_init_def(*): dstr='%s'", dstr);
 
  return ret;
@@ -140 +142 @@
  }
 
+ ROAR_DBG("roar_vio_open_proto(*) = -1 // no matching protocol");
  return -1;
 #else
@@ -153 +156 @@
  int  len;
 
+ ROAR_DBG("roar_vio_open_proto_http(calls=%p, dst=%p, host='%s', file='%s') = ?", calls, dst, host, file);
+
  if ( calls == NULL || dst == NULL || host == NULL || file == NULL )
   return -1;
+
+ ROAR_DBG("roar_vio_open_proto_http(calls=%p, dst=%p, host='%s', file='%s') = ?", calls, dst, host, file);
 
  roar_vio_printf(dst, "GET /%s HTTP/1.1\r\n", file);
@@ -162 +169 @@
  roar_vio_printf(dst, "\r\n");
 
+ ROAR_DBG("roar_vio_open_proto_http(*) = ?");
+
  roar_vio_sync(dst);
 
- if ( (len = roar_vio_read(dst, buf, 1023)) < 1 )
-  return -1;
+ ROAR_DBG("roar_vio_open_proto_http(*) = ?");
+
+ if ( (len = roar_vio_read(dst, buf, 1023)) < 1 ) {
+  ROAR_DBG("roar_vio_open_proto_http(*) = -1");
+  return -1;
+ }
 
  buf[len] = 0;
 
+ ROAR_DBG("roar_vio_open_proto_http(*) = ?");
+
  if ( sscanf(buf, "%79s %i %79s\n", b0, &status, b1) != 3 ) {
-  return -1;
- }
-
- if ( status != 200 )
-  return -1;
+  ROAR_DBG("roar_vio_open_proto_http(*) = -1");
+  return -1;
+ }
+
+ ROAR_DBG("roar_vio_open_proto_http(*) = ?");
+
+ if ( status != 200 ) {
+  ROAR_DBG("roar_vio_open_proto_http(*) = -1 // status=%i", status);
+  return -1;
+ }
 
  ROAR_DBG("roar_vio_open_proto_http(*): status=%i", status);