uclient: fix http regression

[project/uclient.git] / uclient.c

diff --git a/uclient.c b/uclient.c
index a372d4a9dcbfff750c2dde1dba3fbf8497766307..0fb92b869ac0f15d7a0a13c9b3771f9feb39aa5b 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;
@@ -232,6 +239,14 @@ static void uclient_connection_timeout(struct uloop_timeout *timeout)
        uclient_backend_set_error(cl, UCLIENT_ERROR_TIMEDOUT);
 }
 
+static void __uclient_read_notify(struct uloop_timeout *timeout)
+{
+       struct uclient *cl = container_of(timeout, struct uclient, read_notify);
+
+       if (cl->cb->data_read)
+               cl->cb->data_read(cl);
+}
+
 struct uclient *uclient_new(const char *url_str, const char *auth_str, const struct uclient_cb *cb)
 {
        struct uclient *cl;
@@ -250,6 +265,7 @@ struct uclient *uclient_new(const char *url_str, const char *auth_str, const str
        cl->url = url;
        cl->timeout_msecs = UCLIENT_DEFAULT_TIMEOUT_MS;
        cl->connection_timeout.cb = uclient_connection_timeout;
+       cl->read_notify.cb = __uclient_read_notify;
 
        return cl;
 }
@@ -361,6 +377,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,9 +406,19 @@ int uclient_read(struct uclient *cl, char *buf, int len)
        return cl->backend->read(cl, buf, len);
 }
 
+int uclient_pending_bytes(struct uclient *cl, bool write)
+{
+       if (!cl->backend->pending_bytes)
+               return -1;
+
+       return cl->backend->pending_bytes(cl, write);
+}
+
 void uclient_disconnect(struct uclient *cl)
 {
        uloop_timeout_cancel(&cl->connection_timeout);
+       uloop_timeout_cancel(&cl->timeout);
+       uloop_timeout_cancel(&cl->read_notify);
 
        if (!cl->backend->disconnect)
                return;
@@ -421,6 +468,7 @@ void __hidden uclient_backend_reset_state(struct uclient *cl)
        cl->eof = false;
        cl->error_code = 0;
        uloop_timeout_cancel(&cl->timeout);
+       uloop_timeout_cancel(&cl->read_notify);
 }
 
 const char * uclient_strerror(unsigned err)