ignore empty writes

[project/uclient.git] / uclient.c

diff --git a/uclient.c b/uclient.c
index 71da935..82553a5 100644 (file)
--- a/uclient.c
+++ b/uclient.c
@@ -1,3 +1,20 @@
+/*
+ * uclient - ustream based protocol client library
+ *
+ * Copyright (C) 2014 Felix Fietkau <nbd@openwrt.org>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
 #include <libubox/ustream-ssl.h>
 #include "uclient.h"
 #include "uclient-utils.h"
@@ -84,8 +101,10 @@ uclient_get_url(const char *url_str, const char *auth_str)
                        url->port = next + 1;
        } else {
                next = strrchr(url->host, ':');
-               if (next)
+               if (next) {
+                       *next = 0;
                        url->port = next + 1;
+               }
        }
 
        return url;
@@ -95,12 +114,12 @@ free:
        return NULL;
 }
 
-struct uclient *uclient_new(const char *url_str, const struct uclient_cb *cb)
+struct uclient *uclient_new(const char *url_str, const char *auth_str, const struct uclient_cb *cb)
 {
        struct uclient *cl;
        struct uclient_url *url;
 
-       url = uclient_get_url(url_str, NULL);
+       url = uclient_get_url(url_str, auth_str);
        if (!url)
                return NULL;
 
@@ -115,27 +134,30 @@ struct uclient *uclient_new(const char *url_str, const struct uclient_cb *cb)
        return cl;
 }
 
-int uclient_connect_url(struct uclient *cl, const char *url_str)
+int uclient_set_url(struct uclient *cl, const char *url_str, const char *auth_str)
 {
-       struct uclient_url *url = cl->url;
        const struct uclient_backend *backend = cl->backend;
+       struct uclient_url *url = cl->url;
 
-       if (url_str) {
-               url = uclient_get_url(url_str, NULL);
-               if (!url)
-                       return -1;
+       url = uclient_get_url(url_str, auth_str);
+       if (!url)
+               return -1;
 
-               if (url->backend != cl->backend)
-                       return -1;
+       if (url->backend != cl->backend)
+               return -1;
 
-               free(cl->url);
-               cl->url = url;
+       free(cl->url);
+       cl->url = url;
 
-               if (backend->update_url)
-                       backend->update_url(cl);
-       }
+       if (backend->update_url)
+               backend->update_url(cl);
 
-       return backend->connect(cl);
+       return 0;
+}
+
+int uclient_connect(struct uclient *cl)
+{
+       return cl->backend->connect(cl);
 }
 
 void uclient_free(struct uclient *cl)