X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=blobdiff_plain;f=src%2Fhtparser.c;h=1ed91754f78f36d62c6de672fb7c1a06a9a3fff8;hp=001c6c1b13c8e71215dd24ca5ae10db49f9e96cf;hb=90b0ba0f9d93e454cc08a566b718abdcbfd0d9f6;hpb=32e24c19cca5538c922542c7a6078efc53f5638b

diff --git a/src/htparser.c b/src/htparser.c
index 001c6c1..1ed9175 100644
--- a/src/htparser.c
+++ b/src/htparser.c
@@ -19,10 +19,11 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
+#include <fcntl.h>
 #include <string.h>
 #include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
+#include <pwd.h>
+#include <sys/signal.h>
 #include <errno.h>
 
 #ifdef HAVE_CONFIG_H
@@ -35,422 +36,314 @@
 #include <req.h>
 #include <proc.h>
 
-static int plex;
+#include "htparser.h"
 
-static int listensock4(int port)
-{
-    struct sockaddr_in name;
-    int fd;
-    int valbuf;
-    
-    memset(&name, 0, sizeof(name));
-    name.sin_family = AF_INET;
-    name.sin_port = htons(port);
-    if((fd = socket(PF_INET, SOCK_STREAM, 0)) < 0)
-	return(-1);
-    valbuf = 1;
-    setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &valbuf, sizeof(valbuf));
-    if(bind(fd, (struct sockaddr *)&name, sizeof(name))) {
-	close(fd);
-	return(-1);
-    }
-    if(listen(fd, 16) < 0) {
-	close(fd);
-	return(-1);
-    }
-    return(fd);
-}
+static int plex;
+static char *pidfile = NULL;
+static int daemonize, usesyslog;
 
-static int listensock6(int port)
+static void trimx(struct hthead *req)
 {
-    struct sockaddr_in6 name;
-    int fd;
-    int valbuf;
+    int i;
     
-    memset(&name, 0, sizeof(name));
-    name.sin6_family = AF_INET6;
-    name.sin6_port = htons(port);
-    if((fd = socket(PF_INET6, SOCK_STREAM, 0)) < 0)
-	return(-1);
-    valbuf = 1;
-    setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &valbuf, sizeof(valbuf));
-    if(bind(fd, (struct sockaddr *)&name, sizeof(name))) {
-	close(fd);
-	return(-1);
-    }
-    if(listen(fd, 16) < 0) {
-	close(fd);
-	return(-1);
+    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++;
+	}
     }
-    return(fd);
 }
 
