X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fhtparser.c;h=503df99a719ffda1c859d19c0d929dd0745f88dc;hb=19409e874c34c5e442dc4cefe2d08981d4412c6c;hp=3fcca75bea6a0175b55b56e3a9f63b0f4e7e6dcd;hpb=df431d1dea41436768530055dbd0e95a4acba45f;p=ashd.git

diff --git a/src/htparser.c b/src/htparser.c
index 3fcca75..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,7 @@
 #include "htparser.h"
 
 static int plex;
+static char *pidfile = NULL;
 
 static void trimx(struct hthead *req)
 {
@@ -351,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)
@@ -388,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);
@@ -403,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);
@@ -428,6 +435,9 @@ int main(int argc, char **argv)
 	case 'r':
 	    root = optarg;
 	    break;
+	case 'p':
+	    pidfile = optarg;
+	    break;
 	default:
 	    usage(stderr);
 	    exit(1);
@@ -444,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) {
@@ -467,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);
 }