X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fhtparser.c;h=73d940449e3a9e71b17db39dd22ade50dc635920;hb=fc253e2fa06742656bd018981ec000799c956391;hp=766d2f5e8f29b677536671fe5138142232f1d629;hpb=cf91aa538e5215bc1981d11d06cb6e6c0c221c22;p=ashd.git diff --git a/src/htparser.c b/src/htparser.c index 766d2f5..73d9404 100644 --- a/src/htparser.c +++ b/src/htparser.c @@ -35,12 +35,14 @@ #include #include #include +#include #include "htparser.h" static int plex; static char *pidfile = NULL; static int daemonize, usesyslog; +struct mtbuf listeners; static void trimx(struct hthead *req) { @@ -59,7 +61,7 @@ static void trimx(struct hthead *req) } } -static struct hthead *parsereq(FILE *in) +static struct hthead *parsereq(struct bufio *in) { struct hthead *req; struct charbuf method, url, ver; @@ -70,7 +72,7 @@ static struct hthead *parsereq(FILE *in) bufinit(url); bufinit(ver); while(1) { - c = getc(in); + c = biogetc(in); if(c == ' ') { break; } else if((c == EOF) || (c < 32) || (c >= 128)) { @@ -82,7 +84,7 @@ static struct hthead *parsereq(FILE *in) } } while(1) { - c = getc(in); + c = biogetc(in); if(c == ' ') { break; } else if((c == EOF) || (c < 32)) { @@ -94,7 +96,7 @@ static struct hthead *parsereq(FILE *in) } } while(1) { - c = getc(in); + c = biogetc(in); if(c == 10) { break; } else if(c == 13) { @@ -110,7 +112,7 @@ static struct hthead *parsereq(FILE *in) bufadd(url, 0); bufadd(ver, 0); req = mkreq(method.b, url.b, ver.b); - if(parseheaders(req, in)) + if(parseheadersb(req, in)) goto fail; trimx(req); goto out; @@ -127,30 +129,29 @@ out: return(req); } -static off_t passdata(FILE *in, FILE *out, off_t max) +static off_t passdata(struct bufio *in, struct bufio *out, off_t max) { - size_t read; + ssize_t read; off_t total; - char buf[8192]; total = 0; - while(!feof(in) && ((max < 0) || (total < max))) { - read = sizeof(buf); - if(max >= 0) - read = min(max - total, read); - read = fread(buf, 1, read, in); - if(ferror(in)) - return(-1); - if(fwrite(buf, 1, read, out) != read) + while(!bioeof(in) && ((max < 0) || (total < max))) { + if((read = biordata(in)) > 0) { + if(max >= 0) + read = min(max - total, read); + if((read = biowritesome(out, in->rbuf.b + in->rh, read)) < 0) + return(-1); + in->rh += read; + total += read; + } + if(biorspace(in) && ((max < 0) || (biordata(in) < max - total)) && (biofillsome(in) < 0)) return(-1); - total += read; } return(total); } -static int recvchunks(FILE *in, FILE *out) +static int recvchunks(struct bufio *in, struct bufio *out) { - char buf[8192]; size_t read, chlen; int c, r; @@ -158,7 +159,7 @@ static int recvchunks(FILE *in, FILE *out) chlen = 0; r = 0; while(1) { - c = getc(in); + c = biogetc(in); if(c == 10) { if(!r) return(-1); @@ -184,37 +185,43 @@ static int recvchunks(FILE *in, FILE *out) if(chlen == 0) break; while(chlen > 0) { - read = fread(buf, 1, min(sizeof(buf), chlen), in); - if(feof(in) || ferror(in)) - return(-1); - if(fwrite(buf, 1, read, out) != read) + if((read = biordata(in)) > 0) { + if((read = biowritesome(out, in->rbuf.b + in->rh, min(read, chlen))) < 0) + return(-1); + in->rh += read; + chlen -= read; + } + if(biorspace(in) && (biordata(in) < chlen) && (biofillsome(in) <= 0)) return(-1); - chlen -= read; } - if((getc(in) != 13) || (getc(in) != 10)) + if((biogetc(in) != 13) || (biogetc(in) != 10)) return(-1); } /* XXX: Technically, there may be trailers to be read, but that's * just about as likely as chunk extensions. */ - if((getc(in) != 13) || (getc(in) != 10)) + if((biogetc(in) != 13) || (biogetc(in) != 10)) return(-1); return(0); } -static int passchunks(FILE *in, FILE *out) +static int passchunks(struct bufio *in, struct bufio *out) { - char buf[8192]; size_t read; - do { - read = fread(buf, 1, sizeof(buf), in); - if(ferror(in)) - return(-1); - fprintf(out, "%zx\r\n", read); - if(fwrite(buf, 1, read, out) != read) + while(!bioeof(in)) { + if((read = biordata(in)) > 0) { + bioprintf(out, "%zx\r\n", read); + if(biowrite(out, in->rbuf.b + in->rh, read) != read) + return(-1); + in->rh += read; + bioprintf(out, "\r\n"); + if(bioflush(out) < 0) + return(-1); + } + if(biorspace(in) && (biofillsome(in) < 0)) return(-1); - fprintf(out, "\r\n"); - } while(read > 0); + } + bioprintf(out, "0\r\n\r\n"); return(0); } @@ -279,34 +286,56 @@ static int http10keep(struct hthead *req, struct hthead *resp) } } -void serve(FILE *in, struct conn *conn) +static char *connid(void) +{ + static struct charbuf cur; + int i; + char *ret; + + for(i = 0; i < cur.d; i++) { + if((++cur.b[i]) > 'Z') + cur.b[i] = 'A'; + else + goto done; + } + bufadd(cur, 'A'); +done: + ret = memcpy(smalloc(cur.d + 1), cur.b, cur.d); + ret[cur.d] = 0; + return(ret); +} + +void serve(struct bufio *in, struct conn *conn) { int pfds[2]; - FILE *out; + struct bufio *out; struct hthead *req, *resp; - char *hd; + char *hd, *id; off_t dlen; int keep; + id = connid(); out = NULL; req = resp = NULL; - while(1) { + while(plex >= 0) { + bioflush(in); if((req = parsereq(in)) == NULL) break; if(!canonreq(req)) break; + headappheader(req, "X-Ash-Connection-ID", id); if((conn->initreq != NULL) && conn->initreq(conn, req)) break; - if(block(plex, EV_WRITE, 60) <= 0) + if((plex < 0) || block(plex, EV_WRITE, 60) <= 0) break; if(socketpair(PF_UNIX, SOCK_STREAM, 0, pfds)) break; if(sendreq(plex, req, pfds[0])) break; close(pfds[0]); - out = mtstdopen(pfds[1], 1, 600, "r+"); + out = mtbioopen(pfds[1], 1, 600, "r+", NULL); if(getheader(req, "content-type") != NULL) { if((hd = getheader(req, "content-length")) != NULL) { @@ -319,15 +348,16 @@ void serve(FILE *in, struct conn *conn) if(recvchunks(in, out)) break; } else { - break; + /* Ignore rather than abort, to be kinder to broken clients. */ + headrmheader(req, "content-type"); } } - if(fflush(out)) + if(bioflush(out)) break; /* Make sure to send EOF */ shutdown(pfds[1], SHUT_WR); - if((resp = parseresponse(out)) == NULL) + if((resp = parseresponseb(out)) == NULL) break; replstr(&resp->ver, req->ver); @@ -337,19 +367,19 @@ void serve(FILE *in, struct conn *conn) if(!strcasecmp(req->ver, "HTTP/1.0")) { if(!strcasecmp(req->method, "head")) { keep = http10keep(req, resp); - writeresp(in, resp); - fprintf(in, "\r\n"); + writerespb(in, resp); + bioprintf(in, "\r\n"); } else if((hd = getheader(resp, "content-length")) != NULL) { keep = http10keep(req, resp); dlen = atoo(hd); - writeresp(in, resp); - fprintf(in, "\r\n"); + writerespb(in, resp); + bioprintf(in, "\r\n"); if(passdata(out, in, dlen) != dlen) break; } else { headrmheader(resp, "connection"); - writeresp(in, resp); - fprintf(in, "\r\n"); + writerespb(in, resp); + bioprintf(in, "\r\n"); passdata(out, in, -1); break; } @@ -357,23 +387,23 @@ void serve(FILE *in, struct conn *conn) break; } else if(!strcasecmp(req->ver, "HTTP/1.1")) { if(!strcasecmp(req->method, "head")) { - writeresp(in, resp); - fprintf(in, "\r\n"); + writerespb(in, resp); + bioprintf(in, "\r\n"); } else if((hd = getheader(resp, "content-length")) != NULL) { - writeresp(in, resp); - fprintf(in, "\r\n"); + writerespb(in, resp); + bioprintf(in, "\r\n"); dlen = atoo(hd); if(passdata(out, in, dlen) != dlen) break; } else if(!getheader(resp, "transfer-encoding")) { headappheader(resp, "Transfer-Encoding", "chunked"); - writeresp(in, resp); - fprintf(in, "\r\n"); + writerespb(in, resp); + bioprintf(in, "\r\n"); if(passchunks(out, in)) break; } else { - writeresp(in, resp); - fprintf(in, "\r\n"); + writerespb(in, resp); + bioprintf(in, "\r\n"); passdata(out, in, -1); break; } @@ -383,7 +413,7 @@ void serve(FILE *in, struct conn *conn) break; } - fclose(out); + bioclose(out); out = NULL; freehthead(req); freehthead(resp); @@ -391,34 +421,49 @@ void serve(FILE *in, struct conn *conn) } if(out != NULL) - fclose(out); + bioclose(out); if(req != NULL) freehthead(req); if(resp != NULL) freehthead(resp); - fclose(in); + bioclose(in); + free(id); } static void plexwatch(struct muth *muth, va_list args) { vavar(int, fd); char *buf; - int ret; + int i, s, ret; + s = 0; while(1) { - block(fd, EV_READ, 0); + if(block(fd, EV_READ, 0) == 0) + break; buf = smalloc(65536); ret = recv(fd, buf, 65536, 0); if(ret < 0) { flog(LOG_WARNING, "received error on rootplex read channel: %s", strerror(errno)); exit(1); } else if(ret == 0) { - exit(0); + s = 1; + free(buf); + break; } /* Maybe I'd like to implement some protocol in this direction * some day... */ free(buf); } + shutdown(plex, SHUT_RDWR); + for(i = 0; i < listeners.d; i++) { + if(listeners.b[i] == muth) + bufdel(listeners, i); + } + if(s) { + flog(LOG_INFO, "root handler exited, so shutting down listening..."); + while(listeners.d > 0) + resume(listeners.b[0], 0); + } } static void initroot(void *uu) @@ -493,9 +538,14 @@ static void addport(char *spec) buffree(vals); } +static void sighandler(int sig) +{ + exitioloop(1); +} + int main(int argc, char **argv) { - int c; + int c, d; int i, s1; char *root; FILE *pidout; @@ -547,7 +597,7 @@ int main(int argc, char **argv) flog(LOG_ERR, "could not spawn root multiplexer: %s", strerror(errno)); return(1); } - mustart(plexwatch, plex); + bufadd(listeners, mustart(plexwatch, plex)); pidout = NULL; if(pidfile != NULL) { if((pidout = fopen(pidfile, "w")) == NULL) { @@ -574,6 +624,9 @@ int main(int argc, char **argv) } } signal(SIGPIPE, SIG_IGN); + signal(SIGCHLD, SIG_IGN); + signal(SIGINT, sighandler); + signal(SIGTERM, sighandler); if(daemonize) { daemon(0, 0); } @@ -581,6 +634,22 @@ int main(int argc, char **argv) fprintf(pidout, "%i\n", getpid()); fclose(pidout); } - ioloop(); + d = 0; + while(!d) { + switch(ioloop()) { + case 0: + d = 1; + break; + case 1: + if(listeners.d > 0) { + while(listeners.d > 0) + resume(listeners.b[0], 0); + flog(LOG_INFO, "no longer listening"); + } else { + d = 1; + } + break; + } + } return(0); }