HTTP/1 connection handler

modules/access/http/Makefile.am

@@ -10,7 +10,7 @@ libvlc_http_la_SOURCES = \
 	access/http/h2frame.c access/http/h2frame.h \
 	access/http/h2output.c access/http/h2output.h \
 	access/http/h2conn.c access/http/h2conn.h \
-	access/http/h1conn.h access/http/chunked.c \
+	access/http/h1conn.c access/http/h1conn.h access/http/chunked.c \
 	access/http/connmgr.c access/http/connmgr.h
 libvlc_http_la_CPPFLAGS = -Dneedsomethinghere
 libvlc_http_la_LIBADD = \

modules/access/http/connmgr.c

@@ -27,6 +27,7 @@
 #include <vlc_tls.h>
 #include <vlc_interrupt.h>
 #include "transport.h"
+#include "h1conn.h"
 #include "h2conn.h"
 #include "connmgr.h"
 #include "message.h"
@@ -133,8 +134,7 @@ struct vlc_http_msg *vlc_https_request_reuse(struct vlc_http_mgr *mgr,
     struct vlc_h1_conn *conn1 = vlc_h1_conn_find(mgr, host, port);
     if (conn1 != NULL)
     {
-#if 0
-        struct vlc_http_stream *s = vlc_h1_stream_open(conn2, req);
+        struct vlc_http_stream *s = vlc_h1_stream_open(conn1, req);
         if (s != NULL)
         {
             struct vlc_http_msg *m = vlc_http_stream_read_headers(s);
@@ -144,24 +144,11 @@ struct vlc_http_msg *vlc_https_request_reuse(struct vlc_http_mgr *mgr,
             vlc_http_stream_close(s, false);
         }
         vlc_h1_conn_release(conn1);
-#endif
         mgr->conn1 = NULL;
     }
     return NULL;
 }
 
-static struct vlc_h1_conn *vlc_h1_conn_create(vlc_tls_t *tls)
-{
-    msg_Err(tls, "HTTP/2 not supported, HTTP/1 not implemented");
-    return NULL;
-}
-
-static void vlc_h1_conn_release(struct vlc_h1_conn *conn)
-{
-    (void) conn;
-    vlc_assert_unreachable();
-}
-
 struct vlc_http_msg *vlc_https_request(struct vlc_http_mgr *mgr,
                                        const char *host, unsigned port,
                                        const struct vlc_http_msg *req)

modules/access/http/h1conn.c

+/*****************************************************************************
+ * h1conn.c: HTTP 1.x connection handling
+ *****************************************************************************
+ * Copyright © 2015 Rémi Denis-Courmont
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <assert.h>
+#include <inttypes.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <vlc_common.h>
+#include <vlc_tls.h>
+#include <vlc_block.h>
+
+#include "h1conn.h"
+#include "message.h"
+#include "transport.h"
+
+static unsigned vlc_http_can_read(const char *buf, size_t len)
+{
+    static const char end[4] = { '\r', '\n', '\r', '\n' };
+
+    for (unsigned i = 4; i > 0; i--)
+        if (len >= i && !memcmp(buf + len - i, end, i))
+            return 4 - i;
+    return 4;
+}
+
+/**
+ * Receives HTTP headers.
+ *
+ * Receives HTTP 1.x response line and headers.
+ *
+ * @return A heap-allocated null-terminated string contained the full
+ * headers, including the final CRLF.
+ */
+static char *vlc_https_headers_recv(struct vlc_tls *tls, size_t *restrict lenp)
+{
+    size_t size = 0, len = 0, canread;
+    char *buf = NULL;
+
+    while ((canread = vlc_http_can_read(buf, len)) > 0)
+    {
+        ssize_t val;
+
+        if (len + canread >= size)
+        {
+            size += 2048;
+            if (size > 65536)
+                goto fail;
+
+            char *newbuf = realloc(buf, size);
+            if (unlikely(newbuf == NULL))
+                goto fail;
+
+            buf = newbuf;
+        }
+
+        assert(size - len >= canread);
+        //vlc_cleanup_push(free, buf);
+        val = vlc_tls_Read(tls, buf + len, canread, true);
+        //vlc_cleanup_pop();
+
+        if (val != (ssize_t)canread)
+            goto fail;
+
+        len += val;
+    }
+
+    assert(size - len >= 1);
+    buf[len] = '\0'; /* for convenience */
+    if (lenp != NULL)
+        *lenp = len;
+    return buf;
+fail:
+    free(buf);
+    return NULL;
+}
+
+/** Gets minor HTTP version */
+static int vlc_http_minor(const char *msg)
+{
+    int minor;
+
+    if (sscanf(msg, "HTTP/1.%1d", &minor) == 1)
+        return minor;
+    return -1;
+}
+
+struct vlc_h1_conn
+{
+    struct vlc_http_stream stream;
+    struct vlc_tls *tls;
+    uintmax_t content_length;
+    bool connection_close;
+    bool active;
+    bool released;
+};
+
+#define CO(conn) ((vlc_object_t *)((conn)->tls))
+
+static void vlc_h1_conn_destroy(struct vlc_h1_conn *conn);
+
+static void *vlc_h1_stream_fatal(struct vlc_h1_conn *conn)
+{
+    msg_Dbg(conn->tls, "connection failed");
+    vlc_https_disconnect(conn->tls);
+    conn->tls = NULL;
+    return NULL;
+}
+
+static_assert(offsetof(struct vlc_h1_conn, stream) == 0, "Cast error");
+
+struct vlc_http_stream *vlc_h1_stream_open(struct vlc_h1_conn *conn,
+                                           const struct vlc_http_msg *req)
+{
+    size_t len;
+    ssize_t val;
+
+    if (conn->active || conn->tls == NULL)
+        return NULL;
+
+    char *payload = vlc_http_msg_format(req, &len);
+    if (unlikely(payload == NULL))
+        return NULL;
+
+    msg_Dbg(CO(conn), "outgoing request:\n%.*s", (int)len, payload);
+    val = vlc_tls_Write(conn->tls, payload, len);
+    free(payload);
+
+    if (val < (ssize_t)len)
+        return vlc_h1_stream_fatal(conn);
+
+    conn->active = true;
+    conn->content_length = 0;
+    conn->connection_close = false;
+    return &conn->stream;
+}
+
+static struct vlc_http_msg *vlc_h1_stream_wait(struct vlc_http_stream *stream)
+{
+    struct vlc_h1_conn *conn = (struct vlc_h1_conn *)stream;
+    struct vlc_http_msg *resp;
+    size_t len;
+    int minor;
+
+    char *payload = vlc_https_headers_recv(conn->tls, &len);
+    if (payload == NULL)
+        return vlc_h1_stream_fatal(conn);
+
+    msg_Dbg(CO(conn), "incoming response:\n%.*s", (int)len, payload);
+
+    resp = vlc_http_msg_headers(payload);
+    minor = vlc_http_minor(payload);
+    free(payload);
+
+    if (resp == NULL)
+        return NULL;
+
+    assert(minor >= 0);
+
+    conn->content_length = vlc_http_msg_get_size(resp);
+    conn->connection_close = false;
+
+    if (minor >= 1)
+    {
+        const char *str = vlc_http_msg_get_header(resp, "Connection");
+        if (str != NULL && strcasestr(str, "close")) /* FIXME: tokenize */
+            conn->connection_close = true;
+
+        /* FIXME: tokenize, check if chunked is _last_ */
+        str = vlc_http_msg_get_header(resp, "Transfer-Encoding");
+        if ((str != NULL) && strcasestr(str, "chunked"))
+        {
+            assert(conn->content_length == UINTMAX_MAX);
+            stream = vlc_chunked_open(stream, conn->tls);
+            if (unlikely(stream == NULL))
+                return NULL;
+        }
+    }
+    else
+        conn->connection_close = true;
+
+    vlc_http_msg_attach(resp, stream);
+    return resp;
+}
+
+static block_t *vlc_h1_stream_read(struct vlc_http_stream *stream)
+{
+    struct vlc_h1_conn *conn = (struct vlc_h1_conn *)stream;
+    size_t size = 2048;
+
+    if (size > conn->content_length)
+        size = conn->content_length;
+    if (size == 0)
+        return NULL;
+
+    block_t *block = block_Alloc(size);
+    if (unlikely(block == NULL))
+        return NULL;
+
+    ssize_t val = vlc_tls_Read(conn->tls, block->p_buffer, size, false);
+    if (val <= 0)
+    {
+        block_Release(block);
+        return NULL;
+    }
+
+    block->i_buffer = val;
+    if (conn->content_length != UINTMAX_MAX)
+        conn->content_length -= val;
+
+    return block;
+}
+
+static void vlc_h1_stream_close(struct vlc_http_stream *stream, bool abort)
+{
+    struct vlc_h1_conn *conn = (struct vlc_h1_conn *)stream;
+
+    assert(conn->active);
+    conn->active = false;
+
+    if (abort)
+    {
+        vlc_https_disconnect(conn->tls);
+        conn->tls = NULL;
+    }
+
+    if (conn->released)
+        vlc_h1_conn_destroy(conn);
+}
+
+static struct vlc_http_stream_cbs vlc_h1_stream_callbacks =
+{
+    vlc_h1_stream_wait,
+    vlc_h1_stream_read,
+    vlc_h1_stream_close,
+};
+
+struct vlc_h1_conn *vlc_h1_conn_create(vlc_tls_t *tls)
+{
+    struct vlc_h1_conn *conn = malloc(sizeof (*conn));
+    if (unlikely(conn == NULL))
+        return NULL;
+
+    conn->stream.cbs = &vlc_h1_stream_callbacks;
+    conn->tls = tls;
+    conn->active = false;
+    conn->released = false;
+
+    return conn;
+}
+
+static void vlc_h1_conn_destroy(struct vlc_h1_conn *conn)
+{
+    assert(!conn->active);
+    assert(conn->released);
+
+    if (conn->tls != NULL)
+        vlc_https_disconnect(conn->tls);
+    free(conn);
+}
+
+void vlc_h1_conn_release(struct vlc_h1_conn *conn)
+{
+    assert(!conn->released);
+    conn->released = true;
+
+    if (!conn->active)
+        vlc_h1_conn_destroy(conn);
+}

modules/access/http/h1conn.h

@@ -18,8 +18,16 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+struct vlc_h1_conn;
+struct vlc_http_msg;
 struct vlc_http_stream;
 struct vlc_tls;
 
+struct vlc_h1_conn *vlc_h1_conn_create(struct vlc_tls *);
+void vlc_h1_conn_release(struct vlc_h1_conn *);
+
+struct vlc_http_stream *vlc_h1_stream_open(struct vlc_h1_conn *conn,
+                                           const struct vlc_http_msg *req);
+
 struct vlc_http_stream *vlc_chunked_open(struct vlc_http_stream *,
                                          struct vlc_tls *);

modules/access/http/message.c

@@ -240,13 +240,13 @@ char *vlc_http_msg_format(const struct vlc_http_msg *m, size_t *restrict lenp)
 
     if (m->status < 0)
     {
-        len = sizeof ("  HTTP/1.1\r\nHost: \r\nConnection: close\r\n\r\n");
+        len = sizeof ("  HTTP/1.1\r\nHost: \r\n\r\n");
         len += strlen(m->method);
         len += strlen(m->path ? m->path : m->authority);
         len += strlen(m->authority);
     }
     else
-        len = sizeof ("HTTP/1.1 123 .\r\nConnection: close\r\n\r\n");
+        len = sizeof ("HTTP/1.1 123 .\r\n\r\n");
 
     for (unsigned i = 0; i < m->count; i++)
         len += 4 + strlen(m->headers[i][0]) + strlen(m->headers[i][1]);
@@ -267,7 +267,7 @@ char *vlc_http_msg_format(const struct vlc_http_msg *m, size_t *restrict lenp)
         len += sprintf(buf + len, "%s: %s\r\n",
                        m->headers[i][0], m->headers[i][1]);
 
-    len += sprintf(buf + len, "Connection: close\r\n\r\n");
+    len += sprintf(buf + len, "\r\n");
     if (lenp != NULL)
         *lenp = len;
     return buf;