add support for passing in an external ustream_ssl context

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

diff --git a/uclient-http.c b/uclient-http.c
index 1cc60e3051880303b9622ddacaa6275593463a29..045a77296a5b74b2cf5ccaab2b6a2e23481a09ca 100644 (file)
--- a/uclient-http.c
+++ b/uclient-http.c
@@ -50,6 +50,7 @@ struct uclient_http {
        struct ustream_fd ufd;
        struct ustream_ssl ussl;
 
+       bool ssl_ctx_ext;
        bool ssl;
        bool eof;
        bool connection_close;
@@ -691,13 +692,19 @@ 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);
@@ -891,6 +898,19 @@ bool uclient_http_redirect(struct uclient *cl)
        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,
 

diff --git a/uclient.h b/uclient.h
index e3d168a987e28e4178bfe55db1dc7ede53bf4781..11a19555e2df3a64318849522ade47f9bd104b81 100644 (file)
--- a/uclient.h
+++ b/uclient.h
@@ -54,4 +54,6 @@ int uclient_http_reset_headers(struct uclient *cl, const char *name, const char
 int uclient_http_set_request_type(struct uclient *cl, const char *type);
 bool uclient_http_redirect(struct uclient *cl);
 
+int uclient_http_set_ssl_ctx(struct uclient *cl, struct ustream_ssl_ctx *ctx);
+
 #endif