X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuhttpd.git;a=blobdiff_plain;f=uhttpd.h;h=12cfc287676d870c51d2c5587b6f160d3fe36cf5;hp=3cd040d4689350dcaaa92293b15f6bed79994fed;hb=1eedd103be4919683f2d0b2165cefe82b73e4a5f;hpb=b7c85a2819b3869279a669d5681f574824589c6c

diff --git a/uhttpd.h b/uhttpd.h
index 3cd040d..12cfc28 100644
--- a/uhttpd.h
+++ b/uhttpd.h
@@ -29,6 +29,13 @@
 #include <libubox/ustream.h>
 #include <libubox/blob.h>
 #include <libubox/utils.h>
+#ifdef HAVE_UBUS
+#include <libubus.h>
+#include <json/json.h>
+#endif
+#ifdef HAVE_TLS
+#include <libubox/ustream-ssl.h>
+#endif
 
 #include "utils.h"
 
@@ -46,6 +53,10 @@ struct config {
 	const char *error_handler;
 	const char *cgi_prefix;
 	const char *cgi_path;
+	const char *lua_handler;
+	const char *lua_prefix;
+	const char *ubus_prefix;
+	const char *ubus_socket;
 	int no_symlinks;
 	int no_dirlists;
 	int network_timeout;
@@ -130,16 +141,45 @@ 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;
 
 	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);
+	void (*handle_request)(struct client *cl, char *url, struct path_info *pi);
+};
+
+#ifdef HAVE_UBUS
+struct dispatch_ubus {
+	struct ubus_request req;
+
+	struct uloop_timeout timeout;
+	struct json_tokener *jstok;
+	struct json_object *jsobj;
+	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 array;
+	int array_idx;
 };
+#endif
 
 struct dispatch {
-	void (*data_send)(struct client *cl, const char *data, int len);
+	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);
@@ -151,12 +191,10 @@ struct dispatch {
 			struct blob_attr **hdr;
 			int fd;
 		} file;
-		struct {
-			struct blob_buf hdr;
-			struct relay r;
-			int status_code;
-			char *status_msg;
-		} proc;
+		struct dispatch_proc proc;
+#ifdef HAVE_UBUS
+		struct dispatch_ubus ubus;
+#endif
 	};
 };
 
@@ -167,11 +205,12 @@ 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 uh_addr srv_addr, peer_addr;
@@ -189,7 +228,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);
@@ -211,6 +250,8 @@ uh_client_error(struct client *cl, int code, const char *summary, const char *fm
 
 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);
@@ -226,7 +267,10 @@ 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));
+bool uh_create_process(struct client *cl, struct path_info *pi, char *url,
+		       void (*cb)(struct client *cl, struct path_info *pi, char *url));
+
+int uh_plugin_init(const char *name);
+void uh_plugin_post_init(void);
 
 #endif