constify, fix types

[project/uhttpd.git] / uhttpd.h

diff --git a/uhttpd.h b/uhttpd.h
index 24ad83d..22653b5 100644 (file)
--- a/uhttpd.h
+++ b/uhttpd.h
@@ -59,9 +59,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 {
@@ -80,7 +80,7 @@ struct http_request {
        enum http_method method;
        enum http_version version;
        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,9 @@ struct path_info {
        const char *name;
        const char *info;
        const char *query;
-       int redirected;
+       bool redirected;
        struct stat stat;
-       struct interpreter *ip;
+       const struct interpreter *ip;
 };
 
 struct env_var {
@@ -136,6 +136,15 @@ 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;
+       union {
+               struct in_addr in;
+               struct in6_addr in6;
+       };
+};
+
 struct client {
        struct list_head list;
        int id;
@@ -150,8 +159,7 @@ 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;