declare dispatch struct type

[project/uhttpd.git] / uhttpd.h

diff --git a/uhttpd.h b/uhttpd.h
index 24ad83d..e92c469 100644 (file)
--- a/uhttpd.h
+++ b/uhttpd.h
@@ -33,7 +33,6 @@
 #include "utils.h"
 
 #define UH_LIMIT_CLIENTS       64
-#define UH_LIMIT_HEADERS       64
 
 #define __enum_header(_name) HDR_##_name,
 #define __blobmsg_header(_name) [HDR_##_name] = { .name = #_name, .type = BLOBMSG_TYPE_STRING },
@@ -59,9 +58,9 @@ struct config {
 
 struct auth_realm {
        struct list_head list;
-       char *path;
-       char *user;
-       char *pass;
+       const char *path;
+       const char *user;
+       const char *pass;
 };
 
 enum http_method {
@@ -79,8 +78,9 @@ enum http_version {
 struct http_request {
        enum http_method method;
        enum http_version version;
+       bool expect_cont;
        int redirect_status;
-       char *url;
+       const char *url;
        const struct auth_realm *realm;
 };
 
@@ -94,8 +94,8 @@ enum client_state {
 
 struct interpreter {
        struct list_head list;
-       char *path;
-       char *ext;
+       const char *path;
+       const char *ext;
 };
 
 struct path_info {
@@ -104,9 +104,10 @@ struct path_info {
        const char *name;
        const char *info;
        const char *query;
-       int redirected;
+       const char *auth;
+       bool redirected;
        struct stat stat;
-       struct interpreter *ip;
+       const struct interpreter *ip;
 };
 
 struct env_var {
@@ -136,6 +137,24 @@ struct dispatch_handler {
        void (*handle_request)(struct client *cl, const char *url, struct path_info *pi);
 };
 
+struct dispatch {
+       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;
+       };
+};
+
 struct client {
        struct list_head list;
        int id;
@@ -150,28 +169,10 @@ struct client {
        enum client_state state;
 
        struct http_request request;
-       struct sockaddr_in6 servaddr;
-       struct sockaddr_in6 peeraddr;
+       struct uh_addr srv_addr, peer_addr;
 
        struct blob_buf hdr;
-
-       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;
+       struct dispatch dispatch;
 };
 
 extern char uh_buf[4096];
@@ -206,6 +207,7 @@ uh_client_error(struct client *cl, int code, const char *summary, const char *fm
 void uh_handle_request(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);
 
 void uh_close_listen_fds(void);
 void uh_close_fds(void);