X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuclient.git;a=blobdiff_plain;f=uclient.h;h=ddc8b7845f9baaaee13ab766c93db706b191ff33;hp=961f52357c1b306cb5e73e96eeb4a5e5c66b90c2;hb=29c798a52907b7ee28c8e001c99ceed65ebe5d39;hpb=299b1af9c051248771537980ee2d16c29c61376d

diff --git a/uclient.h b/uclient.h
index 961f523..ddc8b78 100644
--- a/uclient.h
+++ b/uclient.h
@@ -18,6 +18,8 @@
 #ifndef __LIBUBOX_UCLIENT_H
 #define __LIBUBOX_UCLIENT_H
 
+#include <netinet/in.h>
+
 #include <libubox/blob.h>
 #include <libubox/ustream.h>
 #include <libubox/ustream-ssl.h>
@@ -30,12 +32,32 @@ enum uclient_error_code {
 	UCLIENT_ERROR_CONNECT,
 	UCLIENT_ERROR_SSL_INVALID_CERT,
 	UCLIENT_ERROR_SSL_CN_MISMATCH,
+	UCLIENT_ERROR_MISSING_SSL_CONTEXT,
+};
+
+union uclient_addr {
+	struct sockaddr sa;
+	struct sockaddr_in sin;
+	struct sockaddr_in6 sin6;
+};
+
+struct uclient_url {
+	const struct uclient_backend *backend;
+	int prefix;
+
+	const char *host;
+	const char *port;
+	const char *location;
+
+	const char *auth;
 };
 
 struct uclient {
 	const struct uclient_backend *backend;
 	const struct uclient_cb *cb;
 
+	union uclient_addr local_addr, remote_addr;
+
 	struct uclient_url *url;
 	void *priv;
 
@@ -55,29 +77,28 @@ struct uclient_cb {
 	void (*error)(struct uclient *cl, int code);
 };
 
-struct uclient *uclient_new(const char *url, const struct uclient_cb *cb);
+struct uclient *uclient_new(const char *url, const char *auth_str, const struct uclient_cb *cb);
 void uclient_free(struct uclient *cl);
 
-int uclient_connect_url(struct uclient *cl, const char *url_str);
-
-static inline int uclient_connect(struct uclient *cl)
-{
-	return uclient_connect_url(cl, NULL);
-}
-
+int uclient_set_url(struct uclient *cl, const char *url, const char *auth);
+int uclient_connect(struct uclient *cl);
+void uclient_disconnect(struct uclient *cl);
 
 int uclient_read(struct uclient *cl, char *buf, int len);
 int uclient_write(struct uclient *cl, char *buf, int len);
 int uclient_request(struct uclient *cl);
 
+char *uclient_get_addr(char *dest, int *port, union uclient_addr *a);
+
 /* HTTP */
 extern const struct uclient_backend uclient_backend_http;
 
+int uclient_http_reset_headers(struct uclient *cl);
 int uclient_http_set_header(struct uclient *cl, const char *name, const char *value);
-int uclient_http_reset_headers(struct uclient *cl, const char *name, const char *value);
 int uclient_http_set_request_type(struct uclient *cl, const char *type);
 bool uclient_http_redirect(struct uclient *cl);
 
-int uclient_http_set_ssl_ctx(struct uclient *cl, struct ustream_ssl_ctx *ctx, bool require_validation);
+int uclient_http_set_ssl_ctx(struct uclient *cl, const struct ustream_ssl_ops *ops,
+			     struct ustream_ssl_ctx *ctx, bool require_validation);
 
 #endif