X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuclient.git;a=blobdiff_plain;f=uclient.c;h=21f6f5dafdb5b1d3d6423de9819ba64060f0bb79;hp=5b71bf4bb9a3380c4b9403bd02bdb9eea00819c6;hb=9500b666729d5f616e5e106ab725c5f2cbc5171b;hpb=2b80c2689068258eab5e94f92a6d1e7b7550094b

diff --git a/uclient.c b/uclient.c
index 5b71bf4..21f6f5d 100644
--- a/uclient.c
+++ b/uclient.c
@@ -15,11 +15,38 @@
  * 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)
 {
@@ -101,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;
@@ -112,6 +141,16 @@ free:
 	return NULL;
 }
 
+static void uclient_connection_timeout(struct uloop_timeout *timeout)
+{
+	struct uclient *cl = container_of(timeout, struct uclient, connection_timeout);
+
+	if (cl->backend->disconnect)
+		cl->backend->disconnect(cl);
+
+	uclient_backend_set_error(cl, UCLIENT_ERROR_TIMEDOUT);
+}
+
 struct uclient *uclient_new(const char *url_str, const char *auth_str, const struct uclient_cb *cb)
 {
 	struct uclient *cl;
@@ -128,16 +167,18 @@ struct uclient *uclient_new(const char *url_str, const char *auth_str, const str
 	cl->backend = url->backend;
 	cl->cb = cb;
 	cl->url = url;
+	cl->timeout_msecs = UCLIENT_DEFAULT_TIMEOUT_MS;
+	cl->connection_timeout.cb = uclient_connection_timeout;
 
 	return cl;
 }
 
-int uclient_set_url(struct uclient *cl, const char *url_str)
+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;
 
-	url = uclient_get_url(url_str, NULL);
+	url = uclient_get_url(url_str, auth_str);
 	if (!url)
 		return -1;
 
@@ -153,6 +194,16 @@ int uclient_set_url(struct uclient *cl, const char *url_str)
 	return 0;
 }
 
+int uclient_set_timeout(struct uclient *cl, int msecs)
+{
+	if (msecs <= 0)
+		return -EINVAL;
+
+	cl->timeout_msecs = msecs;
+
+	return 0;
+}
+
 int uclient_connect(struct uclient *cl)
 {
 	return cl->backend->connect(cl);
@@ -170,7 +221,7 @@ void uclient_free(struct uclient *cl)
 	free(url);
 }
 
-int uclient_write(struct uclient *cl, char *buf, int len)
+int uclient_write(struct uclient *cl, const char *buf, int len)
 {
 	if (!cl->backend->write)
 		return -1;
@@ -180,10 +231,18 @@ int uclient_write(struct uclient *cl, char *buf, int len)
 
 int uclient_request(struct uclient *cl)
 {
+	int err;
+
 	if (!cl->backend->request)
 		return -1;
 
-	return cl->backend->request(cl);
+	err = cl->backend->request(cl);
+	if (err)
+		return err;
+
+	uloop_timeout_set(&cl->connection_timeout, cl->timeout_msecs);
+
+	return 0;
 }
 
 int uclient_read(struct uclient *cl, char *buf, int len)
@@ -194,6 +253,16 @@ int uclient_read(struct uclient *cl, char *buf, int len)
 	return cl->backend->read(cl, buf, len);
 }
 
+void uclient_disconnect(struct uclient *cl)
+{
+	uloop_timeout_cancel(&cl->connection_timeout);
+
+	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);
@@ -215,6 +284,7 @@ void __hidden uclient_backend_set_error(struct uclient *cl, int code)
 	if (cl->error_code)
 		return;
 
+	uloop_timeout_cancel(&cl->connection_timeout);
 	cl->error_code = code;
 	uclient_backend_change_state(cl);
 }
@@ -224,12 +294,14 @@ void __hidden uclient_backend_set_eof(struct uclient *cl)
 	if (cl->eof || cl->error_code)
 		return;
 
+	uloop_timeout_cancel(&cl->connection_timeout);
 	cl->eof = true;
 	uclient_backend_change_state(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);