X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuhttpd.git;a=blobdiff_plain;f=uhttpd.h;h=24ad83de82718e329353e3530735b7c35f5083c6;hp=0c1cd8b6165d46850bcb35287b00819e7512cb0d;hb=387e33a6edc0cbddd3c262a107e3b9026cd55872;hpb=5ddf71b3638788f8d1dd1d312ec79acfac7f3e74

diff --git a/uhttpd.h b/uhttpd.h
index 0c1cd8b..24ad83d 100644
--- a/uhttpd.h
+++ b/uhttpd.h
@@ -28,18 +28,25 @@
 #include <libubox/uloop.h>
 #include <libubox/ustream.h>
 #include <libubox/blob.h>
+#include <libubox/utils.h>
 
 #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;
@@ -47,13 +54,14 @@ struct config {
 	int tcp_keepalive;
 	int max_requests;
 	int http_keepalive;
+	int script_timeout;
 };
 
 struct auth_realm {
 	struct list_head list;
-	char path[PATH_MAX];
-	char user[32];
-	char pass[128];
+	char *path;
+	char *user;
+	char *pass;
 };
 
 enum http_method {
@@ -73,13 +81,7 @@ struct http_request {
 	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];
+	const struct auth_realm *realm;
 };
 
 enum client_state {
@@ -90,6 +92,50 @@ enum client_state {
 	CLIENT_STATE_CLOSE,
 };
 
+struct interpreter {
+	struct list_head list;
+	char *path;
+	char *ext;
+};
+
+struct path_info {
+	const char *root;
+	const char *phys;
+	const char *name;
+	const char *info;
+	const char *query;
+	int redirected;
+	struct stat stat;
+	struct interpreter *ip;
+};
+
+struct env_var {
+	const char *name;
+	const char *value;
+};
+
+struct relay {
+	struct ustream_fd sfd;
+	struct uloop_process proc;
+	struct client *cl;
+
+	bool process_done;
+	int ret;
+	int header_ofs;
+
+	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_handler {
+	struct list_head list;
+
+	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 client {
 	struct list_head list;
 	int id;
@@ -99,35 +145,41 @@ struct client {
 #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;
 
 	enum client_state state;
 
 	struct http_request request;
-	struct http_response response;
 	struct sockaddr_in6 servaddr;
 	struct sockaddr_in6 peeraddr;
 
 	struct blob_buf hdr;
 
-	void (*dispatch_write_cb)(struct client *cl);
-	void (*dispatch_free)(struct client *cl);
-
-	union {
-		struct {
-			struct blob_attr **hdr;
-			int fd;
-		} file;
-	} data;
+	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;
 };
 
+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);
 
@@ -151,8 +203,22 @@ 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 uh_auth_add(const char *path, const char *user, const char *pass);
 
+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, int fd));
+
 #endif