X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuclient.git;a=blobdiff_plain;f=uclient.c;h=fb450699654e86ef370575c03cf12192429bc348;hp=4125dc238c42cac8056675c3e2eb248f4d090f8b;hb=cc75af25cbaee8a57b799b6ecc5a7c2d624cc431;hpb=5f2e60972941c1ca1a6fa572b39e18cbc58137d9 diff --git a/uclient.c b/uclient.c index 4125dc2..fb45069 100644 --- a/uclient.c +++ b/uclient.c @@ -1,9 +1,54 @@ +/* + * uclient - ustream based protocol client library + * + * Copyright (C) 2014 Felix Fietkau + * + * 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 #include #include "uclient.h" #include "uclient-utils.h" #include "uclient-backend.h" -static struct uclient_url *uclient_get_url(const char *url_str) +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) { static const struct uclient_backend *backends[] = { &uclient_backend_http, @@ -13,7 +58,7 @@ static struct uclient_url *uclient_get_url(const char *url_str) const char * const *prefix = NULL; struct uclient_url *url; const char *location; - char *host_buf, *uri_buf, *next; + char *host_buf, *uri_buf, *auth_buf, *next; int i, host_len; for (i = 0; i < ARRAY_SIZE(backends); i++) { @@ -48,10 +93,12 @@ static struct uclient_url *uclient_get_url(const char *url_str) url = calloc_a(sizeof(*url), &host_buf, host_len + 1, - &uri_buf, strlen(location) + 1); + &uri_buf, strlen(location) + 1, + &auth_buf, auth_str ? strlen(auth_str) + 1 : 0); url->backend = backend; url->location = strcpy(uri_buf, location); + url->prefix = prefix - backend->prefix; url->host = strncpy(host_buf, url_str, host_len); @@ -66,6 +113,9 @@ static struct uclient_url *uclient_get_url(const char *url_str) url->auth = host_buf; } + if (!url->auth && auth_str) + url->auth = strcpy(auth_buf, auth_str); + /* Literal IPv6 address */ if (*url->host == '[') { url->host++; @@ -78,8 +128,10 @@ static struct uclient_url *uclient_get_url(const char *url_str) url->port = next + 1; } else { next = strrchr(url->host, ':'); - if (next) + if (next) { + *next = 0; url->port = next + 1; + } } return url; @@ -89,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); + url = uclient_get_url(url_str, auth_str); if (!url) return NULL; @@ -109,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); - 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) @@ -168,12 +223,20 @@ 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); - if (cl->error && cl->cb->error) - cl->cb->error(cl); + if (cl->error_code && cl->cb->error) + cl->cb->error(cl, cl->error_code); else if (cl->eof && cl->cb->data_eof) cl->cb->data_eof(cl); } @@ -184,18 +247,18 @@ static void uclient_backend_change_state(struct uclient *cl) uloop_timeout_set(&cl->timeout, 1); } -void uclient_backend_set_error(struct uclient *cl) +void __hidden uclient_backend_set_error(struct uclient *cl, int code) { - if (cl->error) + if (cl->error_code) return; - cl->error = true; + cl->error_code = code; uclient_backend_change_state(cl); } void __hidden uclient_backend_set_eof(struct uclient *cl) { - if (cl->eof || cl->error) + if (cl->eof || cl->error_code) return; cl->eof = true; @@ -204,7 +267,7 @@ void __hidden uclient_backend_set_eof(struct uclient *cl) void __hidden uclient_backend_reset_state(struct uclient *cl) { - cl->error = false; cl->eof = false; + cl->error_code = 0; uloop_timeout_cancel(&cl->timeout); }