#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 },
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 {
enum http_method method;
enum http_version version;
int redirect_status;
- char *url;
+ int content_length;
+ bool expect_cont;
+ uint8_t transfer_chunked;
const struct auth_realm *realm;
};
struct interpreter {
struct list_head list;
- char *path;
- char *ext;
+ const char *path;
+ const char *ext;
};
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 {
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;
void (*handle_request)(struct client *cl, const char *url, struct path_info *pi);
};
+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 {
+ struct blob_attr **hdr;
+ int fd;
+ } file;
+ struct dispatch_proc proc;
+ };
+};
+
struct client {
struct list_head list;
int id;
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];
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);
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