http: add helper function for checking redirect status

[project/uclient.git] / uclient.c

diff --git a/uclient.c b/uclient.c
index 95e4585a61cfa0f2ba90985e57d1b685255a1416..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;
@@ -287,7 +294,7 @@ int uclient_set_proxy_url(struct uclient *cl, const char *url_str, const char *a
 int uclient_set_url(struct uclient *cl, const char *url_str, const char *auth_str)
 {
        const struct uclient_backend *backend = cl->backend;
-       struct uclient_url *url = cl->url;
+       struct uclient_url *url;
 
        url = uclient_get_url(url_str, auth_str);
        if (!url)
@@ -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)
@@ -372,6 +400,7 @@ int uclient_read(struct uclient *cl, char *buf, int len)
 void uclient_disconnect(struct uclient *cl)
 {
        uloop_timeout_cancel(&cl->connection_timeout);
+       uloop_timeout_cancel(&cl->timeout);
 
        if (!cl->backend->disconnect)
                return;