return dest;
}
-
-struct uclient_url __hidden *
-uclient_get_url(const char *url_str, const char *auth_str)
+static struct uclient_url *
+__uclient_get_url(const struct uclient_backend *backend,
+ const char *host, int host_len,
+ const char *location, const char *auth_str)
{
- static const struct uclient_backend *backends[] = {
- &uclient_backend_http,
- };
-
- const struct uclient_backend *backend;
- const char * const *prefix = NULL;
struct uclient_url *url;
- const char *location;
char *host_buf, *uri_buf, *auth_buf, *next;
- int i, host_len;
-
- for (i = 0; i < ARRAY_SIZE(backends); i++) {
- int prefix_len = 0;
-
- for (prefix = backends[i]->prefix; *prefix; prefix++) {
- prefix_len = strlen(*prefix);
-
- if (!strncmp(url_str, *prefix, prefix_len))
- break;
- }
-
- if (!*prefix)
- continue;
-
- url_str += prefix_len;
- backend = backends[i];
- break;
- }
-
- if (!*prefix)
- return NULL;
-
- next = strchr(url_str, '/');
- if (next) {
- location = next;
- host_len = next - url_str;
- } else {
- location = "/";
- host_len = strlen(url_str);
- }
url = calloc_a(sizeof(*url),
&host_buf, host_len + 1,
url->backend = backend;
url->location = strcpy(uri_buf, location);
- url->prefix = prefix - backend->prefix;
-
- url->host = strncpy(host_buf, url_str, host_len);
+ if (host)
+ url->host = strncpy(host_buf, host, host_len);
next = strchr(host_buf, '@');
if (next) {
return NULL;
}
+static const char *
+uclient_split_host(const char *base, int *host_len)
+{
+ char *next, *location;
+
+ next = strchr(base, '/');
+ if (next) {
+ location = next;
+ *host_len = next - base;
+ } else {
+ location = "/";
+ *host_len = strlen(base);
+ }
+
+ return location;
+}
+
+struct uclient_url __hidden *
+uclient_get_url(const char *url_str, const char *auth_str)
+{
+ static const struct uclient_backend *backends[] = {
+ &uclient_backend_http,
+ };
+
+ const struct uclient_backend *backend;
+ const char * const *prefix = NULL;
+ struct uclient_url *url;
+ const char *location;
+ int host_len;
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(backends); i++) {
+ int prefix_len = 0;
+
+ for (prefix = backends[i]->prefix; *prefix; prefix++) {
+ prefix_len = strlen(*prefix);
+
+ if (!strncmp(url_str, *prefix, prefix_len))
+ break;
+ }
+
+ if (!*prefix)
+ continue;
+
+ url_str += prefix_len;
+ backend = backends[i];
+ break;
+ }
+
+ if (!*prefix)
+ return NULL;
+
+ location = uclient_split_host(url_str, &host_len);
+ url = __uclient_get_url(backend, url_str, host_len, location, auth_str);
+ if (!url)
+ return NULL;
+
+ url->prefix = prefix - backend->prefix;
+ return url;
+}
+
+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;
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_proxy_url(struct uclient *cl, const char *url_str, const char *auth_str)
+{
+ const struct uclient_backend *backend = cl->backend;
+ struct uclient_url *url;
+ int host_len;
+ char *next, *host;
+
+ if (!backend->update_proxy_url)
+ return -1;
+
+ next = strstr(url_str, "://");
+ if (!next)
+ return -1;
+
+ host = next + 3;
+ uclient_split_host(host, &host_len);
+
+ url = __uclient_get_url(NULL, host, host_len, url_str, auth_str);
+ if (!url)
+ return -1;
+
+ free(cl->proxy_url);
+ cl->proxy_url = url;
+
+ if (backend->update_proxy_url)
+ backend->update_proxy_url(cl);
+
+ return 0;
+}
+
int uclient_set_url(struct uclient *cl, const char *url_str, const char *auth_str)
{
const struct uclient_backend *backend = cl->backend;
if (!url)
return -1;
- if (url->backend != cl->backend)
+ if (url->backend != cl->backend) {
+ free(url);
return -1;
+ }
+
+ free(cl->proxy_url);
+ cl->proxy_url = NULL;
free(cl->url);
cl->url = url;
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);
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;
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)
void uclient_disconnect(struct uclient *cl)
{
+ uloop_timeout_cancel(&cl->connection_timeout);
+
if (!cl->backend->disconnect)
return;
if (cl->error_code)
return;
+ uloop_timeout_cancel(&cl->connection_timeout);
cl->error_code = code;
uclient_backend_change_state(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);