uclient: add helper function for getting ustream-ssl context/ops

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

diff --git a/uclient-fetch.c b/uclient-fetch.c
index 1e51ff3e8e46cecdc98f3341e24ba09065baf193..359715c2db9bf87d0e286ced841bdf71b807acd8 100644 (file)
--- a/uclient-fetch.c
+++ b/uclient-fetch.c
@@ -21,7 +21,6 @@
 #include <sys/socket.h>
 #include <unistd.h>
 #include <stdio.h>
-#include <dlfcn.h>
 #include <getopt.h>
 #include <fcntl.h>
 #include <glob.h>
@@ -35,12 +34,6 @@
 #include "uclient.h"
 #include "uclient-utils.h"
 
-#ifdef __APPLE__
-#define LIB_EXT "dylib"
-#else
-#define LIB_EXT "so"
-#endif
-
 #ifndef strdupa
 #define strdupa(x) strcpy(alloca(strlen(x)+1),x)
 #endif
@@ -513,21 +506,6 @@ static void init_ca_cert(void)
        globfree(&gl);
 }
 
-static void init_ustream_ssl(void)
-{
-       void *dlh;
-
-       dlh = dlopen("libustream-ssl." LIB_EXT, RTLD_LAZY | RTLD_LOCAL);
-       if (!dlh)
-               return;
-
-       ssl_ops = dlsym(dlh, "ustream_ssl_ops");
-       if (!ssl_ops)
-               return;
-
-       ssl_ctx = ssl_ops->context_new(false);
-}
-
 static int no_ssl(const char *progname)
 {
        fprintf(stderr,
@@ -590,7 +568,7 @@ int main(int argc, char **argv)
        int af = -1;
 
        signal(SIGPIPE, SIG_IGN);
-       init_ustream_ssl();
+       ssl_ctx = uclient_new_ssl_context(&ssl_ops);
 
        while ((ch = getopt_long(argc, argv, "46cO:P:qsT:U:Y:", longopts, &longopt_idx)) != -1) {
                switch(ch) {

diff --git a/uclient.c b/uclient.c
index ce76bcf0e5479c15a93bbb2eddfb3d7e70f8a614..4214c62cf6a9b2e3e2502b8bdd0123ed153b2614 100644 (file)
--- a/uclient.c
+++ b/uclient.c
@@ -16,11 +16,18 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <arpa/inet.h>
+#include <dlfcn.h>
 #include <libubox/ustream-ssl.h>
 #include "uclient.h"
 #include "uclient-utils.h"
 #include "uclient-backend.h"
 
+#ifdef __APPLE__
+#define LIB_EXT "dylib"
+#else
+#define LIB_EXT "so"
+#endif
+
 char *uclient_get_addr(char *dest, int *port, union uclient_addr *a)
 {
        int portval;
@@ -361,6 +368,27 @@ int uclient_request(struct uclient *cl)
        return 0;
 }
 
+struct ustream_ssl_ctx *uclient_new_ssl_context(const struct ustream_ssl_ops **ops)
+{
+       static const struct ustream_ssl_ops *ssl_ops;
+       void *dlh;
+
+       if (!ssl_ops) {
+               dlh = dlopen("libustream-ssl." LIB_EXT, RTLD_LAZY | RTLD_LOCAL);
+               if (!dlh)
+                       return NULL;
+
+               ssl_ops = dlsym(dlh, "ustream_ssl_ops");
+               if (!ssl_ops) {
+                       dlclose(dlh);
+                       return NULL;
+               }
+       }
+
+       *ops = ssl_ops;
+       return ssl_ops->context_new(false);
+}
+
 int uclient_read(struct uclient *cl, char *buf, int len)
 {
        if (!cl->backend->read)

diff --git a/uclient.h b/uclient.h
index 4f37364e55ab805bba7fdca5908bb3d1434e921e..0901910bb5f604d12e58a79cd9a87248587b13ed 100644 (file)
--- a/uclient.h
+++ b/uclient.h
@@ -115,6 +115,7 @@ int uclient_write(struct uclient *cl, const char *buf, int len);
 int uclient_request(struct uclient *cl);
 
 char *uclient_get_addr(char *dest, int *port, union uclient_addr *a);
+struct ustream_ssl_ctx *uclient_new_ssl_context(const struct ustream_ssl_ops **ops);
 
 /* HTTP */
 extern const struct uclient_backend uclient_backend_http;