Changeset 3067:b395e36e014a in roaraudio for libroar/vio_proto.c

Timestamp:

12/28/09 01:24:41 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

rewrote most of the HTTP code for new API, still does not work with shoutcast

File:

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

libroar/vio_proto.c

@@ -187 +187 @@
  if ( count == 0 )
   return have;
+
+ ROAR_DBG("roar_vio_proto_read(*): have=%lli, count=%lli", (long long int)have, (long long int)count);
 
  if ( (ret = roar_vio_read(self->next, buf, count)) == -1 )
@@ -253 +255 @@
 
 int roar_vio_open_proto_http   (struct roar_vio_calls * calls, struct roar_vio_calls * dst, char * host, char * file) {
- char buf[1024];
+ struct roar_vio_proto * self;
+ struct roar_buffer * bufbuf;
+ char * buf;
+ char * endofheader = NULL;
  char b0[80], b1[80];
  int  status;
@@ -263 +268 @@
   return -1;
 
+ self         = calls->inst;
  calls->write = NULL; // Disable write as we do not support this
+
+ if ( roar_buffer_new(&bufbuf, 1024) == -1 )
+  return -1;
+
+ if ( roar_buffer_get_data(bufbuf, &buf) == -1 ) {
+  roar_buffer_free(bufbuf);
+  return -1;
+ }
 
  ROAR_DBG("roar_vio_open_proto_http(calls=%p, dst=%p, host='%s', file='%s') = ?", calls, dst, host, file);
@@ -281 +295 @@
  if ( (len = roar_vio_read(dst, buf, 1023)) < 1 ) {
   ROAR_DBG("roar_vio_open_proto_http(*) = -1");
+  roar_buffer_free(bufbuf);
   return -1;
  }
@@ -290 +305 @@
  if ( sscanf(buf, "%79s %i %79s\n", b0, &status, b1) != 3 ) {
   ROAR_DBG("roar_vio_open_proto_http(*) = -1");
+  roar_buffer_free(bufbuf);
   return -1;
  }
@@ -297 +313 @@
  if ( status != 200 ) {
   ROAR_DBG("roar_vio_open_proto_http(*) = -1 // status=%i", status);
+  roar_buffer_free(bufbuf);
   return -1;
  }
@@ -303 +320 @@
 // ROAR_WARN("roar_vio_open_proto_http(*): buf='%s'", buf);
 
+ endofheader = strstr(buf, "\r\n\r\n");
+
+ ROAR_DBG("roar_vio_open_proto_http(*): endofheader=%p\n", endofheader);
+
+ while ( endofheader == NULL ) {
+  if ( (len = roar_vio_read(dst, buf, 1023)) < 1 )
+   return -1;
+
+  buf[len] = 0;
+  endofheader = strstr(buf, "\r\n\r\n");
+  ROAR_DBG("roar_vio_open_proto_http(*): endofheader=%p\n", endofheader);
+ }
+
+ ROAR_DBG("roar_vio_open_proto_http(*): endofheader=%p\n", endofheader);
+ ROAR_DBG("roar_vio_open_proto_http(*): buf=%p\n", buf);
+
+ if ( (endofheader - buf) == (len - 4) ) {
+  roar_buffer_free(bufbuf);
+  bufbuf = NULL;
+ }
+
+ if ( bufbuf != NULL ) {
+  roar_buffer_set_offset(bufbuf, endofheader - buf + 4);
+  roar_buffer_set_len(bufbuf,    1024 - (endofheader - buf + 4) - 1);
+ }
+ self->reader.buffer = bufbuf;
+
+/*
  if ( !strcmp((buf+len)-4, "\r\n\r\n") )
   return 0;
@@ -310 +355 @@
    return -1;
  }
+*/
 
  return 0;