commit - 5b4ce4ecf4c2b8ec113f05f3ef8317749a3022a3
commit + 3e2ddb069e8187d3e8083d75873dc630bd9d90a0
blob - 64c1091d1ab4ff5711dca50c838ae17d78565822
blob + cb97cbf32e3cff803c4951f21b31daaf601c00d1
--- carp.c
+++ carp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: carp.c,v 1.1 2007/02/22 03:32:39 reyk Exp $ */
+/*	$OpenBSD: carp.c,v 1.2 2007/02/22 05:58:06 reyk Exp $ */
 
 /*
  * Copyright (c) 2006 Henning Brauer <henning@openbsd.org>
@@ -73,7 +73,7 @@ carp_demote_init(char *group, int force)
 			free(c);
 			return (-1);
 		}
-		
+
 		/* only demote if this group already is demoted */
 		if ((level = carp_demote_get(group)) == -1)
 			return (-1);
@@ -204,6 +204,6 @@ carp_demote_ioctl(char *group, int demote)
 		log_info("%s the demote state of group '%s'",
 		    (demote > 0) ? "incremented" : "decremented", group);
 
-	close (s);
+	close(s);
 	return (res);
 }
blob - 905b0becbfdca60442dde7a3dadffd3d99a2db53
blob + 82bb01f7186f414c4d8195e072b4fae240408fdf
--- check_tcp.c
+++ check_tcp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: check_tcp.c,v 1.22 2007/02/08 13:32:24 reyk Exp $	*/
+/*	$OpenBSD: check_tcp.c,v 1.23 2007/02/22 05:58:06 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org>
@@ -176,8 +176,8 @@ void
 tcp_send_req(int s, short event, void *arg)
 {
 	struct ctl_tcp_event	*cte = arg;
-	int		 	 bs;
-	int		 	 len;
+	int			 bs;
+	int			 len;
 
 	if (event == EV_TIMEOUT) {
 		cte->host->up = HOST_DOWN;
@@ -217,7 +217,7 @@ tcp_read_buf(int s, short event, void *arg)
 	char			 rbuf[SMALL_READ_BUF_SIZE];
 	struct ctl_tcp_event	*cte = arg;
 
-        if (event == EV_TIMEOUT) {
+	if (event == EV_TIMEOUT) {
 		cte->host->up = HOST_DOWN;
 		buf_free(cte->buf);
 		hce_notify_done(cte->host, "tcp_read_buf: timeout");
blob - c6f0bbb7133bcb37503d2b3e1c01b32e14c98e2d
blob + eb9fc4939f6fa665b04f49f2c16cfab15f5625b8
--- pfe.c
+++ pfe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfe.c,v 1.15 2007/02/22 03:32:39 reyk Exp $	*/
+/*	$OpenBSD: pfe.c,v 1.16 2007/02/22 05:58:06 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org>
@@ -233,8 +233,8 @@ pfe_dispatch_imsg(int fd, short event, void *ptr)
 
 			/* Forward to relay engine(s) */
 			for (n = 0; n < env->prefork_relay; n++)
-				imsg_compose(&ibuf_relay[n], IMSG_HOST_STATUS, 0, 0,
-				    &st, sizeof(st));
+				imsg_compose(&ibuf_relay[n],
+				    IMSG_HOST_STATUS, 0, 0, &st, sizeof(st));
 
 			if ((table = table_find(env, host->tableid)) == NULL)
 				fatalx("pfe_dispatch_imsg: invalid table id");
@@ -363,7 +363,8 @@ pfe_dispatch_relay(int fd, short event, void * ptr)
 				fatalx("invalid imsg header len");
 			bcopy(imsg.data, &crs, sizeof(crs));
 			if (crs.proc > env->prefork_relay)
-				fatalx("pfe_dispatch_relay: invalid relay proc");
+				fatalx("pfe_dispatch_relay: "
+				    "invalid relay proc");
 			if ((rlay = relay_find(env, crs.id)) == NULL)
 				fatalx("pfe_dispatch_relay: invalid relay id");
 			bcopy(&crs, &rlay->stats[crs.proc], sizeof(crs));
@@ -616,8 +617,8 @@ pfe_sync(void)
 	struct service		*service;
 	struct table		*active;
 	struct table		*table;
-	struct ctl_id	 	 id;
-	struct imsg	 	 imsg;
+	struct ctl_id		 id;
+	struct imsg		 imsg;
 	struct ctl_demote	 demote;
 
 	bzero(&id, sizeof(id));
