Changeset 6160

Timestamp:

05/14/10 14:20:35 (3 years ago)

Author:

Cyrus

Message:

ustream: Initial featureset complete

Location:

luci2/libustream

Files:

• cli/ustream-cli.c (modified) (6 diffs)
• core.c (modified) (1 diff)
• core.h (modified) (2 diffs)
• encoding.c (added)
• extension/json.c (modified) (1 diff)
• extension/ustream-json.h (deleted)
• protocol/http.c (modified) (3 diffs)
• tls.c (modified) (1 diff)
• uattr.h (added)
• uhtbl.c (modified) (1 diff)
• ustream-encoding.h (added)
• ustream-json.h (added)
• ustream.c (modified) (1 diff)
• ustream.h (modified) (1 diff)

luci2/libustream/cli/ustream-cli.c

@@ +1 @@
+/**
+ *   ustream - Micro URL I/O stream library
+ *   Copyright (C) 2010 Steven Barth <steven@midlink.org>
+ *   Copyright (C) 2010 John Crispin <blogic@openwrt.org>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
 #define _GNU_SOURCE
 #include <ustream.h>
@@ -17 +38 @@
         "Usage: %s [options] [command] url\n\n"
         "Commands:\n"
-        "   get             Open URL for reading (default)\n"
-        "   put             Open URL for writing\n"
-        "   post                Open URL for application call\n"
+        "   get         Open URL for reading (default)\n"
+        "   put         Open URL for writing\n"
+        "   post            Open URL for application call\n"
         "\n\nOptions:\n"
-        "   -A              Aggregate data (for broken HTTP servers)\n"
-        "   -c              Continue transfer (get only)\n"
-        "   -h              Show this help message\n"
-        "   -o <offset>         Set source offset\n"
-        "   -s <size>           Set source size\n"
-        "   -v              Increase verbosity\n"
-        "   -H <key>:<value>        Set header\n"
-        "   -I <path>           Read from source (default: stdin)\n"
-        "   -O <path>           Save to destination (default: stdout)\n",
+        "   -A          Aggregate data (for broken HTTP servers)\n"
+        "   -c          Continue transfer (get only)\n"
+        "   -h          Show this help message\n"
+        "   -o <offset>     Set source offset\n"
+        "   -s <size>       Set source size\n"
+        "   -v          Increase verbosity\n"
+        "   -H <key>:<value>    Set header\n"
+        "   -I <path>       Read from source (default: stdin)\n"
+        "   -O <path>       Save to destination (default: stdout)\n",
         app);
     return 1;
@@ -86 +107 @@
     }
 
-    const char *actstr = argv[1];
+    const char *actstr = argv[optind];
     const char *url = actstr;
     int action = USTREAM_GET;
@@ -92 +113 @@
     if (!strcasecmp(actstr, "put")) {
         action = USTREAM_PUT;
-        url = argv[2];
+        url = argv[optind + 1];
     } else if (!strcasecmp(actstr, "post")) {
         action = USTREAM_POST;
-        url = argv[2];
-    } else if (strcasecmp(actstr, "get") && !strstr(actstr, "://")) {
+        url = argv[optind + 1];
+    } else if (!strcasecmp(actstr, "get")) {
+        action = USTREAM_GET;
+        url = argv[optind + 1];
+    } else if (!strstr(actstr, "://")) {
         return usage(*argv);
     }
@@ -131 +155 @@
             goto error;
         }
+        size = (uint64_t)reqsize;
     }
 
@@ -165 +190 @@
 
     ssize_t rxed;
-    while ((rxed = ustream_read(stream, buffer, sizeof(buffer)))) {
+    while ((rxed = ustream_read(stream, buffer, sizeof(buffer))) > 0) {
         fwrite(buffer, 1, rxed, fpout);
+    }
+    if (rxed < 0) {
+        goto error;
     }
 

luci2/libustream/core.c

@@ -10 +10 @@
 
 static int ustream_io_timeout = 60;
-
-static unsigned char b64encode_tbl[] =
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-USTREAM_LOCAL char* ustream_b64encode(const void *in, size_t len) {
-    size_t lenout, pad, i;
-    const uint8_t *data = (const uint8_t*)in;
-
-    lenout = len / 3;
-    lenout *= 4;
-    pad = len % 3;
-
-    if (len == 0) {
-        return strdup("");
-    } else if (pad) {
-        lenout += 4;
-    }
-
-    char *out = malloc(lenout + 1);
-    if (!out) {
-        return NULL;
-    }
-
-    uint8_t *o = (uint8_t*)out;
-    for (i = 0; i < len; i += 3) {
-        uint32_t cv = (data[i] << 16) | (data[i+1] << 8) | data[i+2];
-        *(o+3) = b64encode_tbl[ cv        & 0x3f];
-        *(o+2) = b64encode_tbl[(cv >> 6)  & 0x3f];
-        *(o+1) = b64encode_tbl[(cv >> 12) & 0x3f];
-        *o     = b64encode_tbl[(cv >> 18) & 0x3f];
-        o += 4;
-    }
-
-    if (pad) {
-        uint32_t cv = data[len-pad] << 16;
-        *(o-1) = '=';
-        *(o-2) = '=';
-        if (pad == 2) {
-            cv |= data[len-pad+1] << 8;
-            *(o-2) = b64encode_tbl[(cv >> 6) & 0x3f];
-        }
-        *(o-3) = b64encode_tbl[(cv >> 12) & 0x3f];
-        *(o-4) = b64encode_tbl[(cv >> 18) & 0x3f];
-    }
-
-    out[lenout] = 0;
-    return out;
-}
 
 USTREAM_LOCAL void ustream_url_parse

luci2/libustream/core.h

@@ -13 +13 @@
 #include <unistd.h>
 
-#define USTREAM_BANNER "ustream by Steven Barth & John Crispin"
+#define USTREAM_BANNER "ustream/luci2 by Steven Barth & John Crispin"
 
 #define USTREAM_DATA_READABLE       0x0001
@@ -63 +63 @@
 USTREAM_LOCAL void ustream_url_parse
 (ustream_t *stream, const char *url, size_t plen);
-USTREAM_LOCAL char* ustream_b64encode(const void *in, size_t len);
 USTREAM_LOCAL int ustream_io_socket (const char *host, const char *service);
 

luci2/libustream/extension/json.c

@@ +1 @@
+/**
+ *   ustream - Micro URL I/O stream library
+ *   Copyright (C) 2010 Steven Barth <steven@midlink.org>
+ *   Copyright (C) 2010 John Crispin <blogic@openwrt.org>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
 #define _GNU_SOURCE
 #include <stdio.h>
 #include <string.h>
-#include <json/json.h>
-#include "ustream-json.h"
-#include "../ustream.h"
+#include "../ustream-json.h"
 
 json_object* ustream_json_post(const char *url, json_object *req) {

luci2/libustream/protocol/http.c

@@ -9 +9 @@
 #include <unistd.h>
 #include "../core.h"
+#include "../ustream-encoding.h"
 
 #define HTTP_FOLLOW_DEFAULT 5
@@ -81 +82 @@
 
     if (stream->auth) {
+        char *auth = ustream_encoding_urldecode(stream->auth, 0);
+        if (!auth) {
+            free(auth);
+            free(http);
+            return -(errno = EINVAL);
+        }
         char buf[256] = "Basic ", *bd;
-        if ((bd = ustream_b64encode(stream->auth, strlen(stream->auth)))) {
+        size_t authlen = strlen(auth);
+        if ((bd = ustream_encoding_b64encode(auth, &authlen))) {
             strncat(buf, bd, sizeof(buf) - strlen(buf) - 1);
             free(bd);
             ustream_uhtbl_set(&http->header, "Authorization", buf, strlen(buf));
         }
+        free(auth);
     }
 
@@ -533 +542 @@
                 len -= sendc;
                 buf = (char*)buf + sendc;
-                if ((http->chunkremain -= sendc) == 0) {
+                if ((stream->status & HTTP_WRITE_CHUNKED)
+                && (http->chunkremain -= sendc) == 0) {
                     fputs("\r\n", http->transport);
                 }

luci2/libustream/tls.c

@@ +1 @@
+/**
+ *   ustream - Micro URL I/O stream library
+ *   Copyright (C) 2010 Steven Barth <steven@midlink.org>
+ *   Copyright (C) 2010 John Crispin <blogic@openwrt.org>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
 #define _GNU_SOURCE
 #include "core.h"

luci2/libustream/uhtbl.c

@@ +1 @@
+/**
+ *   ustream - Micro URL I/O stream library
+ *   Copyright (C) 2010 Steven Barth <steven@midlink.org>
+ *   Copyright (C) 2010 John Crispin <blogic@openwrt.org>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
 #include <stdlib.h>
 #include <string.h>

luci2/libustream/ustream.c

@@ +1 @@
+/**
+ *   ustream - Micro URL I/O stream library
+ *   Copyright (C) 2010 Steven Barth <steven@midlink.org>
+ *   Copyright (C) 2010 John Crispin <blogic@openwrt.org>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
 #include <stdint.h>
 #include <stdio.h>

luci2/libustream/ustream.h

@@ +1 @@
+/**
+ *   ustream - Micro URL I/O stream library
+ *   Copyright (C) 2010 Steven Barth <steven@midlink.org>
+ *   Copyright (C) 2010 John Crispin <blogic@openwrt.org>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
 #ifndef USTREAM_H_
 #define USTREAM_H_