spacing

5 files changed, 27 insertions, 17 deletions

diff --git a/usr.sbin/relayd/hce.c b/usr.sbin/relayd/hce.c
index e3bf9dde475..a851c1caf4d 100644
--- a/usr.sbin/relayd/hce.c
+++ b/usr.sbin/relayd/hce.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hce.c,v 1.44 2008/08/08 08:51:21 thib Exp $	*/
+/*	$OpenBSD: hce.c,v 1.45 2008/09/29 15:12:22 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -337,7 +337,7 @@ hce_notify_done(struct host *host, const char *msg)
 
 	/* Notify for all other hosts that inherit the state from this one */
 	SLIST_FOREACH(h, &host->children, child) {
-		h->up = hostup;		
+		h->up = hostup;
 		hce_notify_done(h, msg);
 	}
 }
diff --git a/usr.sbin/relayd/pfe_filter.c b/usr.sbin/relayd/pfe_filter.c
index b74bdc319bc..e6685438852 100644
--- a/usr.sbin/relayd/pfe_filter.c
+++ b/usr.sbin/relayd/pfe_filter.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfe_filter.c,v 1.33 2008/09/29 09:58:51 reyk Exp $	*/
+/*	$OpenBSD: pfe_filter.c,v 1.34 2008/09/29 15:12:22 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -284,7 +284,7 @@ transaction_init(struct relayd *env, const char *anchor)
 		env->sc_pf->pft[i].size = 1;
 		env->sc_pf->pft[i].esize = sizeof(env->sc_pf->pfte[i]);
 		env->sc_pf->pft[i].array = &env->sc_pf->pfte[i];
-	
+
 		bzero(&env->sc_pf->pfte[i], sizeof(env->sc_pf->pfte[i]));
 		(void)strlcpy(env->sc_pf->pfte[i].anchor,
 		    anchor, PF_ANCHOR_NAME_SIZE);
diff --git a/usr.sbin/relayd/relay.c b/usr.sbin/relayd/relay.c
index a1b435a2688..fb72d5bf36a 100644
--- a/usr.sbin/relayd/relay.c
+++ b/usr.sbin/relayd/relay.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relay.c,v 1.104 2008/08/11 08:24:41 reyk Exp $	*/
+/*	$OpenBSD: relay.c,v 1.105 2008/09/29 15:12:22 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006, 2007, 2008 Reyk Floeter <reyk@openbsd.org>
@@ -410,7 +410,8 @@ relay_privinit(void)
 		ssl_init(env);
 
 	TAILQ_FOREACH(rlay, env->sc_relays, rl_entry) {
-		log_debug("relay_privinit: adding relay %s", rlay->rl_conf.name);
+		log_debug("relay_privinit: adding relay %s",
+		    rlay->rl_conf.name);
 
 		if (debug)
 			relay_protodebug(rlay);
@@ -1010,7 +1011,8 @@ relay_expand_http(struct ctl_relay_event *cre, char *val, char *buf, size_t len)
 		}
 	}
 	if (strstr(val, "$TIMEOUT") != NULL) {
-		snprintf(ibuf, sizeof(ibuf), "%lu", rlay->rl_conf.timeout.tv_sec);
+		snprintf(ibuf, sizeof(ibuf), "%lu",
+		    rlay->rl_conf.timeout.tv_sec);
 		if (expand_string(buf, len, "$TIMEOUT", ibuf) != 0)
 			return (NULL);
 	}
@@ -2073,7 +2075,8 @@ relay_from_table(struct session *con)
 		/* FALLTHROUGH */
 	case RELAY_DSTMODE_HASH:
 		p = relay_hash_addr(&rlay->rl_conf.ss, p);
-		p = hash32_buf(&rlay->rl_conf.port, sizeof(rlay->rl_conf.port), p);
+		p = hash32_buf(&rlay->rl_conf.port,
+		    sizeof(rlay->rl_conf.port), p);
 		if ((idx = p % rlay->rl_dstnhosts) >= RELAY_MAXHOSTS)
 			return (-1);
 	}
@@ -2116,7 +2119,8 @@ relay_natlook(int fd, short event, void *arg)
 		fatalx("invalid NAT lookup");
 
 	if (con->se_out.ss.ss_family == AF_UNSPEC && cnl->in == -1 &&
-	    rlay->rl_conf.dstss.ss_family == AF_UNSPEC && rlay->rl_dsttable == NULL) {
+	    rlay->rl_conf.dstss.ss_family == AF_UNSPEC &&
+	    rlay->rl_dsttable == NULL) {
 		relay_close(con, "session NAT lookup failed");
 		return;
 	}
