X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuhttpd.git;a=blobdiff_plain;f=uhttpd.h;h=9ed6439aa17aa8664af341f38402157571e097dc;hp=24ad83de82718e329353e3530735b7c35f5083c6;hb=119244d9b13e84eb898f9fb97e83cac260c1a0b5;hpb=58c5fd1f9a72db878e29958a4c4e1b65db5b2e07

diff --git a/uhttpd.h b/uhttpd.h
index 24ad83d..9ed6439 100644
--- a/uhttpd.h
+++ b/uhttpd.h
@@ -29,11 +29,13 @@
 #include <libubox/ustream.h>
 #include <libubox/blob.h>
 #include <libubox/utils.h>
+#ifdef HAVE_TLS
+#include <libubox/ustream-ssl.h>
+#endif
 
 #include "utils.h"
 
 #define UH_LIMIT_CLIENTS	64
-#define UH_LIMIT_HEADERS	64
 
 #define __enum_header(_name) HDR_##_name,
 #define __blobmsg_header(_name) [HDR_##_name] = { .name = #_name, .type = BLOBMSG_TYPE_STRING },
@@ -59,9 +61,9 @@ struct config {
 
 struct auth_realm {
 	struct list_head list;
-	char *path;
-	char *user;
-	char *pass;
+	const char *path;
+	const char *user;
+	const char *pass;
 };
 
 enum http_method {
@@ -80,7 +82,9 @@ struct http_request {
 	enum http_method method;
 	enum http_version version;
 	int redirect_status;
-	char *url;
+	int content_length;
+	bool expect_cont;
+	uint8_t transfer_chunked;
 	const struct auth_realm *realm;
 };
 
@@ -94,8 +98,8 @@ enum client_state {
 
 struct interpreter {
 	struct list_head list;
-	char *path;
-	char *ext;
+	const char *path;
+	const char *ext;
 };
 
 struct path_info {
@@ -104,9 +108,10 @@ struct path_info {
 	const char *name;
 	const char *info;
 	const char *query;
-	int redirected;
+	const char *auth;
+	bool redirected;
 	struct stat stat;
-	struct interpreter *ip;
+	const struct interpreter *ip;
 };
 
 struct env_var {
@@ -128,6 +133,14 @@ struct relay {
 	void (*close)(struct relay *r, int ret);
 };
 
+struct dispatch_proc {
+	struct blob_buf hdr;
+	struct uloop_fd wrfd;
+	struct relay r;
+	int status_code;
+	char *status_msg;
+};
+
 struct dispatch_handler {
 	struct list_head list;
 
@@ -136,6 +149,23 @@ struct dispatch_handler {
 	void (*handle_request)(struct client *cl, const char *url, struct path_info *pi);
 };
 
+struct dispatch {
+	int (*data_send)(struct client *cl, const char *data, int len);
+	void (*data_done)(struct client *cl);
+	void (*write_cb)(struct client *cl);
+	void (*close_fds)(struct client *cl);
+	void (*free)(struct client *cl);
+	bool data_blocked;
+
+	union {
+		struct {
+			struct blob_attr **hdr;
+			int fd;
+		} file;
+		struct dispatch_proc proc;
+	};
+};
+
 struct client {
 	struct list_head list;
 	int id;
@@ -143,35 +173,18 @@ struct client {
 	struct ustream *us;
 	struct ustream_fd sfd;
 #ifdef HAVE_TLS
-	struct ustream_ssl stream_ssl;
+	struct ustream_ssl ssl;
 #endif
 	struct uloop_timeout timeout;
 
 	enum client_state state;
+	bool tls;
 
 	struct http_request request;
-	struct sockaddr_in6 servaddr;
-	struct sockaddr_in6 peeraddr;
+	struct uh_addr srv_addr, peer_addr;
 
 	struct blob_buf hdr;
-
-	struct {
-		void (*write_cb)(struct client *cl);
-		void (*close_fds)(struct client *cl);
-		void (*free)(struct client *cl);
-		union {
-			struct {
-				struct blob_attr **hdr;
-				int fd;
-			} file;
-			struct {
-				struct blob_buf hdr;
-				struct relay r;
-				int status_code;
-				char *status_msg;
-			} proc;
-		};
-	} dispatch;
+	struct dispatch dispatch;
 };
 
 extern char uh_buf[4096];
@@ -183,7 +196,7 @@ extern struct dispatch_handler cgi_dispatch;
 
 void uh_index_add(const char *filename);
 
-void uh_accept_client(int fd);
+bool uh_accept_client(int fd, bool tls);
 
 void uh_unblock_listeners(void);
 void uh_setup_listeners(void);
@@ -204,8 +217,12 @@ void __printf(4, 5)
 uh_client_error(struct client *cl, int code, const char *summary, const char *fmt, ...);
 
 void uh_handle_request(struct client *cl);
+void client_poll_post_data(struct client *cl);
+void uh_client_read_cb(struct client *cl);
+void uh_client_notify_state(struct client *cl);
 
 void uh_auth_add(const char *path, const char *user, const char *pass);
+bool uh_auth_check(struct client *cl, struct path_info *pi);
 
 void uh_close_listen_fds(void);
 void uh_close_fds(void);
@@ -219,6 +236,6 @@ void uh_relay_free(struct relay *r);
 
 struct env_var *uh_get_process_vars(struct client *cl, struct path_info *pi);
 bool uh_create_process(struct client *cl, struct path_info *pi,
-		       void (*cb)(struct client *cl, struct path_info *pi, int fd));
+		       void (*cb)(struct client *cl, struct path_info *pi));
 
 #endif