http: add helper function for checking redirect status

[project/uclient.git] / uclient.c

diff --git a/uclient.c b/uclient.c
index 8862b557b975204d723923c4c3ab64ffea8763e9..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;
@@ -59,6 +66,9 @@ __uclient_get_url(const struct uclient_backend *backend,
                &uri_buf, strlen(location) + 1,
                &auth_buf, auth_str ? strlen(auth_str) + 1 : 0);
 
+       if (!url)
+               return NULL;
+
        url->backend = backend;
        url->location = strcpy(uri_buf, location);
        if (host)
@@ -187,7 +197,7 @@ uclient_get_url(const char *url_str, const char *auth_str)
        struct uclient_url *url;
        const char *location;
        int host_len;
-       int i;
+       unsigned int i;
 
        for (i = 0; i < ARRAY_SIZE(backends); i++) {
                int prefix_len = 0;
@@ -284,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)
@@ -358,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)
@@ -369,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;
@@ -419,3 +451,23 @@ void __hidden uclient_backend_reset_state(struct uclient *cl)
        cl->error_code = 0;
        uloop_timeout_cancel(&cl->timeout);
 }
+
+const char * uclient_strerror(unsigned err)
+{
+       switch (err) {
+       case UCLIENT_ERROR_UNKNOWN:
+               return "unknown error";
+       case UCLIENT_ERROR_CONNECT:
+               return "connect failed";
+       case UCLIENT_ERROR_TIMEDOUT:
+               return "timeout";
+       case UCLIENT_ERROR_SSL_INVALID_CERT:
+               return "ssl invalid cert";
+       case UCLIENT_ERROR_SSL_CN_MISMATCH:
+               return "ssl cn mismatch";
+       case UCLIENT_ERROR_MISSING_SSL_CONTEXT:
+               return "missing ssl context";
+       default:
+               return "invalid error code";
+       }
+}