file: remove unused "auth" member from struct path_info

[project/uhttpd.git] / uhttpd.h

diff --git a/uhttpd.h b/uhttpd.h
index c4afee8..374cd72 100644 (file)
--- 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,11 +68,16 @@ struct config {
        int no_dirlists;
        int network_timeout;
        int rfc1918_filter;
+       int tls_redirect;
        int tcp_keepalive;
        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 {
@@ -79,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 {
@@ -107,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;
 };
@@ -117,6 +131,7 @@ enum client_state {
        CLIENT_STATE_DATA,
        CLIENT_STATE_DONE,
        CLIENT_STATE_CLOSE,
+       CLIENT_STATE_CLEANUP,
 };
 
 struct interpreter {
@@ -131,7 +146,6 @@ struct path_info {
        const char *name;
        const char *info;
        const char *query;
-       const char *auth;
        bool redirected;
        struct stat stat;
        const struct interpreter *ip;
@@ -145,9 +159,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;
 
@@ -184,7 +202,6 @@ struct dispatch_ubus {
        struct json_object *jsobj_cur;
        int post_len;
 
-       const char *sid;
        uint32_t obj;
        const char *func;
 
@@ -206,6 +223,7 @@ struct dispatch {
        void (*req_free)(struct client *cl);
 
        bool data_blocked;
+       bool no_cache;
 
        union {
                struct {
@@ -221,6 +239,7 @@ struct dispatch {
 
 struct client {
        struct list_head list;
+       int refcount;
        int id;
 
        struct ustream *us;
@@ -234,10 +253,12 @@ struct client {
        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;
 };
 
@@ -256,6 +277,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);
@@ -276,7 +299,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);
@@ -296,4 +320,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