summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Bluhm <bluhm@cvs.openbsd.org>2011-09-04 20:26:59 +0000
committerAlexander Bluhm <bluhm@cvs.openbsd.org>2011-09-04 20:26:59 +0000
commit1b5b04656a9ce27d3f941ec81b621f6e15e70340 (patch)
treef545354aed6cfcae26b7583ee06c981993cb5e0b
parent85c0f0b32a24d1607b52cd3727d8385bf9843549 (diff)
KNF, fix white spaces in relayd. No binary change.
ok pyr@ sthen@
-rw-r--r--usr.sbin/relayd/proc.c4
-rw-r--r--usr.sbin/relayd/relay.c6
-rw-r--r--usr.sbin/relayd/relayd.c7
-rw-r--r--usr.sbin/relayd/relayd.h16
4 files changed, 17 insertions, 16 deletions
diff --git a/usr.sbin/relayd/proc.c b/usr.sbin/relayd/proc.c
index 7a0ddf0512f..6bd38273992 100644
--- a/usr.sbin/relayd/proc.c
+++ b/usr.sbin/relayd/proc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: proc.c,v 1.2 2011/05/19 08:56:49 reyk Exp $ */
+/* $OpenBSD: proc.c,v 1.3 2011/09/04 20:26:58 bluhm Exp $ */
/*
* Copyright (c) 2010,2011 Reyk Floeter <reyk@openbsd.org>
@@ -198,7 +198,7 @@ proc_config(struct privsep *ps, struct privsep_proc *p, u_int nproc)
fatal("proc_config: cannot peer with oneself");
count = ps->ps_instances[src] * ps->ps_instances[dst];
-
+
if ((ps->ps_ievs[dst] = calloc(count,
sizeof(struct imsgev))) == NULL)
fatal("proc_config");
diff --git a/usr.sbin/relayd/relay.c b/usr.sbin/relayd/relay.c
index 6155b5331ba..83584bff0a2 100644
--- a/usr.sbin/relayd/relay.c
+++ b/usr.sbin/relayd/relay.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: relay.c,v 1.140 2011/09/04 10:42:47 bluhm Exp $ */
+/* $OpenBSD: relay.c,v 1.141 2011/09/04 20:26:58 bluhm Exp $ */
/*
* Copyright (c) 2006, 2007, 2008 Reyk Floeter <reyk@openbsd.org>
@@ -2018,8 +2018,8 @@ relay_accept(int fd, short sig, void *arg)
return;
}
- proc_compose_imsg(env->sc_ps, PROC_PFE, -1, IMSG_NATLOOK, -1, cnl,
- sizeof(*cnl));
+ proc_compose_imsg(env->sc_ps, PROC_PFE, -1, IMSG_NATLOOK, -1,
+ cnl, sizeof(*cnl));
/* Schedule timeout */
evtimer_set(&con->se_ev, relay_natlook, con);
diff --git a/usr.sbin/relayd/relayd.c b/usr.sbin/relayd/relayd.c
index 8bc215646f5..0fefd0c5781 100644
--- a/usr.sbin/relayd/relayd.c
+++ b/usr.sbin/relayd/relayd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: relayd.c,v 1.103 2011/05/19 08:56:49 reyk Exp $ */
+/* $OpenBSD: relayd.c,v 1.104 2011/09/04 20:26:58 bluhm Exp $ */
/*
* Copyright (c) 2007, 2008 Reyk Floeter <reyk@openbsd.org>
@@ -54,7 +54,8 @@ void parent_sig_handler(int, short, void *);
void parent_shutdown(struct relayd *);
int parent_dispatch_pfe(int, struct privsep_proc *, struct imsg *);
int parent_dispatch_hce(int, struct privsep_proc *, struct imsg *);
-int parent_dispatch_relay(int, struct privsep_proc *, struct imsg *);
+int parent_dispatch_relay(int, struct privsep_proc *,
+ struct imsg *);
int bindany(struct ctl_bindany *);
struct relayd *relayd_env;
@@ -377,7 +378,7 @@ parent_dispatch_pfe(int fd, struct privsep_proc *p, struct imsg *imsg)
struct relayd *env = p->p_env;
struct ctl_demote demote;
struct ctl_netroute crt;
- u_int v;
+ u_int v;
char *str = NULL;
switch (imsg->hdr.type) {
diff --git a/usr.sbin/relayd/relayd.h b/usr.sbin/relayd/relayd.h
index c4abc4251b3..3d540450486 100644
--- a/usr.sbin/relayd/relayd.h
+++ b/usr.sbin/relayd/relayd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: relayd.h,v 1.150 2011/05/26 14:48:20 reyk Exp $ */
+/* $OpenBSD: relayd.h,v 1.151 2011/09/04 20:26:58 bluhm Exp $ */
/*
* Copyright (c) 2006, 2007 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -474,11 +474,11 @@ enum noderesult {
};
struct protonode_config {
- objid_t protoid;
- size_t keylen;
- size_t valuelen;
- size_t len;
- u_int dir;
+ objid_t protoid;
+ size_t keylen;
+ size_t valuelen;
+ size_t len;
+ u_int dir;
};
struct protonode {
@@ -713,7 +713,7 @@ struct ctl_conn {
u_int8_t flags;
u_int waiting;
#define CTL_CONN_NOTIFY 0x01
- struct imsgev iev;
+ struct imsgev iev;
};
TAILQ_HEAD(ctl_connlist, ctl_conn);
@@ -1020,7 +1020,7 @@ int protonode_load(enum direction, struct protocol *,
int map6to4(struct sockaddr_storage *);
int map4to6(struct sockaddr_storage *, struct sockaddr_storage *);
void imsg_event_add(struct imsgev *);
-int imsg_compose_event(struct imsgev *, u_int16_t, u_int32_t,
+int imsg_compose_event(struct imsgev *, u_int16_t, u_int32_t,
pid_t, int, void *, u_int16_t);
void socket_rlimit(int);
char *get_string(u_int8_t *, size_t);