blob - 27442c340068e1c1f479a4e902679a1626cff360
blob + 2688089c1fb675477c633bf9ea515999f096d8b9
--- pfe_filter.c
+++ pfe_filter.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfe_filter.c,v 1.14 2007/02/22 03:32:40 reyk Exp $	*/
+/*	$OpenBSD: pfe_filter.c,v 1.15 2007/02/22 05:58:06 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org>
@@ -238,7 +238,7 @@ flush_table(struct hoststated *env, struct service *se
 		goto toolong;
 	if (strlcpy(io.pfrio_table.pfrt_name, service->name,
 	    sizeof(io.pfrio_table.pfrt_name)) >=
-    	    sizeof(io.pfrio_table.pfrt_name))
+	    sizeof(io.pfrio_table.pfrt_name))
 		goto toolong;
 	if (ioctl(env->pf->dev, DIOCRCLRADDRS, &io) == -1)
 		fatal("flush_table: cannot flush table");
@@ -347,7 +347,8 @@ sync_ruleset(struct hoststated *env, struct service *s
 
 		pio.addr.addr.type = PF_ADDR_TABLE;
 		if (strlcpy(pio.addr.addr.v.tblname, service->name,
-		    sizeof(pio.addr.addr.v.tblname)) >= sizeof(pio.addr.addr.v.tblname))
+		    sizeof(pio.addr.addr.v.tblname)) >=
+		    sizeof(pio.addr.addr.v.tblname))
 			fatal("sync_ruleset: table name too long");
 		if (ioctl(env->pf->dev, DIOCADDADDR, &pio) == -1)
 			fatal("sync_ruleset: cannot add address to pool");
@@ -397,7 +398,7 @@ flush_rulesets(struct hoststated *env)
 		log_warn("flush_rulesets: transaction for %s failed",
 		    HOSTSTATED_ANCHOR);
 	log_debug("flush_rulesets: flushed rules");
- 	return;
+	return;
 
  toolong:
 	fatal("flush_rulesets: name too long");
@@ -463,8 +464,10 @@ natlook(struct hoststated *env, struct ctl_natlook *cn
 	case AF_INET6:
 		in6 = (struct sockaddr_in6 *)&cnl->rsrc;
 		out6 = (struct sockaddr_in6 *)&cnl->rdst;
-		bcopy(&pnl.rsaddr.addr8, &in6->sin6_addr, sizeof(in6->sin6_addr));
-		bcopy(&pnl.rdaddr.addr8, &out6->sin6_addr, sizeof(out6->sin6_addr));
+		bcopy(&pnl.rsaddr.addr8, &in6->sin6_addr,
+		    sizeof(in6->sin6_addr));
+		bcopy(&pnl.rdaddr.addr8, &out6->sin6_addr,
+		    sizeof(out6->sin6_addr));
 		break;
 	}
 	cnl->rsrc.ss_family = pnl.af;
blob - 093b35fb8499c455843fd548e901f3d275fc7c99
blob + ff4690a825f8b712c1a429ac998d6d1f58df03e7
--- relayd.c
+++ relayd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relayd.c,v 1.17 2007/02/22 03:32:39 reyk Exp $	*/
+/*	$OpenBSD: relayd.c,v 1.18 2007/02/22 05:58:06 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org>
@@ -64,7 +64,7 @@ void
 main_sig_handler(int sig, short event, void *arg)
 {
 	struct hoststated	*env = arg;
-	int		 	 die = 0;
+	int			 die = 0;
 
 	log_debug("signal %d", sig);
 
@@ -173,13 +173,17 @@ main(int argc, char *argv[])
 
 	log_info("startup");
 
-	if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, pipe_parent2pfe) == -1)
+	if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC,
+	    pipe_parent2pfe) == -1)
 		fatal("socketpair");
-	if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, pipe_parent2hce) == -1)
+	if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC,
+	    pipe_parent2hce) == -1)
 		fatal("socketpair");
-	if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, pipe_parent2relay) == -1)
+	if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC,
+	    pipe_parent2relay) == -1)
 		fatal("socketpair");
-	if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, pipe_pfe2hce) == -1)
+	if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC,
+	    pipe_pfe2hce) == -1)
 		fatal("socketpair");
 	for (c = 0; c < env.prefork_relay; c++) {
 		if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC,
@@ -589,7 +593,7 @@ expand_string(char *label, size_t len, const char *src
 		return (-1);
 	}
 	p = q = label;
-	while ((q = strstr(p, srch)) != NULL) {   
+	while ((q = strstr(p, srch)) != NULL) {
 		*q = '\0';
 		if ((strlcat(tmp, p, len) >= len) ||
 		    (strlcat(tmp, repl, len) >= len)) {
blob - 1008882e8ababb6b3421df9d9d960479734cfdfc
blob + 5d2a2f9eacc664011961999220e6facd2215e02f
--- relayd.h
+++ relayd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relayd.h,v 1.25 2007/02/22 03:32:39 reyk Exp $	*/
+/*	$OpenBSD: relayd.h,v 1.26 2007/02/22 05:58:06 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org>
@@ -160,13 +160,13 @@ struct ctl_icmp_event {
 };
 
 struct ctl_tcp_event {
-	int		 	 s;
+	int			 s;
 	char			*req;
 	struct buf		*buf;
 	struct host		*host;
 	struct table		*table;
-	struct timeval	 	 tv_start;
-	struct event	 	 ev;
+	struct timeval		 tv_start;
+	struct event		 ev;
 	int			(*validate_read)(struct ctl_tcp_event *);
 	int			(*validate_close)(struct ctl_tcp_event *);
 	SSL			*ssl;
@@ -198,7 +198,7 @@ struct ctl_relay_event {
 	int			 marked;
 	int			 line;
 	size_t			 toread;
-	enum httpmethod		 method;	
+	enum httpmethod		 method;
 
 	u_int8_t		*buf;
 	int			 buflen;
@@ -328,18 +328,18 @@ struct service {
 TAILQ_HEAD(servicelist, service);
 
 struct session {
-	objid_t			 	 id;
-	struct ctl_relay_event	 	 in;
-	struct ctl_relay_event	 	 out;
+	objid_t				 id;
+	struct ctl_relay_event		 in;
+	struct ctl_relay_event		 out;
 	u_int32_t			 outkey;
 	struct event			 ev;
-	struct timeval		 	 timeout;
+	struct timeval			 timeout;
 	struct timeval			 tv_start;
 	struct timeval			 tv_last;
-	int			 	 done;
+	int				 done;
 	void				*relay;
 	struct ctl_natlook		*cnl;
-	TAILQ_ENTRY(session)	 	 entry;
+	TAILQ_ENTRY(session)		 entry;
 };
 TAILQ_HEAD(sessionlist, session);
 
blob - cf5016d69e77eb79e7859e44d05844e75c1c18c4
blob + c42e4b3e99951ff50c8114e472f9378c6d93cae6
--- ssl.c
+++ ssl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ssl.c,v 1.7 2007/02/22 03:32:40 reyk Exp $	*/
+/*	$OpenBSD: ssl.c,v 1.8 2007/02/22 05:58:06 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org>
@@ -94,7 +94,7 @@ ssl_read(int s, short event, void *arg)
 			break;
 		}
 		return;
-	} 
+	}
 	if (buf_add(cte->buf, rbuf, ret) == -1)
 		fatal("ssl_read: buf_add error");
 	if (cte->validate_read != NULL) {
@@ -120,7 +120,7 @@ ssl_write(int s, short event, void *arg)
 {
 	struct ctl_tcp_event	*cte = arg;
 	int			 len;
-	int		 	 ret;
+	int			 ret;
 	int			 ssl_err;
 	int			 retry_flag;
 
@@ -134,7 +134,7 @@ ssl_write(int s, short event, void *arg)
 	len = strlen(cte->table->sendbuf);
 	retry_flag = EV_WRITE;
 
-	ret = SSL_write(cte->ssl, cte->table->sendbuf, len); 
+	ret = SSL_write(cte->ssl, cte->table->sendbuf, len);
 	if (ret <= 0) {
 		ssl_err = SSL_get_error(cte->ssl, ret);
 		switch (ssl_err) {
@@ -167,7 +167,7 @@ void
 ssl_connect(int s, short event, void *arg)
 {
 	struct ctl_tcp_event	*cte = arg;
-	int		 	 ret;
+	int			 ret;
 	int			 ssl_err;
 	int			 retry_flag;
 
@@ -179,7 +179,7 @@ ssl_connect(int s, short event, void *arg)
 
 	retry_flag = ssl_err = 0;
 
-	ret = SSL_connect(cte->ssl); 
+	ret = SSL_connect(cte->ssl);
 	if (ret <= 0) {
 		ssl_err = SSL_get_error(cte->ssl, ret);
 		switch (ssl_err) {
@@ -268,7 +268,7 @@ ssl_transaction(struct ctl_tcp_event *cte)
 
 	if (SSL_set_fd(cte->ssl, cte->s) == 0) {
 		cte->host->up = HOST_UNKNOWN;
-		ssl_error(cte->host->name, "cannot set fd"); 
+		ssl_error(cte->host->name, "cannot set fd");
 		ssl_cleanup(cte);
 		hce_notify_done(cte->host,
 		    "ssl_transaction: cannot set SSL fd");