htparser: Fixed pidfile-less bug.

[ashd.git] / src / htparser.c

diff --git a/src/htparser.c b/src/htparser.c
index f489b2c..0824902 100644 (file)
--- a/src/htparser.c
+++ b/src/htparser.c
@@ -37,6 +37,24 @@
 #include "htparser.h"
 
 static int plex;
+static char *pidfile = NULL;
+
+static void trimx(struct hthead *req)
+{
+    int i;
+    
+    i = 0;
+    while(i < req->noheaders) {
+       if(!strncasecmp(req->headers[i][0], "x-ash-", 6)) {
+           free(req->headers[i][0]);
+           free(req->headers[i][1]);
+           free(req->headers[i]);
+           memmove(req->headers + i, req->headers + i + 1, sizeof(*req->headers) * (--req->noheaders - i));
+       } else {
+           i++;
+       }
+    }
+}
 
 static struct hthead *parsereq(FILE *in)
 {
@@ -85,6 +103,7 @@ static struct hthead *parsereq(FILE *in)
     req = mkreq(method.b, url.b, ver.b);
     if(parseheaders(req, in))
        goto fail;
+    trimx(req);
     goto out;
     
 fail:
@@ -333,9 +352,9 @@ static void plexwatch(struct muth *muth, va_list args)
 
 static void usage(FILE *out)
 {
-    fprintf(out, "usage: htparser [-hSf] [-u USER] [-r ROOT] PORTSPEC... -- ROOT [ARGS...]\n");
+    fprintf(out, "usage: htparser [-hSf] [-u USER] [-r ROOT] [-p PIDFILE] PORTSPEC... -- ROOT [ARGS...]\n");
     fprintf(out, "\twhere PORTSPEC is HANDLER[:PAR[=VAL][(,PAR[=VAL])...]] (try HANDLER:help)\n");
-    fprintf(out, "\tavailable handlers are `plain'.\n");
+    fprintf(out, "\tavailable handlers are `plain' and `ssl'.\n");
 }
 
 static void addport(char *spec)
@@ -370,6 +389,10 @@ static void addport(char *spec)
     /* XXX: It would be nice to decentralize this, but, meh... */
     if(!strcmp(nm, "plain")) {
        handleplain(pars.d, pars.b, vals.b);
+#ifdef HAVE_GNUTLS
+    } else if(!strcmp(nm, "ssl")) {
+       handlegnussl(pars.d, pars.b, vals.b);
+#endif
     } else {
        flog(LOG_ERR, "htparser: unknown port handler `%s'", nm);
        exit(1);
@@ -385,12 +408,13 @@ int main(int argc, char **argv)
     int i, s1;
     int daemonize, logsys;
     char *root;
+    FILE *pidout;
     struct passwd *pwent;
     
     daemonize = logsys = 0;
     root = NULL;
     pwent = NULL;
-    while((c = getopt(argc, argv, "+hSfu:r:")) >= 0) {
+    while((c = getopt(argc, argv, "+hSfu:r:p:")) >= 0) {
        switch(c) {
        case 'h':
            usage(stdout);
@@ -410,6 +434,9 @@ int main(int argc, char **argv)
        case 'r':
            root = optarg;
            break;
+       case 'p':
+           pidfile = optarg;
+           break;
        default:
            usage(stderr);
            exit(1);
@@ -431,6 +458,13 @@ int main(int argc, char **argv)
        return(1);
     }
     mustart(plexwatch, plex);
+    pidout = NULL;
+    if(pidfile != NULL) {
+       if((pidout = fopen(pidfile, "w")) == NULL) {
+           flog(LOG_ERR, "could not open %s for writing: %s", pidfile, strerror(errno));
+           return(1);
+       }
+    }
     if(logsys)
        opensyslog();
     if(root) {
@@ -452,6 +486,10 @@ int main(int argc, char **argv)
     if(daemonize) {
        daemon(0, 0);
     }
+    if(pidout != NULL) {
+       fprintf(pidout, "%i\n", getpid());
+       fclose(pidout);
+    }
     ioloop();
     return(0);
 }