-static size_t readhead(int fd, struct charbuf *buf)
+static struct hthead *parsereq(FILE *in)
 {
-    int nl;
-    size_t off;
+    struct hthead *req;
+    struct charbuf method, url, ver;
+    int c;
     
-    int get1(void)
-    {
-	int ret;
-	
-	while(!(off < buf->d)) {
-	    sizebuf(*buf, buf->d + 1024);
-	    ret = recv(fd, buf->b + buf->d, buf->s - buf->d, MSG_DONTWAIT);
-	    if(ret <= 0) {
-		if((ret < 0) && (errno == EAGAIN)) {
-		    if(block(fd, EV_READ, 60) <= 0)
-			return(-1);
-		    continue;
-		}
-		return(-1);
-	    }
-	    buf->d += ret;
+    req = NULL;
+    bufinit(method);
+    bufinit(url);
+    bufinit(ver);
+    while(1) {
+	c = getc(in);
+	if(c == ' ') {
+	    break;
+	} else if((c == EOF) || (c < 32) || (c >= 128)) {
+	    goto fail;
+	} else {
+	    bufadd(method, c);
+	    if(method.d >= 128)
+		goto fail;
 	}
-	return(buf->b[off++]);
     }
-
-    nl = 0;
-    off = 0;
     while(1) {
-	switch(get1()) {
-	case '\n':
-	    if(nl)
-		return(off);
-	    nl = 1;
-	    break;
-	case '\r':
-	    break;
-	case -1:
-	    return(-1);
-	default:
-	    nl = 0;
+	c = getc(in);
+	if(c == ' ') {
 	    break;
+	} else if((c == EOF) || (c < 32)) {
+	    goto fail;
+	} else {
+	    bufadd(url, c);
+	    if(url.d >= 65536)
+		goto fail;
 	}
     }
-}
-
-#define SKIPNL(ptr) ({				\
-	    int __buf__;			\
-	    if(*(ptr) == '\r')			\
-		*((ptr)++) = 0;			\
-	    if(*(ptr) != '\n') {		\
-		__buf__ = 0;			\
-	    } else {				\
-		*((ptr)++) = 0;			\
-		__buf__ = 1;			\
-	    }					\
-	    __buf__;})
-static struct hthead *parserawreq(char *buf)
-{
-    char *p, *p2, *nl;
-    char *method, *url, *ver;
-    struct hthead *req;
-    
-    if((nl = strchr(buf, '\n')) == NULL)
-	return(NULL);
-    if(((p = strchr(buf, ' ')) == NULL) || (p > nl))
-	return(NULL);
-    method = buf;
-    *(p++) = 0;
-    if(((p2 = strchr(p, ' ')) == NULL) || (p2 > nl))
-	return(NULL);
-    url = p;
-    p = p2;
-    *(p++) = 0;
-    if(strncmp(p, "HTTP/", 5))
-	return(NULL);
-    ver = (p += 5);
-    for(; ((*p >= '0') && (*p <= '9')) || (*p == '.'); p++);
-    if(!SKIPNL(p))
-	return(NULL);
-
-    req = mkreq(method, url, ver);
     while(1) {
-	if(SKIPNL(p)) {
-	    if(*p)
-		goto fail;
+	c = getc(in);
+	if(c == 10) {
 	    break;
-	}
-	if((nl = strchr(p, '\n')) == NULL)
+	} else if(c == 13) {
+	} else if((c == EOF) || (c < 32) || (c >= 128)) {
 	    goto fail;
-	if(((p2 = strchr(p, ':')) == NULL) || (p2 > nl))
-	    goto fail;
-	*(p2++) = 0;
-	for(; (*p2 == ' ') || (*p2 == '\t'); p2++);
-	for(nl = p2; (*nl != '\r') && (*nl != '\n'); nl++);
-	if(!SKIPNL(nl))
-	    goto fail;
-	if(strncasecmp(p, "x-ash-", 6))
-	    headappheader(req, p, p2);
-	p = nl;
+	} else {
+	    bufadd(ver, c);
+	    if(ver.d >= 128)
+		goto fail;
+	}
     }
-    return(req);
+    bufadd(method, 0);
+    bufadd(url, 0);
+    bufadd(ver, 0);
+    req = mkreq(method.b, url.b, ver.b);
+    if(parseheaders(req, in))
+	goto fail;
+    trimx(req);
+    goto out;
     
 fail:
-    freehthead(req);
-    return(NULL);
+    if(req != NULL) {
+	freehthead(req);
+	req = NULL;
+    }
+out:
+    buffree(method);
+    buffree(url);
+    buffree(ver);
+    return(req);
 }
 
-static struct hthead *parserawresp(char *buf)
+static struct hthead *parseresp(FILE *in)
 {
-    char *p, *p2, *nl;
-    char *msg, *ver;
+    struct hthead *req;
     int code;
-    struct hthead *resp;
+    struct charbuf ver, msg;
+    int c;
     
-    if((nl = strchr(buf, '\n')) == NULL)
-	return(NULL);
-    p = strchr(buf, '\r');
-    if((p != NULL) && (p < nl))
-	nl = p;
-    if(strncmp(buf, "HTTP/", 5))
-	return(NULL);
-    ver = p = buf + 5;
-    for(; ((*p >= '0') && (*p <= '9')) || (*p == '.'); p++);
-    if(*p != ' ')
-	return(NULL);
-    *(p++) = 0;
-    if(((p2 = strchr(p, ' ')) == NULL) || (p2 > nl))
-	return(NULL);
-    *(p2++) = 0;
-    code = atoi(p);
-    if((code < 100) || (code >= 600))
-	return(NULL);
-    if(p2 >= nl)
-	return(NULL);
-    msg = p2;
-    p = nl;
-    if(!SKIPNL(p))
-	return(NULL);
-
-    resp = mkresp(code, msg, ver);
+    req = NULL;
+    bufinit(ver);
+    bufinit(msg);
+    code = 0;
     while(1) {
-	if(SKIPNL(p)) {
-	    if(*p)
-		goto fail;
+	c = getc(in);
+	if(c == ' ') {
 	    break;
-	}
-	if((nl = strchr(p, '\n')) == NULL)
+	} else if((c == EOF) || (c < 32) || (c >= 128)) {
 	    goto fail;
-	if(((p2 = strchr(p, ':')) == NULL) || (p2 > nl))
+	} else {
+	    bufadd(ver, c);
+	}
+    }
+    while(1) {
+	c = getc(in);
+	if(c == ' ') {
+	    break;
+	} else if((c == EOF) || (c < '0') || (c > '9')) {
 	    goto fail;
-	*(p2++) = 0;
-	for(; (*p2 == ' ') || (*p2 == '\t'); p2++);
-	for(nl = p2; (*nl != '\r') && (*nl != '\n'); nl++);
-	if(!SKIPNL(nl))
+	} else {
+	    code = (code * 10) + (c - '0');
+	}
+    }
+    while(1) {
+	c = getc(in);
+	if(c == 10) {
+	    break;
+	} else if(c == 13) {
+	} else if((c == EOF) || (c < 32)) {
 	    goto fail;
-	headappheader(resp, p, p2);
-	p = nl;
+	} else {
+	    bufadd(msg, c);
+	}
     }
-    return(resp);
+    bufadd(msg, 0);
+    bufadd(ver, 0);
+    req = mkresp(code, msg.b, ver.b);
+    if(parseheaders(req, in))
+	goto fail;
+    goto out;
     
 fail:
-    freehthead(resp);
-    return(NULL);
+    if(req != NULL) {
+	freehthead(req);
+	req = NULL;
+    }
+out:
+    buffree(msg);
+    buffree(ver);
+    return(req);
 }
 
-static off_t passdata(int src, int dst, struct charbuf *buf, off_t max)
+static off_t passdata(FILE *in, FILE *out, off_t max)
 {
-    size_t dataoff, smax;
-    off_t sent;
-    int eof, ret;
-
-    sent = 0;
-    eof = 0;
-    while((!eof || (buf->d > 0)) && ((max < 0) || (sent < max))) {
-	if(!eof && (buf->d < buf->s) && ((max < 0) || (sent + buf->d < max))) {
-	    while(1) {
-		ret = recv(src, buf->b + buf->d, buf->s - buf->d, MSG_DONTWAIT);
-		if((ret < 0) && (errno == EAGAIN)) {
-		} else if(ret < 0) {
-		    return(-1);
-		} else if(ret == 0) {
-		    eof = 1;
-		    break;
-		} else {
-		    buf->d += ret;
-		    break;
-		}
-		if(buf->d > 0)
-		    break;
-		if(block(src, EV_READ, 0) <= 0)
-		    return(-1);
-	    }
-	}
-	for(dataoff = 0; (dataoff < buf->d) && ((max < 0) || (sent < max));) {
-	    if(block(dst, EV_WRITE, 120) <= 0)
-		return(-1);
-	    smax = buf->d - dataoff;
-	    if(sent + smax > max)
-		smax = max - sent;
-	    ret = send(dst, buf->b + dataoff, smax, MSG_NOSIGNAL | MSG_DONTWAIT);
-	    if(ret < 0)
-		return(-1);
-	    dataoff += ret;
-	    sent += ret;
-	}
-	bufeat(*buf, dataoff);
+    size_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)
+	    return(-1);
+	total += read;
     }
-    return(sent);
+    return(total);
 }
 
