X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuclient.git;a=blobdiff_plain;f=uclient-http.c;h=4300d0511e95d0dfa74d5044bd0e1ab8bd92018f;hp=47c890fca689cd0457108725b5ac91098d59142a;hb=4edb1426cef9eb07aa52dab2c34ab51f64e10f74;hpb=0fa104b6042913eb3eae9bdddad1cf341c85e614 diff --git a/uclient-http.c b/uclient-http.c index 47c890f..4300d05 100644 --- a/uclient-http.c +++ b/uclient-http.c @@ -41,6 +41,7 @@ enum request_type { REQ_HEAD, REQ_POST, REQ_PUT, + REQ_DELETE, __REQ_MAX }; @@ -58,6 +59,7 @@ static const char * const request_types[__REQ_MAX] = { [REQ_HEAD] = "HEAD", [REQ_POST] = "POST", [REQ_PUT] = "PUT", + [REQ_DELETE] = "DELETE", }; struct uclient_http { @@ -71,6 +73,7 @@ struct uclient_http { struct ustream_ssl ussl; struct uloop_timeout disconnect_t; + unsigned int seq; bool ssl_require_validation; bool ssl; @@ -159,6 +162,18 @@ static void uclient_http_error(struct uclient_http *uh, int code) uclient_backend_set_error(&uh->uc, code); } +static void uclient_http_request_disconnect(struct uclient *cl) +{ + struct uclient_http *uh = container_of(cl, struct uclient_http, uc); + + if (!uh->us) + return; + + uh->eof = true; + uh->disconnect = true; + uloop_timeout_set(&uh->disconnect_t, 1); +} + static void uclient_notify_eof(struct uclient_http *uh) { struct ustream *us = uh->us; @@ -177,11 +192,12 @@ static void uclient_notify_eof(struct uclient_http *uh) uclient_backend_set_eof(&uh->uc); if (uh->connection_close) - uclient_http_disconnect(uh); + uclient_http_request_disconnect(&uh->uc); } static void uclient_http_reset_state(struct uclient_http *uh) { + uh->seq++; uclient_backend_reset_state(&uh->uc); uh->read_chunked = -1; uh->content_length = -1; @@ -307,6 +323,22 @@ static char *digest_unquote_sep(char **str) return start; } +static char *digest_sep(char **str) +{ + char *cur, *next; + + cur = *str; + next = strchr(*str, ','); + if (next) { + *str = next + 1; + *next = 0; + } else { + *str += strlen(*str); + } + + return cur; +} + static bool strmatch(char **str, const char *prefix) { int len = strlen(prefix); @@ -401,8 +433,9 @@ uclient_http_add_auth_digest(struct uclient_http *uh) next = buf; while (*next) { const char **dest = NULL; + const char *tmp; - while (isspace(*next)) + while (*next && isspace(*next)) next++; if (strmatch(&next, "realm")) @@ -413,8 +446,18 @@ uclient_http_add_auth_digest(struct uclient_http *uh) dest = &data.nonce; else if (strmatch(&next, "opaque")) dest = &opaque; - else - return; + else if (strmatch(&next, "stale") || + strmatch(&next, "algorithm") || + strmatch(&next, "auth-param")) { + digest_sep(&next); + continue; + } else if (strmatch(&next, "domain") || + strmatch(&next, "qop-options")) + dest = &tmp; + else { + digest_sep(&next); + continue; + } *dest = digest_unquote_sep(&next); } @@ -504,7 +547,7 @@ uclient_http_send_headers(struct uclient_http *uh) url->location, url->host); blobmsg_for_each_attr(cur, uh->headers.head, rem) - ustream_printf(uh->us, "%s: %s\n", blobmsg_name(cur), (char *) blobmsg_data(cur)); + 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) ustream_printf(uh->us, "Transfer-Encoding: chunked\r\n"); @@ -552,6 +595,9 @@ static void uclient_parse_http_line(struct uclient_http *uh, char *data) if (uh->state == HTTP_STATE_REQUEST_DONE) { char *code; + if (!strlen(data)) + return; + /* HTTP/1.1 */ strsep(&data, " "); @@ -597,6 +643,7 @@ error: static void __uclient_notify_read(struct uclient_http *uh) { struct uclient *uc = &uh->uc; + unsigned int seq = uh->seq; char *data; int len; @@ -631,6 +678,9 @@ static void __uclient_notify_read(struct uclient_http *uh) *sep = 0; cur_len = sep + 2 - data; uclient_parse_http_line(uh, data); + if (seq != uh->seq) + return; + ustream_consume(uh->us, cur_len); len -= cur_len; @@ -647,14 +697,21 @@ static void __uclient_notify_read(struct uclient_http *uh) if (uh->eof) return; - if (uh->state == HTTP_STATE_RECV_DATA && uc->cb->data_read) - uc->cb->data_read(uc); + if (uh->state == HTTP_STATE_RECV_DATA) { + /* Now it's uclient user turn to read some data */ + uloop_timeout_cancel(&uc->connection_timeout); + + if (uc->cb->data_read) + uc->cb->data_read(uc); + } } static void __uclient_notify_write(struct uclient_http *uh) { struct uclient *uc = &uh->uc; - uc->cb->data_sent(uc); + + if (uc->cb->data_sent) + uc->cb->data_sent(uc); } static void uclient_notify_read(struct ustream *us, int bytes) @@ -769,6 +826,7 @@ static int uclient_setup_https(struct uclient_http *uh) uh->ussl.notify_error = uclient_ssl_notify_error; uh->ussl.notify_verify_error = uclient_ssl_notify_verify_error; uh->ussl.notify_connected = uclient_ssl_notify_connected; + uh->ussl.server_name = uh->uc.url->host; uh->ssl_ops->init(&uh->ussl, &uh->ufd.stream, uh->ssl_ctx, false); uh->ssl_ops->set_peer_cn(&uh->ussl, uh->uc.url->host); @@ -780,6 +838,9 @@ static int uclient_http_connect(struct uclient *cl) struct uclient_http *uh = container_of(cl, struct uclient_http, uc); int ret; + if (!cl->eof || uh->disconnect) + uclient_http_disconnect(uh); + uclient_http_init_request(uh); if (uh->us) @@ -879,7 +940,7 @@ uclient_http_set_header(struct uclient *cl, const char *name, const char *value) } static int -uclient_http_send_data(struct uclient *cl, char *buf, unsigned int len) +uclient_http_send_data(struct uclient *cl, const char *buf, unsigned int len) { struct uclient_http *uh = container_of(cl, struct uclient_http, uc); @@ -983,6 +1044,10 @@ uclient_http_read(struct uclient *cl, char *buf, unsigned int len) uclient_notify_eof(uh); + /* Now that we consumed something and if this isn't EOF, start timer again */ + if (!uh->uc.eof && !cl->connection_timeout.pending) + uloop_timeout_set(&cl->connection_timeout, cl->timeout_msecs); + return len; } @@ -1042,18 +1107,6 @@ int uclient_http_set_ssl_ctx(struct uclient *cl, const struct ustream_ssl_ops *o return 0; } -static void uclient_http_request_disconnect(struct uclient *cl) -{ - struct uclient_http *uh = container_of(cl, struct uclient_http, uc); - - if (!uh->us) - return; - - uh->eof = true; - uh->disconnect = true; - uloop_timeout_set(&uh->disconnect_t, 1); -} - const struct uclient_backend uclient_backend_http = { .prefix = uclient_http_prefix,