#include "uclient-utils.h"
#include "uclient-backend.h"
-static uint32_t nc;
-
enum auth_type {
AUTH_TYPE_UNKNOWN,
AUTH_TYPE_NONE,
struct ustream_fd ufd;
struct ustream_ssl ussl;
+ bool ssl_ctx_ext;
bool ssl;
bool eof;
bool connection_close;
long read_chunked;
long content_length;
+ uint32_t nc;
+
struct blob_buf headers;
struct blob_buf meta;
};
static void
get_cnonce(char *dest)
{
- uint32_t val = nc;
+ uint32_t val = 0;
FILE *f;
f = fopen("/dev/urandom", "r");
if (!realm || !data.qop || !data.nonce)
return;
- sprintf(nc_str, "%08x", nc++);
+ sprintf(nc_str, "%08x", uh->nc++);
get_cnonce(cnonce_str);
data.qop = "auth";
static int uclient_http_connect(struct uclient *cl)
{
struct uclient_http *uh = container_of(cl, struct uclient_http, uc);
+ int ret;
uclient_http_init_request(uh);
uh->ssl = cl->url->prefix == PREFIX_HTTPS;
if (uh->ssl)
- return uclient_setup_https(uh);
+ ret = uclient_setup_https(uh);
else
- return uclient_setup_http(uh);
+ ret = uclient_setup_http(uh);
+
+ if (ret)
+ uh->state = HTTP_STATE_ERROR;
+
+ return ret;
}
static struct uclient *uclient_http_alloc(void)
return &uh->uc;
}
+static void uclient_http_free_ssl_ctx(struct uclient_http *uh)
+{
+ if (uh->ssl_ctx && !uh->ssl_ctx_ext)
+ ustream_ssl_context_free(uh->ssl_ctx);
+
+ uh->ssl_ctx_ext = false;
+}
+
static void uclient_http_free(struct uclient *cl)
{
struct uclient_http *uh = container_of(cl, struct uclient_http, uc);
- if (uh->ssl_ctx)
- ustream_ssl_context_free(uh->ssl_ctx);
-
+ uclient_http_free_ssl_ctx(uh);
uclient_http_free_url_state(cl);
blob_buf_free(&uh->headers);
blob_buf_free(&uh->meta);
return true;
}
+int uclient_http_set_ssl_ctx(struct uclient *cl, struct ustream_ssl_ctx *ctx)
+{
+ struct uclient_http *uh = container_of(cl, struct uclient_http, uc);
+
+ uclient_http_free_url_state(cl);
+
+ uclient_http_free_ssl_ctx(uh);
+ uh->ssl_ctx = ctx;
+ uh->ssl_ctx_ext = !!ctx;
+
+ return 0;
+}
+
const struct uclient_backend uclient_backend_http = {
.prefix = uclient_http_prefix,