X-Git-Url: http://git.openwrt.org/?p=project%2Fuhttpd.git;a=blobdiff_plain;f=uhttpd.h;h=b358a0b44236aa6e00b2805e9a12ca3a2d29f75b;hp=e73e2355b3e4676b59cdb87df4f50cb99c9bcf24;hb=ad93be7632963da1bd5b67d71021d1d63ecfd909;hpb=7635644189f73847d9a56911c8883cb7728a34cc

diff --git a/uhttpd.h b/uhttpd.h
index e73e235..b358a0b 100644
--- a/uhttpd.h
+++ b/uhttpd.h
@@ -31,7 +31,7 @@
 #include <libubox/utils.h>
 #ifdef HAVE_UBUS
 #include <libubus.h>
-#include <json/json.h>
+#include <json-c/json.h>
 #endif
 #ifdef HAVE_TLS
 #include <libubox/ustream-ssl.h>
@@ -46,12 +46,19 @@
 
 struct client;
 
+struct alias {
+	struct list_head list;
+	char *alias;
+	char *path;
+};
+
 struct config {
 	const char *docroot;
 	const char *realm;
 	const char *file;
 	const char *error_handler;
 	const char *cgi_prefix;
+	const char *cgi_docroot_path;
 	const char *cgi_path;
 	const char *lua_handler;
 	const char *lua_prefix;
@@ -61,10 +68,16 @@ struct config {
 	int no_dirlists;
 	int network_timeout;
 	int rfc1918_filter;
+	int tls_redirect;
 	int tcp_keepalive;
-	int max_requests;
+	int max_script_requests;
+	int max_connections;
 	int http_keepalive;
 	int script_timeout;
+	int ubus_noauth;
+	int ubus_cors;
+	int cgi_prefix_len;
+	struct list_head cgi_alias;
 };
 
 struct auth_realm {
@@ -78,6 +91,7 @@ enum http_method {
 	UH_HTTP_MSG_GET,
 	UH_HTTP_MSG_POST,
 	UH_HTTP_MSG_HEAD,
+	UH_HTTP_MSG_OPTIONS,
 };
 
 enum http_version {
@@ -106,6 +120,7 @@ struct http_request {
 	int content_length;
 	bool expect_cont;
 	bool connection_close;
+	bool disable_chunked;
 	uint8_t transfer_chunked;
 	const struct auth_realm *realm;
 };
@@ -116,6 +131,7 @@ enum client_state {
 	CLIENT_STATE_DATA,
 	CLIENT_STATE_DONE,
 	CLIENT_STATE_CLOSE,
+	CLIENT_STATE_CLEANUP,
 };
 
 struct interpreter {
@@ -144,9 +160,13 @@ struct env_var {
 struct relay {
 	struct ustream_fd sfd;
 	struct uloop_process proc;
+	struct uloop_timeout timeout;
 	struct client *cl;
 
 	bool process_done;
+	bool error;
+	bool skip_data;
+
 	int ret;
 	int header_ofs;
 
@@ -156,6 +176,7 @@ struct relay {
 };
 
 struct dispatch_proc {
+	struct uloop_timeout timeout;
 	struct blob_buf hdr;
 	struct uloop_fd wrfd;
 	struct relay r;
@@ -165,6 +186,7 @@ struct dispatch_proc {
 
 struct dispatch_handler {
 	struct list_head list;
+	bool script;
 
 	bool (*check_url)(const char *url);
 	bool (*check_path)(struct path_info *pi, const char *url);
@@ -181,7 +203,6 @@ struct dispatch_ubus {
 	struct json_object *jsobj_cur;
 	int post_len;
 
-	const char *sid;
 	uint32_t obj;
 	const char *func;
 
@@ -198,7 +219,12 @@ struct dispatch {
 	void (*write_cb)(struct client *cl);
 	void (*close_fds)(struct client *cl);
 	void (*free)(struct client *cl);
+
+	void *req_data;
+	void (*req_free)(struct client *cl);
+
 	bool data_blocked;
+	bool no_cache;
 
 	union {
 		struct {
@@ -214,6 +240,7 @@ struct dispatch {
 
 struct client {
 	struct list_head list;
+	int refcount;
 	int id;
 
 	struct ustream *us;
@@ -222,14 +249,17 @@ struct client {
 	struct ustream_ssl ssl;
 #endif
 	struct uloop_timeout timeout;
+	int requests;
 
 	enum client_state state;
 	bool tls;
 
+	int http_code;
 	struct http_request request;
 	struct uh_addr srv_addr, peer_addr;
 
 	struct blob_buf hdr;
+	struct blob_buf hdr_response;
 	struct dispatch dispatch;
 };
 
@@ -248,6 +278,8 @@ void uh_unblock_listeners(void);
 void uh_setup_listeners(void);
 int uh_socket_bind(const char *host, const char *port, bool tls);
 
+int uh_first_tls_port(int family);
+
 bool uh_use_chunked(struct client *cl);
 void uh_chunk_write(struct client *cl, const void *data, int len);
 void uh_chunk_vprintf(struct client *cl, const char *format, va_list arg);
@@ -268,7 +300,8 @@ 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);
+bool uh_auth_check(struct client *cl, const char *path, const char *auth,
+                   char **uptr, char **pptr);
 
 void uh_close_listen_fds(void);
 void uh_close_fds(void);
@@ -279,6 +312,7 @@ 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);
+void uh_relay_kill(struct client *cl, 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, char *url,
@@ -287,4 +321,23 @@ bool uh_create_process(struct client *cl, struct path_info *pi, char *url,
 int uh_plugin_init(const char *name);
 void uh_plugin_post_init(void);
 
+int uh_handler_add(const char *file);
+int uh_handler_run(struct client *cl, char **url, bool fallback);
+
+struct path_info *uh_path_lookup(struct client *cl, const char *url);
+
+static inline void uh_client_ref(struct client *cl)
+{
+	cl->refcount++;
+}
+
+static inline void uh_client_unref(struct client *cl)
+{
+	if (--cl->refcount)
+		return;
+
+	if (cl->state == CLIENT_STATE_CLEANUP)
+		ustream_state_change(cl->us);
+}
+
 #endif