X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuclient.git;a=blobdiff_plain;f=uclient.c;h=ab2d5b6c393fa6c14d03693ae76f5dbe392767f2;hp=71da9359b491a4053aea9ecfaa03a82df76bcc29;hb=c8e85b4714709aebaa055bea6cc5a26b8eda4071;hpb=25e44fc1e666fb333b3c53bcda90e44b0b74bf19

diff --git a/uclient.c b/uclient.c
index 71da935..ab2d5b6 100644
--- a/uclient.c
+++ b/uclient.c
@@ -1,8 +1,52 @@
+/*
+ * 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 <arpa/inet.h>
 #include <libubox/ustream-ssl.h>
 #include "uclient.h"
 #include "uclient-utils.h"
 #include "uclient-backend.h"
 
+char *uclient_get_addr(char *dest, int *port, union uclient_addr *a)
+{
+	int portval;
+	void *ptr;
+
+	switch(a->sa.sa_family) {
+	case AF_INET:
+		ptr = &a->sin.sin_addr;
+		portval = a->sin.sin_port;
+		break;
+	case AF_INET6:
+		ptr = &a->sin6.sin6_addr;
+		portval = a->sin6.sin6_port;
+		break;
+	default:
+		return strcpy(dest, "Unknown");
+	}
+
+	inet_ntop(a->sa.sa_family, ptr, dest, INET6_ADDRSTRLEN);
+	if (port)
+		*port = ntohs(portval);
+
+	return dest;
+}
+
+
 struct uclient_url __hidden *
 uclient_get_url(const char *url_str, const char *auth_str)
 {
@@ -84,8 +128,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 +141,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 +161,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)
@@ -174,6 +223,14 @@ int uclient_read(struct uclient *cl, char *buf, int len)
 	return cl->backend->read(cl, buf, len);
 }
 
+void uclient_disconnect(struct uclient *cl)
+{
+	if (!cl->backend->disconnect)
+		return;
+
+	cl->backend->disconnect(cl);
+}
+
 static void __uclient_backend_change_state(struct uloop_timeout *timeout)
 {
 	struct uclient *cl = container_of(timeout, struct uclient, timeout);
@@ -210,6 +267,7 @@ void __hidden uclient_backend_set_eof(struct uclient *cl)
 
 void __hidden uclient_backend_reset_state(struct uclient *cl)
 {
+	cl->data_eof = false;
 	cl->eof = false;
 	cl->error_code = 0;
 	uloop_timeout_cancel(&cl->timeout);