X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuhttpd.git;a=blobdiff_plain;f=uhttpd.h;h=9ed6439aa17aa8664af341f38402157571e097dc;hp=1e487f8ab526eeb05431ece86e079e34dad23f42;hb=0e7c0877717534db5ecac58df9f01c60776e85db;hpb=a733c4983025f9cbd1eb124a9926d115e4bf0457

diff --git a/uhttpd.h b/uhttpd.h
index 1e487f8..9ed6439 100644
--- a/uhttpd.h
+++ b/uhttpd.h
@@ -29,18 +29,26 @@
 #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 UH_LIMIT_MSGHEAD	4096
+
+#define __enum_header(_name) HDR_##_name,
+#define __blobmsg_header(_name) [HDR_##_name] = { .name = #_name, .type = BLOBMSG_TYPE_STRING },
+
+struct client;
 
 struct config {
-	char docroot[PATH_MAX];
-	char *realm;
-	char *file;
-	char *error_handler;
+	const char *docroot;
+	const char *realm;
+	const char *file;
+	const char *error_handler;
+	const char *cgi_prefix;
+	const char *cgi_path;
 	int no_symlinks;
 	int no_dirlists;
 	int network_timeout;
@@ -53,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 {
@@ -74,14 +82,10 @@ struct http_request {
 	enum http_method method;
 	enum http_version version;
 	int redirect_status;
-	char *url;
-	struct auth_realm *realm;
-};
-
-struct http_response {
-	int statuscode;
-	char *statusmsg;
-	char *headers[UH_LIMIT_HEADERS];
+	int content_length;
+	bool expect_cont;
+	uint8_t transfer_chunked;
+	const struct auth_realm *realm;
 };
 
 enum client_state {
@@ -92,48 +96,107 @@ enum client_state {
 	CLIENT_STATE_CLOSE,
 };
 
-struct client {
+struct interpreter {
 	struct list_head list;
-	int id;
+	const char *path;
+	const char *ext;
+};
 
-	struct ustream *us;
+struct path_info {
+	const char *root;
+	const char *phys;
+	const char *name;
+	const char *info;
+	const char *query;
+	const char *auth;
+	bool redirected;
+	struct stat stat;
+	const struct interpreter *ip;
+};
+
+struct env_var {
+	const char *name;
+	const char *value;
+};
+
+struct relay {
 	struct ustream_fd sfd;
-#ifdef HAVE_TLS
-	struct ustream_ssl stream_ssl;
-#endif
-	struct uloop_fd rpipe;
-	struct uloop_fd wpipe;
 	struct uloop_process proc;
-	struct uloop_timeout timeout;
-	bool (*cb)(struct client *);
-	void *priv;
+	struct client *cl;
 
-	enum client_state state;
+	bool process_done;
+	int ret;
+	int header_ofs;
 
-	struct http_request request;
-	struct http_response response;
-	struct sockaddr_in6 servaddr;
-	struct sockaddr_in6 peeraddr;
+	void (*header_cb)(struct relay *r, const char *name, const char *value);
+	void (*header_end)(struct relay *r);
+	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;
 
-	void (*dispatch_write_cb)(struct client *cl);
-	void (*dispatch_free)(struct client *cl);
+	bool (*check_url)(const char *url);
+	bool (*check_path)(struct path_info *pi, const char *url);
+	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;
-	} data;
+		struct dispatch_proc proc;
+	};
 };
 
+struct client {
+	struct list_head list;
+	int id;
+
+	struct ustream *us;
+	struct ustream_fd sfd;
+#ifdef HAVE_TLS
+	struct ustream_ssl ssl;
+#endif
+	struct uloop_timeout timeout;
+
+	enum client_state state;
+	bool tls;
+
+	struct http_request request;
+	struct uh_addr srv_addr, peer_addr;
+
+	struct blob_buf hdr;
+	struct dispatch dispatch;
+};
+
+extern char uh_buf[4096];
 extern int n_clients;
 extern struct config conf;
+extern const char * const http_versions[];
+extern const char * const http_methods[];
+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);
@@ -153,8 +216,26 @@ void uh_http_header(struct client *cl, int code, const char *summary);
 void __printf(4, 5)
 uh_client_error(struct client *cl, int code, const char *summary, const char *fmt, ...);
 
-void uh_handle_file_request(struct client *cl);
+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);
+
+void uh_interpreter_add(const char *ext, const char *path);
+void uh_dispatch_add(struct dispatch_handler *d);
+
+void uh_relay_open(struct client *cl, struct relay *r, int fd, int pid);
+void uh_relay_close(struct relay *r, int ret);
+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));
 
 #endif