X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuclient.git;a=blobdiff_plain;f=uclient.h;h=d5a0d5b4f804dd68523c4993921fe50edc8d1da3;hp=65e48b2f35b68058f3fb2f7ec4ff009ded60a9d5;hb=9ceca0a12166cefdf07aedc3c187fdd2f72fdec8;hpb=8fbe2716f550b1feddccdc4e8de3d391d414f5df

diff --git a/uclient.h b/uclient.h
index 65e48b2..d5a0d5b 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,16 +32,37 @@ 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;
 
 	bool eof;
+	bool data_eof;
 	int error_code;
 	int status_code;
 	struct blob_attr *meta;
@@ -60,11 +83,14 @@ void uclient_free(struct uclient *cl);
 
 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;
 
@@ -73,6 +99,7 @@ int uclient_http_set_header(struct uclient *cl, const char *name, const char *va
 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