X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fpatplex.c;h=3b3d7f9a5741855c53e7f97e8f7cf928ecebc0a0;hb=578ad6b1de34230e8fe64116b16380c1441ef9dd;hp=2ea28d5f54c1fb82cd65e261daf0b6e22b462f3e;hpb=0fc6fd13c5bd44e6d595b56337a95156fd42ceea;p=ashd.git

diff --git a/src/patplex.c b/src/patplex.c
index 2ea28d5..3b3d7f9 100644
--- a/src/patplex.c
+++ b/src/patplex.c
@@ -24,6 +24,7 @@
 #include <errno.h>
 #include <ctype.h>
 #include <regex.h>
+#include <sys/wait.h>
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -64,6 +65,7 @@ struct pattern {
 };
 
 static struct config *gconfig, *lconfig;
+static volatile int reload = 0;
 
 static void freepattern(struct pattern *pat)
 {
@@ -83,6 +85,22 @@ static void freepattern(struct pattern *pat)
     free(pat);
 }
 
+static void freeconfig(struct config *cf)
+{
+    struct child *ch, *nch;
+    struct pattern *pat, *npat;
+    
+    for(ch = cf->children; ch != NULL; ch = nch) {
+	nch = ch->next;
+	freechild(ch);
+    }
+    for(pat = cf->patterns; pat != NULL; pat = npat) {
+	npat = pat->next;
+	freepattern(pat);
+    }
+    free(cf);
+}
+
 static struct child *getchild(struct config *cf, char *name)
 {
     struct child *ch;
@@ -421,10 +439,47 @@ static void serve(struct hthead *req, int fd)
 	return;
     }
     
-    if(childhandle(ch, req, fd))
+    if(childhandle(ch, req, fd, NULL, NULL))
 	simpleerror(fd, 500, "Server Error", "The request handler crashed.");
 }
 
+static void reloadconf(char *nm)
+{
+    struct config *cf;
+    struct child *ch1, *ch2;
+    
+    if((cf = readconfig(nm)) == NULL) {
+	flog(LOG_WARNING, "could not reload configuration file `%s'", nm);
+	return;
+    }
+    for(ch1 = cf->children; ch1 != NULL; ch1 = ch1->next) {
+	for(ch2 = lconfig->children; ch2 != NULL; ch2 = ch2->next) {
+	    if(!strcmp(ch1->name, ch2->name)) {
+		ch1->fd = ch2->fd;
+		ch2->fd = -1;
+		break;
+	    }
+	}
+    }
+    freeconfig(lconfig);
+    lconfig = cf;
+}
+
+static void chldhandler(int sig)
+{
+    pid_t pid;
+    
+    do {
+	pid = waitpid(-1, NULL, WNOHANG);
+    } while(pid > 0);
+}
+
+static void sighandler(int sig)
+{
+    if(sig == SIGHUP)
+	reload = 1;
+}
+
 static void usage(FILE *out)
 {
     fprintf(out, "usage: patplex [-hN] CONFIGFILE\n");
@@ -462,10 +517,21 @@ int main(int argc, char **argv)
 	    free(gcf);
 	}
     }
-    lconfig = readconfig(argv[optind]);
-    signal(SIGCHLD, SIG_IGN);
+    if((lconfig = readconfig(argv[optind])) == NULL) {
+	flog(LOG_ERR, "could not read `%s'", argv[optind]);
+	exit(1);
+    }
+    signal(SIGCHLD, chldhandler);
+    signal(SIGHUP, sighandler);
+    signal(SIGPIPE, sighandler);
     while(1) {
+	if(reload) {
+	    reloadconf(argv[optind]);
+	    reload = 0;
+	}
 	if((fd = recvreq(0, &req)) < 0) {
+	    if(errno == EINTR)
+		continue;
 	    if(errno != 0)
 		flog(LOG_ERR, "recvreq: %s", strerror(errno));
 	    break;