Changeset 6139

Timestamp:

04/29/10 20:19:21 (3 years ago)

Author:

Cyrus

Message:

ustream: More stuff, first net code

Location:

luci2

Files:

• libustream/core.h (modified) (2 diffs)
• libustream/io.c (added)
• libustream/ustream.c (modified) (1 diff)
• zhttpd/tcp.c (modified) (1 diff)

luci2/libustream/core.h

@@ -37 +37 @@
     int action;
     int status;
+    int fd[2];
+    FILE *fp[2];
     ustream_state_cb *state;
     void *data;
@@ -52 +54 @@
 USTREAM_LOCAL int ustream_meta_set
 (ustream_t *stream, const char *key, const char *value, size_t len);
+USTREAM_LOCAL int ustream_io_socket(const char *host, const char *service);
 
 #define USTREAM_HANDLER(name, handler) \

luci2/libustream/ustream.c

@@ -30 +30 @@
     memcpy(stream->url, url, strlen(url) + 1);
     char *c = stream->url + plen + 3;
+    url = c;
 
-    /* TODO: URL splitting */
+    if (!(c = strchr(url, '/'))) {
+        goto error;
+    }
+    *c = 0;
+    stream->path = c + 1;
+
+    if ((c = strchr(url, '@')) && c < stream->path) {
+        stream->auth = url;
+        *c = 0;
+        url = c + 1;
+    }
+
+    stream->host = url;
+    if ((c = strchr(url, ':')) && c < stream->path) {
+        stream->port = c + 1;
+        *c = 0;
+    }
 
     if (handler->entry(stream)) {
-        ustream_destroy(stream);
-        return NULL;
+        goto error;
     }
     return stream;
+
+    error:
+    ustream_destroy(stream);
+    return NULL;
 }
 

luci2/zhttpd/tcp.c

@@ -257 +257 @@
 /* Create TCP socket */
 static int zhttpd_tcp_server_socket(const char *host, const char *service) {
-    struct addrinfo hints, *result, *rp;
+    struct addrinfo *result, *rp;
     int sock = -1, clstat;
 
-    memset(&hints, 0, sizeof(hints));
-    hints.ai_family = AF_UNSPEC;
-    hints.ai_socktype = SOCK_STREAM;
-    hints.ai_flags = AI_PASSIVE;
-    hints.ai_protocol = 0;
+    struct addrinfo hints = {
+        .ai_family = AF_UNSPEC,
+        .ai_socktype = SOCK_STREAM,
+        .ai_flags = AI_PASSIVE
+    };
 
     if (getaddrinfo(host, service, &hints, &result)) {