declare dispatch struct type

[project/uhttpd.git] / main.c

diff --git a/main.c b/main.c
index 41b8eba..100e285 100644 (file)
--- a/main.c
+++ b/main.c
@@ -30,6 +30,7 @@
 
 #include "uhttpd.h"
 
+char uh_buf[4096];
 
 static int run_server(void)
 {
@@ -98,7 +99,7 @@ static void uh_config_parse(void)
        fclose(c);
 }
 
-static void add_listener_arg(char *arg, bool tls)
+static int add_listener_arg(char *arg, bool tls)
 {
        char *host = NULL;
        char *port = arg;
@@ -110,20 +111,58 @@ static void add_listener_arg(char *arg, bool tls)
                port = s + 1;
                *s = 0;
        }
-       uh_socket_bind(host, port, tls);
+
+       return uh_socket_bind(host, port, tls);
 }
 
 static int usage(const char *name)
 {
-       fprintf(stderr, "Usage: %s -p <port>\n", name);
+       fprintf(stderr,
+               "Usage: %s -p [addr:]port -h docroot\n"
+               "       -f              Do not fork to background\n"
+               "       -c file         Configuration file, default is '/etc/httpd.conf'\n"
+               "       -p [addr:]port  Bind to specified address and port, multiple allowed\n"
+#ifdef HAVE_TLS
+               "       -s [addr:]port  Like -p but provide HTTPS on this port\n"
+               "       -C file         ASN.1 server certificate file\n"
+               "       -K file         ASN.1 server private key file\n"
+#endif
+               "       -h directory    Specify the document root, default is '.'\n"
+               "       -E string       Use given virtual URL as 404 error handler\n"
+               "       -I string       Use given filename as index for directories, multiple allowed\n"
+               "       -S              Do not follow symbolic links outside of the docroot\n"
+               "       -D              Do not allow directory listings, send 403 instead\n"
+               "       -R              Enable RFC1918 filter\n"
+               "       -n count        Maximum allowed number of concurrent requests\n"
+#ifdef HAVE_LUA
+               "       -l string       URL prefix for Lua handler, default is '/lua'\n"
+               "       -L file         Lua handler script, omit to disable Lua\n"
+#endif
+#ifdef HAVE_UBUS
+               "       -u string       URL prefix for HTTP/JSON handler\n"
+               "       -U file         Override ubus socket path\n"
+#endif
+               "       -x string       URL prefix for CGI handler, default is '/cgi-bin'\n"
+               "       -i .ext=path    Use interpreter at path for files with the given extension\n"
+               "       -t seconds      CGI, Lua and UBUS script timeout in seconds, default is 60\n"
+               "       -T seconds      Network timeout in seconds, default is 30\n"
+               "       -d string       URL decode given string\n"
+               "       -r string       Specify basic auth realm\n"
+               "       -m string       MD5 crypt given string\n"
+               "\n", name
+       );
        return 1;
 }
 
 static void init_defaults(void)
 {
+       conf.script_timeout = 60;
        conf.network_timeout = 30;
-       conf.http_keepalive = 0; /* fixme */
+       conf.http_keepalive = 20;
        conf.max_requests = 3;
+       conf.realm = "Protected Area";
+       conf.cgi_prefix = "/cgi-bin";
+       conf.cgi_path = "/sbin:/usr/sbin:/bin:/usr/bin";
 
        uh_index_add("index.html");
        uh_index_add("index.htm");
@@ -131,13 +170,32 @@ static void init_defaults(void)
        uh_index_add("default.htm");
 }
 
+static void fixup_prefix(char *str)
+{
+       int len;
+
+       if (!str || !str[0])
+               return;
+
+       len = strlen(str) - 1;
+
+       while (len > 0 && str[len] == '/')
+               len--;
+
+       str[len + 1] = 0;
+}
+
 int main(int argc, char **argv)
 {
        bool nofork = false;
        char *port;
        int opt, ch;
        int cur_fd;
+       int bound = 0;
 
+       BUILD_BUG_ON(sizeof(uh_buf) < PATH_MAX);
+
+       uh_dispatch_add(&cgi_dispatch);
        init_defaults();
        signal(SIGPIPE, SIG_IGN);
 
@@ -149,15 +207,16 @@ int main(int argc, char **argv)
                        tls = true;
                        /* fall through */
                case 'p':
-                       add_listener_arg(optarg, tls);
+                       bound += add_listener_arg(optarg, tls);
                        break;
 
                case 'h':
-                       if (!realpath(optarg, conf.docroot)) {
+                       if (!realpath(optarg, uh_buf)) {
                                fprintf(stderr, "Error: Invalid directory %s: %s\n",
                                                optarg, strerror(errno));
                                exit(1);
                        }
+                       conf.docroot = strdup(uh_buf);
                        break;
 
                case 'E':
@@ -194,6 +253,23 @@ int main(int argc, char **argv)
                        conf.max_requests = atoi(optarg);
                        break;
 
+               case 'x':
+                       fixup_prefix(optarg);
+                       conf.cgi_prefix = optarg;
+                       break;
+
+               case 'i':
+                       port = strchr(optarg, '=');
+                       if (optarg[0] != '.' || !port) {
+                               fprintf(stderr, "Error: Invalid interpreter: %s\n",
+                                               optarg);
+                               exit(1);
+                       }
+
+                       *port++ = 0;
+                       uh_interpreter_add(optarg, port);
+                       break;
+
                case 't':
                        conf.script_timeout = atoi(optarg);
                        break;
@@ -252,6 +328,11 @@ int main(int argc, char **argv)
 
        uh_config_parse();
 
+       if (!bound) {
+               fprintf(stderr, "Error: No sockets bound, unable to continue\n");
+               return 1;
+       }
+
        /* fork (if not disabled) */
        if (!nofork) {
                switch (fork()) {