[vlc-commits] http: add HTTP PUT helper API
Rémi Denis-Courmont
git at videolan.org
Sun Oct 4 16:19:25 CEST 2020
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Oct 4 17:14:03 2020 +0300| [258cceac113dfd5b280d884b5dca7a3b29d6d4e3] | committer: Rémi Denis-Courmont
http: add HTTP PUT helper API
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=258cceac113dfd5b280d884b5dca7a3b29d6d4e3
---
modules/access/http/Makefile.am | 1 +
modules/access/http/outfile.c | 129 ++++++++++++++++++++++++++++++++++++++++
modules/access/http/outfile.h | 53 +++++++++++++++++
3 files changed, 183 insertions(+)
diff --git a/modules/access/http/Makefile.am b/modules/access/http/Makefile.am
index 8054457b6c..7a34091a19 100644
--- a/modules/access/http/Makefile.am
+++ b/modules/access/http/Makefile.am
@@ -8,6 +8,7 @@ libvlc_http_la_SOURCES = \
access/http/resource.c access/http/resource.h \
access/http/file.c access/http/file.h \
access/http/live.c access/http/live.h \
+ access/http/outfile.c access/http/outfile.h \
access/http/hpack.c access/http/hpack.h access/http/hpackenc.c \
access/http/h2frame.c access/http/h2frame.h \
access/http/h2output.c access/http/h2output.h \
diff --git a/modules/access/http/outfile.c b/modules/access/http/outfile.c
new file mode 100644
index 0000000000..c3ed29c526
--- /dev/null
+++ b/modules/access/http/outfile.c
@@ -0,0 +1,129 @@
+/*****************************************************************************
+ * resource.c: HTTP resource common code
+ *****************************************************************************
+ * Copyright (C) 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 <errno.h>
+#include <stdbool.h>
+#include <stdlib.h>
+
+#include <vlc_common.h>
+#include <vlc_url.h>
+#include <vlc_strings.h>
+#include "message.h"
+#include "connmgr.h"
+#include "outfile.h"
+
+struct vlc_http_outfile *vlc_http_outfile_create(struct vlc_http_mgr *mgr,
+ const char *uri, const char *ua, const char *user, const char *pwd)
+{
+ struct vlc_http_msg *resp;
+ vlc_url_t url;
+ bool secure;
+
+ if (vlc_UrlParse(&url, uri))
+ goto error;
+ if (url.psz_protocol == NULL || url.psz_host == NULL)
+ {
+ errno = EINVAL;
+ goto error;
+ }
+
+ if (!vlc_ascii_strcasecmp(url.psz_protocol, "https"))
+ secure = true;
+ else if (!vlc_ascii_strcasecmp(url.psz_protocol, "http"))
+ secure = false;
+ else
+ {
+ errno = ENOTSUP;
+ goto error;
+ }
+
+ char *authority = vlc_http_authority(url.psz_host, url.i_port);
+ if (unlikely(authority == NULL))
+ goto error;
+
+ struct vlc_http_msg *req = vlc_http_req_create("PUT", url.psz_protocol,
+ authority, url.psz_path);
+ free(authority);
+ if (unlikely(req == NULL))
+ goto error;
+
+ vlc_http_msg_add_header(req, "Expect", "100-continue");
+
+ if (user != NULL && pwd != NULL)
+ vlc_http_msg_add_creds_basic(req, false, user, pwd);
+ if (ua != NULL)
+ vlc_http_msg_add_agent(req, ua);
+
+ vlc_http_msg_add_cookies(req, vlc_http_mgr_get_jar(mgr));
+
+ resp = vlc_http_mgr_request(mgr, secure, url.psz_host, url.i_port, req,
+ false, true);
+ vlc_http_msg_destroy(req);
+ if (resp == NULL)
+ goto error;
+
+ int status = vlc_http_msg_get_status(resp);
+
+ /* FIXME: check that HTTP version >= 1.1 */
+
+ if (status < 100 || status >= 200)
+ {
+ vlc_http_msg_destroy(resp);
+ resp = NULL;
+ }
+
+error:
+ vlc_UrlClean(&url);
+ return (struct vlc_http_outfile *)resp;
+}
+
+ssize_t vlc_http_outfile_write(struct vlc_http_outfile *f, block_t *b)
+{
+ struct vlc_http_msg *msg = (struct vlc_http_msg *)f;
+
+ return vlc_http_msg_write(msg, b, false);
+}
+
+int vlc_http_outfile_close(struct vlc_http_outfile *f)
+{
+ struct vlc_http_msg *msg = (struct vlc_http_msg *)f;
+ int ret = vlc_http_msg_write(msg, NULL, true);
+
+ if (ret < 0)
+ {
+ vlc_http_msg_destroy(msg);
+ return -1;
+ }
+
+ msg = vlc_http_msg_iterate(msg);
+ if (msg == NULL)
+ return -1;
+
+ int status = vlc_http_msg_get_status(msg);
+
+ /* TODO: store cookies? */
+ vlc_http_msg_destroy(msg);
+
+ return (status >= 200 && status < 300) ? 0 : -1;
+}
diff --git a/modules/access/http/outfile.h b/modules/access/http/outfile.h
new file mode 100644
index 0000000000..981a0ae746
--- /dev/null
+++ b/modules/access/http/outfile.h
@@ -0,0 +1,53 @@
+/*****************************************************************************
+ * outfile.h: HTTP write-only file
+ *****************************************************************************
+ * Copyright (C) 2015, 2020 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.
+ *****************************************************************************/
+
+#include <stdint.h>
+
+/**
+ * \defgroup http_outfile Output files
+ * HTTP write-only files
+ * \ingroup http
+ * @{
+ */
+
+struct vlc_http_mgr;
+struct vlc_http_outfile;
+struct block_t;
+
+/**
+ * Creates an HTTP output file.
+ *
+ * @param url URL of the file to write
+ * @param ua user-agent string (NULL to ignore)
+ * @param user username for authentication (NULL to skip)
+ * @param pwd password for authentication (NULL to skip)
+ *
+ * @return an HTTP resource object pointer, or NULL on error
+ */
+struct vlc_http_outfile *vlc_http_outfile_create(struct vlc_http_mgr *mgr,
+ const char *url, const char *ua, const char *user, const char *pwd);
+
+/**
+ * Writes data.
+ */
+ssize_t vlc_http_outfile_write(struct vlc_http_outfile *, block_t *b);
+int vlc_http_outfile_close(struct vlc_http_outfile *);
+
+/** @} */
More information about the vlc-commits
mailing list