use pipes instead of a socketpair, EOF handling is broken with sockets

[project/uhttpd.git] / uhttpd.h

diff --git a/uhttpd.h b/uhttpd.h
index 22653b5..a9777e8 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 },
@@ -80,7 +79,9 @@ struct http_request {
        enum http_method method;
        enum http_version version;
        int redirect_status;
-       const char *url;
+       int content_length;
+       bool expect_cont;
+       uint8_t transfer_chunked;
        const struct auth_realm *realm;
 };
 
@@ -104,6 +105,7 @@ struct path_info {
        const char *name;
        const char *info;
        const char *query;
+       const char *auth;
        bool redirected;
        struct stat stat;
        const struct interpreter *ip;
@@ -128,6 +130,14 @@ 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;
 
@@ -136,12 +146,20 @@ struct dispatch_handler {
        void (*handle_request)(struct client *cl, const char *url, struct path_info *pi);
 };
 
-struct uh_addr {
-       uint8_t family;
-       uint16_t port;
+struct dispatch {
+       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);
+       void (*free)(struct client *cl);
+       bool data_blocked;
+
        union {
-               struct in_addr in;
-               struct in6_addr in6;
+               struct {
+                       struct blob_attr **hdr;
+                       int fd;
+               } file;
+               struct dispatch_proc proc;
        };
 };
 
@@ -162,24 +180,7 @@ struct client {
        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];
@@ -212,8 +213,10 @@ void __printf(4, 5)
 uh_client_error(struct client *cl, int code, const char *summary, const char *fmt, ...);
 
 void uh_handle_request(struct client *cl);
+void client_poll_post_data(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);
@@ -227,6 +230,6 @@ 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));
+                      void (*cb)(struct client *cl, struct path_info *pi));
 
 #endif