@@ -2586,7 +2590,8 @@ relay_ssl_ctx_create(struct relay *rlay)
 		goto err;
 
 	log_debug("relay_ssl_ctx_create: loading private key");
-	if (!ssl_ctx_use_private_key(ctx, rlay->rl_ssl_key, rlay->rl_ssl_key_len))
+	if (!ssl_ctx_use_private_key(ctx, rlay->rl_ssl_key,
+	    rlay->rl_ssl_key_len))
 		goto err;
 	if (!SSL_CTX_check_private_key(ctx))
 		goto err;
@@ -2743,7 +2748,8 @@ relay_ssl_readcb(int fd, short event, void *arg)
 			if (ret == 0)
 				what |= EVBUFFER_EOF;
 			else {
-				ssl_error(rlay->rl_conf.name, "relay_ssl_readcb");
+				ssl_error(rlay->rl_conf.name,
+				    "relay_ssl_readcb");
 				what |= EVBUFFER_ERROR;
 			}
 			goto err;
diff --git a/usr.sbin/relayd/relay_udp.c b/usr.sbin/relayd/relay_udp.c
index fc1ee0538d8..348707c4108 100644
--- a/usr.sbin/relayd/relay_udp.c
+++ b/usr.sbin/relayd/relay_udp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relay_udp.c,v 1.17 2008/08/08 08:51:21 thib Exp $	*/
+/*	$OpenBSD: relay_udp.c,v 1.18 2008/09/29 15:12:22 reyk Exp $	*/
 
 /*
  * Copyright (c) 2007, 2008 Reyk Floeter <reyk@openbsd.org>
@@ -479,7 +479,8 @@ relay_dns_request(struct session *con)
 		if (relay_from_table(con) != 0)
 			return (-1);
 	} else if (con->se_out.ss.ss_family == AF_UNSPEC) {
-		bcopy(&rlay->rl_conf.dstss, &con->se_out.ss, sizeof(con->se_out.ss));
+		bcopy(&rlay->rl_conf.dstss, &con->se_out.ss,
+		    sizeof(con->se_out.ss));
 		con->se_out.port = rlay->rl_conf.dstport;
 	}
 
diff --git a/usr.sbin/relayd/relayd.c b/usr.sbin/relayd/relayd.c
index 5c49ac8e933..e7e58bb29d6 100644
--- a/usr.sbin/relayd/relayd.c
+++ b/usr.sbin/relayd/relayd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relayd.c,v 1.82 2008/09/29 15:06:52 reyk Exp $	*/
+/*	$OpenBSD: relayd.c,v 1.83 2008/09/29 15:12:22 reyk Exp $	*/
 
 /*
  * Copyright (c) 2007, 2008 Reyk Floeter <reyk@openbsd.org>
@@ -370,8 +370,10 @@ merge_config(struct relayd *env, struct relayd *new_env)
 	env->sc_protocount = new_env->sc_protocount;
 	env->sc_relaycount = new_env->sc_relaycount;
 
-	memcpy(&env->sc_interval, &new_env->sc_interval, sizeof(env->sc_interval));
-	memcpy(&env->sc_timeout, &new_env->sc_timeout, sizeof(env->sc_timeout));
+	memcpy(&env->sc_interval, &new_env->sc_interval,
+	    sizeof(env->sc_interval));
+	memcpy(&env->sc_timeout, &new_env->sc_timeout,
+	    sizeof(env->sc_timeout));
 	memcpy(&env->sc_empty_table, &new_env->sc_empty_table,
 	    sizeof(env->sc_empty_table));
 	memcpy(&env->sc_proto_default, &new_env->sc_proto_default,
@@ -489,7 +491,8 @@ purge_config(struct relayd *env, u_int8_t what)
 	if (what & PURGE_RELAYS && env->sc_relays != NULL) {
 		while ((rlay = TAILQ_FIRST(env->sc_relays)) != NULL) {
 			TAILQ_REMOVE(env->sc_relays, rlay, rl_entry);
-			while ((sess = SPLAY_ROOT(&rlay->rl_sessions)) != NULL) {
+			while ((sess =
+			    SPLAY_ROOT(&rlay->rl_sessions)) != NULL) {
 				SPLAY_REMOVE(session_tree,
 				    &rlay->rl_sessions, sess);
 				free(sess);