* 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)
{
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;
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;
}
if (!url)
return -1;
- if (url->backend != cl->backend)
+ if (url->backend != cl->backend) {
+ free(url);
return -1;
+ }
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)
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);
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);