add lua plugin support

[project/uhttpd.git] / main.c

diff --git a/main.c b/main.c
index f61574f..cefd4ab 100644 (file)
--- a/main.c
+++ b/main.c
@@ -17,6 +17,9 @@
  *  limitations under the License.
  */
 
+#define _BSD_SOURCE
+#define _GNU_SOURCE
+#define _XOPEN_SOURCE  700
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -29,6 +32,7 @@
 #include <libubox/usock.h>
 
 #include "uhttpd.h"
+#include "tls.h"
 
 char uh_buf[4096];
 
@@ -80,20 +84,14 @@ static void uh_config_parse(void)
 
                        conf.error_handler = strdup(col1);
                }
-#ifdef HAVE_CGI
                else if ((line[0] == '*') && (strchr(line, ':') != NULL)) {
                        if (!(col1 = strchr(line, '*')) || (*col1++ = 0) ||
                                !(col2 = strchr(col1, ':')) || (*col2++ = 0) ||
                                !(eol = strchr(col2, '\n')) || (*eol++  = 0))
                                continue;
 
-                       if (!uh_interpreter_add(col1, col2))
-                               fprintf(stderr,
-                                               "Unable to add interpreter %s for extension %s: "
-                                               "Out of memory\n", col2, col1
-                               );
+                       uh_interpreter_add(col1, col2);
                }
-#endif
        }
 
        fclose(c);
@@ -158,7 +156,7 @@ 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";
@@ -187,11 +185,13 @@ static void fixup_prefix(char *str)
 
 int main(int argc, char **argv)
 {
+       const char *tls_key, *tls_crt;
        bool nofork = false;
        char *port;
        int opt, ch;
        int cur_fd;
        int bound = 0;
+       int n_tls = 0;
 
        BUILD_BUG_ON(sizeof(uh_buf) < PATH_MAX);
 
@@ -204,6 +204,7 @@ int main(int argc, char **argv)
 
                switch(ch) {
                case 's':
+                       n_tls++;
                        tls = true;
                        /* fall through */
                case 'p':
@@ -321,6 +322,22 @@ int main(int argc, char **argv)
                        conf.file = optarg;
                        break;
 
+               case 'C':
+                       tls_crt = optarg;
+                       break;
+
+               case 'K':
+                       tls_key = optarg;
+                       break;
+#ifdef HAVE_LUA
+               case 'l':
+                       conf.lua_prefix = optarg;
+                       break;
+
+               case 'L':
+                       conf.lua_handler = optarg;
+                       break;
+#endif
                default:
                        return usage(argv[0]);
                }
@@ -333,6 +350,33 @@ int main(int argc, char **argv)
                return 1;
        }
 
+       if (n_tls) {
+               if (!tls_crt || !tls_key) {
+                       fprintf(stderr, "Please specify a certificate and "
+                                       "a key file to enable SSL support\n");
+                       return 1;
+               }
+
+#ifdef HAVE_TLS
+               if (uh_tls_init(tls_key, tls_crt))
+                   return 1;
+#else
+               fprintf(stderr, "Error: TLS support not compiled in.\n");
+               return 1;
+#endif
+       }
+
+#ifdef HAVE_LUA
+       if (conf.lua_handler || conf.lua_prefix) {
+               if (!conf.lua_handler || !conf.lua_prefix) {
+                       fprintf(stderr, "Need handler and prefix to enable Lua support\n");
+                       return 1;
+               }
+               if (uh_plugin_init("uhttpd_lua.so"))
+                       return 1;
+       }
+#endif
+
        /* fork (if not disabled) */
        if (!nofork) {
                switch (fork()) {