X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=blobdiff_plain;f=src%2Fpatplex.c;h=13fa062e4aaaeb2486082fe69cd0d874340871b3;hp=2ea28d5f54c1fb82cd65e261daf0b6e22b462f3e;hb=9e70ef793ddcf51edc0f6489eb6f70762380afc0;hpb=0fc6fd13c5bd44e6d595b56337a95156fd42ceea diff --git a/src/patplex.c b/src/patplex.c index 2ea28d5..13fa062 100644 --- a/src/patplex.c +++ b/src/patplex.c @@ -24,6 +24,7 @@ #include #include #include +#include #ifdef HAVE_CONFIG_H #include @@ -56,18 +57,26 @@ struct rule { regex_t *pattern; }; +struct headmod { + struct headmod *next; + char *name, *value; +}; + struct pattern { struct pattern *next; + struct headmod *headers; char *childnm; struct rule **rules; char *restpat; }; static struct config *gconfig, *lconfig; +static volatile int reload = 0; static void freepattern(struct pattern *pat) { struct rule **rule; + struct headmod *head; for(rule = pat->rules; *rule; rule++) { if((*rule)->header != NULL) @@ -78,11 +87,33 @@ static void freepattern(struct pattern *pat) } free(*rule); } + while((head = pat->headers) != NULL) { + pat->headers = head->next; + free(head->name); + free(head->value); + free(head); + } if(pat->childnm != NULL) free(pat->childnm); 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; @@ -136,6 +167,7 @@ static struct pattern *parsepattern(struct cfstate *s) struct pattern *pat; int sl; struct rule *rule; + struct headmod *head; regex_t *regex; int rxfl; @@ -217,6 +249,19 @@ static struct pattern *parsepattern(struct cfstate *s) if(pat->restpat != NULL) free(pat->restpat); pat->restpat = sstrdup(s->argv[1]); + } else if(!strcmp(s->argv[0], "set") || !strcmp(s->argv[0], "xset")) { + if(s->argc < 3) { + flog(LOG_WARNING, "%s:%i: missing header name or pattern for `%s' directive", s->file, s->lno, s->argv[0]); + continue; + } + omalloc(head); + if(!strcmp(s->argv[0], "xset")) + head->name = sprintf2("X-Ash-%s", s->argv[1]); + else + head->name = sstrdup(s->argv[1]); + head->value = sstrdup(s->argv[2]); + head->next = pat->headers; + pat->headers = head; } else if(!strcmp(s->argv[0], "end") || !strcmp(s->argv[0], "eof")) { break; } else { @@ -315,7 +360,7 @@ static void exprestpat(struct hthead *req, struct pattern *pat, char **mstr) buffree(buf); } -static char *findmatch(struct config *cf, struct hthead *req, int trydefault) +static struct pattern *findmatch(struct config *cf, struct hthead *req, int trydefault) { int i, o; struct pattern *pat; @@ -378,7 +423,7 @@ static char *findmatch(struct config *cf, struct hthead *req, int trydefault) } if(mstr) freeca(mstr); - return(pat->childnm); + return(pat); } if(mstr) { freeca(mstr); @@ -390,41 +435,76 @@ static char *findmatch(struct config *cf, struct hthead *req, int trydefault) static void serve(struct hthead *req, int fd) { - char *chnm; + struct pattern *pat; + struct headmod *head; struct child *ch; - chnm = NULL; - if(chnm == NULL) - chnm = findmatch(lconfig, req, 0); - if(chnm == NULL) - chnm = findmatch(lconfig, req, 1); + pat = NULL; + if(pat == NULL) + pat = findmatch(lconfig, req, 0); + if(pat == NULL) + pat = findmatch(lconfig, req, 1); if(gconfig != NULL) { - if(chnm == NULL) - chnm = findmatch(gconfig, req, 0); - if(chnm == NULL) - chnm = findmatch(gconfig, req, 1); + if(pat == NULL) + pat = findmatch(gconfig, req, 0); + if(pat == NULL) + pat = findmatch(gconfig, req, 1); } - if(chnm == NULL) { + if(pat == NULL) { simpleerror(fd, 404, "Not Found", "The requested resource could not be found on this server."); return; } ch = NULL; if(ch == NULL) - ch = getchild(lconfig, chnm); + ch = getchild(lconfig, pat->childnm); if(gconfig != NULL) { if(ch == NULL) - ch = getchild(gconfig, chnm); + ch = getchild(gconfig, pat->childnm); } if(ch == NULL) { - flog(LOG_ERR, "child %s requested, but was not declared", chnm); - simpleerror(fd, 500, "Configuration Error", "The server is erroneously configured. Handler %s was requested, but not declared.", chnm); + flog(LOG_ERR, "child %s requested, but was not declared", pat->childnm); + simpleerror(fd, 500, "Configuration Error", "The server is erroneously configured. Handler %s was requested, but not declared.", pat->childnm); return; } - if(childhandle(ch, req, fd)) + for(head = pat->headers; head != NULL; head = head->next) { + headrmheader(req, head->name); + headappheader(req, head->name, head->value); + } + if(childhandle(ch, req, fd, NULL, NULL)) simpleerror(fd, 500, "Server Error", "The request handler crashed."); } +static void reloadconf(char *nm) +{ + struct config *cf; + + if((cf = readconfig(nm)) == NULL) { + flog(LOG_WARNING, "could not reload configuration file `%s'", nm); + return; + } + mergechildren(cf->children, lconfig->children); + freeconfig(lconfig); + lconfig = cf; +} + +static void chldhandler(int sig) +{ + pid_t pid; + int st; + + while((pid = waitpid(-1, &st, WNOHANG)) > 0) { + if(WCOREDUMP(st)) + flog(LOG_WARNING, "child process %i dumped core", pid); + } +} + +static void sighandler(int sig) +{ + if(sig == SIGHUP) + reload = 1; +} + static void usage(FILE *out) { fprintf(out, "usage: patplex [-hN] CONFIGFILE\n"); @@ -462,10 +542,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;