X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fhtparser.c;h=503df99a719ffda1c859d19c0d929dd0745f88dc;hb=6a7a868e28e79f5502cc4b37578c263f640439c8;hp=953ddac89f5faaa64ccb2691b50682c98b1f16de;hpb=f0cbd8d7d17f9da506af58f1ce5364ade86d574e;p=ashd.git

diff --git a/src/htparser.c b/src/htparser.c
index 953ddac..503df99 100644
--- a/src/htparser.c
+++ b/src/htparser.c
@@ -22,6 +22,7 @@
 #include <string.h>
 #include <sys/socket.h>
 #include <pwd.h>
+#include <sys/signal.h>
 #include <errno.h>
 
 #ifdef HAVE_CONFIG_H
@@ -37,6 +38,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 +104,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 +353,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 +390,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 +409,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,15 +435,14 @@ int main(int argc, char **argv)
 	case 'r':
 	    root = optarg;
 	    break;
+	case 'p':
+	    pidfile = optarg;
+	    break;
 	default:
 	    usage(stderr);
 	    exit(1);
 	}
     }
-    if((argc - optind) < 3) {
-	usage(stderr);
-	exit(1);
-    }
     s1 = 0;
     for(i = optind; i < argc; i++) {
 	if(!strcmp(argv[i], "--"))
@@ -430,11 +454,18 @@ int main(int argc, char **argv)
 	usage(stderr);
 	exit(1);
     }
-    if((plex = stdmkchild(argv + ++i)) < 0) {
+    if((plex = stdmkchild(argv + ++i, NULL, NULL)) < 0) {
 	flog(LOG_ERR, "could not spawn root multiplexer: %s", strerror(errno));
 	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) {
@@ -453,9 +484,14 @@ int main(int argc, char **argv)
 	    exit(1);
 	}
     }
+    signal(SIGPIPE, SIG_IGN);
     if(daemonize) {
 	daemon(0, 0);
     }
+    if(pidout != NULL) {
+	fprintf(pidout, "%i\n", getpid());
+	fclose(pidout);
+    }
     ioloop();
     return(0);
 }