-static void serve(struct muth *muth, va_list args)
+static int passchunks(FILE *in, FILE *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)
+	    return(-1);
+	fprintf(out, "\r\n");
+    } while(read > 0);
+    return(0);
+}
+
+static int hasheader(struct hthead *head, char *name, char *val)
+{
+    char *hd;
+    
+    if((hd = getheader(head, name)) == NULL)
+	return(0);
+    return(!strcasecmp(hd, val));
+}
+
+void serve(FILE *in, struct conn *conn)
 {
-    vavar(int, fd);
-    vavar(struct sockaddr_storage, name);
-    int cfd;
     int pfds[2];
-    char old;
-    char *hd, *p;
-    struct charbuf inbuf, outbuf;
+    FILE *out;
     struct hthead *req, *resp;
-    off_t dlen, sent;
-    ssize_t headoff;
-    char nmbuf[256];
+    char *hd, *p;
+    off_t dlen;
     
-    bufinit(inbuf);
-    bufinit(outbuf);
-    cfd = -1;
+    out = NULL;
     req = resp = NULL;
     while(1) {
-	/*
-	 * First, find and decode the header:
-	 */
-	if((headoff = readhead(fd, &inbuf)) < 0)
-	    goto out;
-	if(headoff > 65536) {
-	    /* We cannot handle arbitrarily large headers, as they
-	     * need to fit within a single Unix datagram. This is
-	     * probably a safe limit, and larger packets than this are
-	     * most likely erroneous (or malicious) anyway. */
-	    goto out;
-	}
-	old = inbuf.b[headoff];
-	inbuf.b[headoff] = 0;
-	if((req = parserawreq(inbuf.b)) == NULL)
-	    goto out;
-	inbuf.b[headoff] = old;
-	bufeat(inbuf, headoff);
-	/* We strip off the leading slash and any param string from
-	 * the rest string, so that multiplexers can parse
-	 * coherently. */
+	if((req = parsereq(in)) == NULL)
+	    break;
+	replrest(req, req->url);
 	if(req->rest[0] == '/')
 	    replrest(req, req->rest + 1);
 	if((p = strchr(req->rest, '?')) != NULL)
 	    *p = 0;
 	
-	/*
-	 * Add metainformation and then send the request to the root
-	 * multiplexer:
-	 */
-	if(name.ss_family == AF_INET) {
-	    headappheader(req, "X-Ash-Address", inet_ntop(AF_INET, &((struct sockaddr_in *)&name)->sin_addr, nmbuf, sizeof(nmbuf)));
-	    headappheader(req, "X-Ash-Port", sprintf3("%i", ntohs(((struct sockaddr_in *)&name)->sin_port)));
-	} else if(name.ss_family == AF_INET6) {
-	    headappheader(req, "X-Ash-Address", inet_ntop(AF_INET6, &((struct sockaddr_in6 *)&name)->sin6_addr, nmbuf, sizeof(nmbuf)));
-	    headappheader(req, "X-Ash-Port", sprintf3("%i", ntohs(((struct sockaddr_in6 *)&name)->sin6_port)));
-	}
+	if((conn->initreq != NULL) && conn->initreq(conn, req))
+	    break;
+	
 	if(block(plex, EV_WRITE, 60) <= 0)
-	    goto out;
+	    break;
 	if(socketpair(PF_UNIX, SOCK_STREAM, 0, pfds))
-	    goto out;
+	    break;
 	if(sendreq(plex, req, pfds[0]))
-	    goto out;
+	    break;
 	close(pfds[0]);
-	cfd = pfds[1];
+	out = mtstdopen(pfds[1], 1, 600, "r+");
 
-	/*
-	 * If there is message data, pass it:
-	 */
 	if((hd = getheader(req, "content-length")) != NULL) {
 	    dlen = atoo(hd);
 	    if(dlen > 0) {
-		if(passdata(fd, cfd, &inbuf, dlen) < 0)
-		    goto out;
+		if(passdata(in, out, dlen) != dlen)
+		    break;
 	    }
 	}
+	if(fflush(out))
+	    break;
 	/* Make sure to send EOF */
-	shutdown(cfd, SHUT_WR);
-	
-	/*
-	 * Find and decode the response header:
-	 */
-	outbuf.d = 0;
-	if((headoff = readhead(cfd, &outbuf)) < 0)
-	    goto out;
-	hd = memcpy(smalloc(headoff + 1), outbuf.b, headoff);
-	hd[headoff] = 0;
-	if((resp = parserawresp(hd)) == NULL)
-	    goto out;
+	shutdown(pfds[1], SHUT_WR);
 	
-	/*
-	 * Pass the actual output:
-	 */
-	sizebuf(outbuf, 65536);
-	if((sent = passdata(cfd, fd, &outbuf, -1)) < 0)
-	    goto out;
-	sent -= headoff;
+	if((resp = parseresp(out)) == NULL)
+	    break;
+	replstr(&resp->ver, req->ver);
 	
-	/*
-	 * Check for connection expiry
-	 */
-	if(strcasecmp(req->method, "head")) {
-	    if((hd = getheader(resp, "content-length")) != NULL) {
-		if(sent != atoo(hd)) {
-		    /* Exit because of error */
-		    goto out;
-		}
-	    } else {
-		if(((hd = getheader(resp, "transfer-encoding")) == NULL) || !strcasecmp(hd, "identity"))
+	if(!getheader(resp, "server"))
+	    headappheader(resp, "Server", sprintf3("ashd/%s", VERSION));
+
+	if(!strcmp(req->ver, "HTTP/1.0")) {
+	    writeresp(in, resp);
+	    fprintf(in, "\r\n");
+	    if(!strcasecmp(req->method, "head")) {
+		if(!hasheader(req, "connection", "keep-alive"))
+		    break;
+	    } else if((hd = getheader(resp, "content-length")) != NULL) {
+		dlen = atoo(hd);
+		if(passdata(out, in, dlen) != dlen)
+		    break;
+		if(!hasheader(req, "connection", "keep-alive"))
 		    break;
+	    } else {
+		passdata(out, in, -1);
+		break;
 	    }
-	    if(((hd = getheader(req, "connection")) != NULL) && !strcasecmp(hd, "close"))
+	    if(hasheader(req, "connection", "close") || hasheader(resp, "connection", "close"))
 		break;
-	    if(((hd = getheader(resp, "connection")) != NULL) && !strcasecmp(hd, "close"))
+	} else if(!strcmp(req->ver, "HTTP/1.1")) {
+	    if(!strcasecmp(req->method, "head")) {
+		writeresp(in, resp);
+		fprintf(in, "\r\n");
+	    } else if((hd = getheader(resp, "content-length")) != NULL) {
+		writeresp(in, resp);
+		fprintf(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");
+		if(passchunks(out, in))
+		    break;
+	    } else {
+		writeresp(in, resp);
+		fprintf(in, "\r\n");
+		passdata(out, in, -1);
 		break;
+	    }
+	    if(hasheader(req, "connection", "close") || hasheader(resp, "connection", "close"))
+		break;
+	} else {
+	    break;
 	}
-	
-	close(cfd);
-	cfd = -1;
+
+	fclose(out);
+	out = NULL;
 	freehthead(req);
-	req = NULL;
 	freehthead(resp);
-	resp = NULL;
+	req = resp = NULL;
     }
     
-out:
-    if(cfd >= 0)
-	close(cfd);
+    if(out != NULL)
+	fclose(out);
     if(req != NULL)
 	freehthead(req);
     if(resp != NULL)
 	freehthead(resp);
-    buffree(inbuf);
-    buffree(outbuf);
-    close(fd);
-}
-
-static void listenloop(struct muth *muth, va_list args)
-{
-    vavar(int, ss);
-    int ns;
-    struct sockaddr_storage name;
-    socklen_t namelen;
-    
-    while(1) {
-	namelen = sizeof(name);
-	block(ss, EV_READ, 0);
-	ns = accept(ss, (struct sockaddr *)&name, &namelen);
-	if(ns < 0) {
-	    flog(LOG_ERR, "accept: %s", strerror(errno));
-	    goto out;
-	}
-	mustart(serve, ns, name);
-    }
-    
-out:
-    close(ss);
+    fclose(in);
 }
 
 static void plexwatch(struct muth *muth, va_list args)
@@ -475,32 +368,166 @@ static void plexwatch(struct muth *muth, va_list args)
     }
 }
 
-int main(int argc, char **argv)
+static void initroot(void *uu)
 {
     int fd;
     
-    if(argc < 2) {
-	fprintf(stderr, "usage: htparser ROOT [ARGS...]\n");
+    if(daemonize) {
+	setsid();
+	chdir("/");
+	if((fd = open("/dev/null", O_RDWR)) >= 0) {
+	    dup2(fd, 0);
+	    dup2(fd, 1);
+	    dup2(fd, 2);
+	    close(fd);
+	}
+    }
+    if(usesyslog)
+	putenv("ASHD_USESYSLOG=1");
+    else
+	unsetenv("ASHD_USESYSLOG");
+}
+
+static void usage(FILE *out)
+{
+    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' and `ssl'.\n");
+}
+
+static void addport(char *spec)
+{
+    char *nm, *p, *p2, *n;
+    struct charvbuf pars, vals;
+    
+    bufinit(pars);
+    bufinit(vals);
+    if((p = strchr(spec, ':')) == NULL) {
+	nm = spec;
+    } else {
+	nm = spec;
+	*(p++) = 0;
+	do {
+	    if((n = strchr(p, ',')) != NULL)
+		*(n++) = 0;
+	    if((p2 = strchr(p, '=')) != NULL)
+		*(p2++) = 0;
+	    if(!*p) {
+		usage(stderr);
+		exit(1);
+	    }
+	    bufadd(pars, p);
+	    if(p2)
+		bufadd(vals, p2);
+	    else
+		bufadd(vals, "");
+	} while((p = n) != NULL);
+    }
+    
+    /* 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);
     }
-    if((plex = stdmkchild(argv + 1)) < 0) {
-	flog(LOG_ERR, "could not spawn root multiplexer: %s", strerror(errno));
-	return(1);
+    
+    buffree(pars);
+    buffree(vals);
+}
+
+int main(int argc, char **argv)
+{
+    int c;
+    int i, s1;
+    char *root;
+    FILE *pidout;
+    struct passwd *pwent;
+    
+    daemonize = usesyslog = 0;
+    root = NULL;
+    pwent = NULL;
+    while((c = getopt(argc, argv, "+hSfu:r:p:")) >= 0) {
+	switch(c) {
+	case 'h':
+	    usage(stdout);
+	    exit(0);
+	case 'f':
+	    daemonize = 1;
+	    break;
+	case 'S':
+	    usesyslog = 1;
+	    break;
+	case 'u':
+	    if((pwent = getpwnam(optarg)) == NULL) {
+		flog(LOG_ERR, "could not find user %s", optarg);
+		exit(1);
+	    }
+	    break;
+	case 'r':
+	    root = optarg;
+	    break;
+	case 'p':
+	    pidfile = optarg;
+	    break;
+	default:
+	    usage(stderr);
+	    exit(1);
+	}
     }
-    if((fd = listensock6(8080)) < 0) {
-	flog(LOG_ERR, "could not listen on IPv6: %s", strerror(errno));
+    s1 = 0;
+    for(i = optind; i < argc; i++) {
+	if(!strcmp(argv[i], "--"))
+	    break;
+	s1 = 1;
+	addport(argv[i]);
+    }
+    if(!s1 || (i == argc)) {
+	usage(stderr);
+	exit(1);
+    }
+    if((plex = stdmkchild(argv + ++i, initroot, NULL)) < 0) {
+	flog(LOG_ERR, "could not spawn root multiplexer: %s", strerror(errno));
 	return(1);
     }
-    mustart(listenloop, fd);
-    if((fd = listensock4(8080)) < 0) {
-	if(errno != EADDRINUSE) {
-	    flog(LOG_ERR, "could not listen on IPv4: %s", strerror(errno));
+    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);
 	}
-    } else {
-	mustart(listenloop, fd);
     }
-    mustart(plexwatch, plex);
+    if(usesyslog)
+	opensyslog();
+    if(root) {
+	if(chdir(root) || chroot(root)) {
+	    flog(LOG_ERR, "could not chroot to %s: %s", root, strerror(errno));
+	    exit(1);
+	}
+    }
+    if(pwent) {
+	if(setgid(pwent->pw_gid)) {
+	    flog(LOG_ERR, "could not switch group to %i: %s", (int)pwent->pw_gid, strerror(errno));
+	    exit(1);
+	}
+	if(setuid(pwent->pw_uid)) {
+	    flog(LOG_ERR, "could not switch user to %i: %s", (int)pwent->pw_uid, strerror(errno));
+	    exit(1);
+	}
+    }
+    signal(SIGPIPE, SIG_IGN);
+    if(daemonize) {
+	daemon(0, 0);
+    }
+    if(pidout != NULL) {
+	fprintf(pidout, "%i\n", getpid());
+	fclose(pidout);
+    }
     ioloop();
     return(0);
 }