uclient-http: send correct "Host:" header if port is set

[project/uclient.git] / uclient-http.c

diff --git a/uclient-http.c b/uclient-http.c
index 5e5f9961e20d6ffc56de980123f1e2d35862c53a..8d26bd4884be11d06b8c7913ad31f159eaa60c3a 100644 (file)
--- a/uclient-http.c
+++ b/uclient-http.c
@@ -15,6 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#include <sys/socket.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <unistd.h>
@@ -90,6 +91,8 @@ struct uclient_http {
        long read_chunked;
        long content_length;
 
+       int usock_flags;
+
        uint32_t nc;
 
        struct blob_buf headers;
@@ -120,7 +123,9 @@ static int uclient_do_connect(struct uclient_http *uh, const char *port)
 
        memset(&uh->uc.remote_addr, 0, sizeof(uh->uc.remote_addr));
 
-       fd = usock_inet(USOCK_TCP, uh->uc.url->host, port, &uh->uc.remote_addr);
+       fd = usock_inet_timeout(USOCK_TCP | USOCK_NONBLOCK | uh->usock_flags,
+                               uh->uc.url->host, port, &uh->uc.remote_addr,
+                               uh->uc.timeout_msecs);
        if (fd < 0)
                return -1;
 
@@ -281,6 +286,18 @@ static void uclient_http_process_headers(struct uclient_http *uh)
        uh->auth_type = uclient_http_update_auth_type(uh);
 }
 
+static bool uclient_request_supports_body(enum request_type req_type)
+{
+       switch (req_type) {
+       case REQ_POST:
+       case REQ_PUT:
+       case REQ_DELETE:
+               return true;
+       default:
+               return false;
+       }
+}
+
 static void
 uclient_http_add_auth_basic(struct uclient_http *uh)
 {
@@ -552,14 +569,16 @@ uclient_http_send_headers(struct uclient_http *uh)
 
        ustream_printf(uh->us,
                "%s %s HTTP/1.1\r\n"
-               "Host: %s\r\n",
+               "Host: %s%s%s\r\n",
                request_types[req_type],
-               url->location, url->host);
+               url->location, url->host,
+               url->port ? ":" : "",
+               url->port ? url->port : "");
 
        blobmsg_for_each_attr(cur, uh->headers.head, rem)
                ustream_printf(uh->us, "%s: %s\r\n", blobmsg_name(cur), (char *) blobmsg_data(cur));
 
-       if (uh->req_type == REQ_POST || uh->req_type == REQ_PUT)
+       if (uclient_request_supports_body(uh->req_type))
                ustream_printf(uh->us, "Transfer-Encoding: chunked\r\n");
 
        uclient_http_add_auth_header(uh);
@@ -987,7 +1006,7 @@ uclient_http_request_done(struct uclient *cl)
                return -1;
 
        uclient_http_send_headers(uh);
-       if (uh->req_type == REQ_POST || uh->req_type == REQ_PUT)
+       if (uclient_request_supports_body(uh->req_type))
                ustream_printf(uh->us, "0\r\n\r\n");
        uh->state = HTTP_STATE_REQUEST_DONE;
 
@@ -1097,7 +1116,7 @@ int uclient_http_redirect(struct uclient *cl)
        if (!tb)
                return false;
 
-       url = uclient_get_url(blobmsg_data(tb), url->auth);
+       url = uclient_get_url_location(url, blobmsg_data(tb));
        if (!url)
                return false;
 
@@ -1129,6 +1148,28 @@ int uclient_http_set_ssl_ctx(struct uclient *cl, const struct ustream_ssl_ops *o
        return 0;
 }
 
+int uclient_http_set_address_family(struct uclient *cl, int af)
+{
+       struct uclient_http *uh = container_of(cl, struct uclient_http, uc);
+
+       if (cl->backend != &uclient_backend_http)
+               return -1;
+
+       switch (af) {
+       case AF_INET:
+               uh->usock_flags = USOCK_IPV4ONLY;
+               break;
+       case AF_INET6:
+               uh->usock_flags = USOCK_IPV6ONLY;
+               break;
+       default:
+               uh->usock_flags = 0;
+               break;
+       }
+
+       return 0;
+}
+
 const struct uclient_backend uclient_backend_http = {
        .prefix = uclient_http_prefix,