X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuhttpd.git;a=blobdiff_plain;f=uhttpd.h;h=c4afee8ed639c35439e0f204bed0be49fa886de0;hp=590d486d5aaa29bb48999bb3fb74bb62f83c3275;hb=eb098bcfb6b8ee61cb6ce164aea7f847ffa30dcb;hpb=f8573c7b4c3a9e1a67cae787690f27a976aee11c

diff --git a/uhttpd.h b/uhttpd.h
index 590d486..c4afee8 100644
--- a/uhttpd.h
+++ b/uhttpd.h
@@ -1,20 +1,20 @@
 /*
- * uhttpd - Tiny single-threaded httpd - Main header
+ * uhttpd - Tiny single-threaded httpd
  *
- *   Copyright (C) 2010-2012 Jo-Philipp Wich <xm@subsignal.org>
- *   Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ *   Copyright (C) 2010-2013 Jo-Philipp Wich <xm@subsignal.org>
+ *   Copyright (C) 2013 Felix Fietkau <nbd@openwrt.org>
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 #ifndef __UHTTPD_H
@@ -41,8 +41,8 @@
 
 #define UH_LIMIT_CLIENTS	64
 
-#define __enum_header(_name) HDR_##_name,
-#define __blobmsg_header(_name) [HDR_##_name] = { .name = #_name, .type = BLOBMSG_TYPE_STRING },
+#define __enum_header(_name, _val) HDR_##_name,
+#define __blobmsg_header(_name, _val) [HDR_##_name] = { .name = #_val, .type = BLOBMSG_TYPE_STRING },
 
 struct client;
 
@@ -62,7 +62,8 @@ struct config {
 	int network_timeout;
 	int rfc1918_filter;
 	int tcp_keepalive;
-	int max_requests;
+	int max_script_requests;
+	int max_connections;
 	int http_keepalive;
 	int script_timeout;
 };
@@ -86,12 +87,26 @@ enum http_version {
 	UH_HTTP_VER_1_1,
 };
 
+enum http_user_agent {
+	UH_UA_UNKNOWN,
+	UH_UA_GECKO,
+	UH_UA_CHROME,
+	UH_UA_SAFARI,
+	UH_UA_MSIE,
+	UH_UA_KONQUEROR,
+	UH_UA_OPERA,
+	UH_UA_MSIE_OLD,
+	UH_UA_MSIE_NEW,
+};
+
 struct http_request {
 	enum http_method method;
 	enum http_version version;
+	enum http_user_agent ua;
 	int redirect_status;
 	int content_length;
 	bool expect_cont;
+	bool connection_close;
 	uint8_t transfer_chunked;
 	const struct auth_realm *realm;
 };
@@ -142,6 +157,7 @@ struct relay {
 };
 
 struct dispatch_proc {
+	struct uloop_timeout timeout;
 	struct blob_buf hdr;
 	struct uloop_fd wrfd;
 	struct relay r;
@@ -151,6 +167,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);
@@ -160,13 +177,21 @@ struct dispatch_handler {
 #ifdef HAVE_UBUS
 struct dispatch_ubus {
 	struct ubus_request req;
+
+	struct uloop_timeout timeout;
 	struct json_tokener *jstok;
 	struct json_object *jsobj;
-	uint32_t obj;
+	struct json_object *jsobj_cur;
 	int post_len;
+
+	const char *sid;
+	uint32_t obj;
 	const char *func;
+
+	struct blob_buf buf;
 	bool req_pending;
-	bool header_sent;
+	bool array;
+	int array_idx;
 };
 #endif
 
@@ -176,6 +201,10 @@ 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;
 
 	union {
@@ -200,6 +229,7 @@ struct client {
 	struct ustream_ssl ssl;
 #endif
 	struct uloop_timeout timeout;
+	int requests;
 
 	enum client_state state;
 	bool tls;
@@ -257,6 +287,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,