summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/bgpd/parse.y8
-rw-r--r--usr.sbin/bgpd/rde_prefix.c5
2 files changed, 7 insertions, 6 deletions
diff --git a/usr.sbin/bgpd/parse.y b/usr.sbin/bgpd/parse.y
index 67ff1023d6a..2044a418090 100644
--- a/usr.sbin/bgpd/parse.y
+++ b/usr.sbin/bgpd/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.34 2004/01/13 13:45:49 claudio Exp $ */
+/* $OpenBSD: parse.y,v 1.35 2004/01/17 19:15:07 henning Exp $ */
/*
* Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -233,7 +233,7 @@ neighbor : NEIGHBOR address optnl '{' optnl {
curpeer->conf.remote_addr.sin_port = htons(BGP_PORT);
curpeer->conf.remote_addr.sin_addr.s_addr = $2.s_addr;
}
- peeropts_l '}' {
+ peeropts_l '}' {
curpeer->next = peer_l;
peer_l = curpeer;
curpeer = NULL;
@@ -250,7 +250,7 @@ group : GROUP string optnl '{' optnl {
YYERROR;
}
}
- groupopts_l '}' {
+ groupopts_l '}' {
free(curgroup);
curgroup = NULL;
}
@@ -753,7 +753,7 @@ alloc_peer(void)
if ((p = calloc(1, sizeof(struct peer))) == NULL)
fatal("new_peer");
-
+
/* some sane defaults */
p->state = STATE_NONE;
p->next = NULL;
diff --git a/usr.sbin/bgpd/rde_prefix.c b/usr.sbin/bgpd/rde_prefix.c
index c85c3fcb755..489ea58055f 100644
--- a/usr.sbin/bgpd/rde_prefix.c
+++ b/usr.sbin/bgpd/rde_prefix.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rde_prefix.c,v 1.8 2004/01/16 11:14:43 henning Exp $ */
+/* $OpenBSD: rde_prefix.c,v 1.9 2004/01/17 19:15:07 henning Exp $ */
/*
* Copyright (c) 2003, 2004 Claudio Jeker <claudio@openbsd.org>
@@ -75,7 +75,8 @@ u_long pthashsize[MAX_PREFIX + 1 - MIN_PREFIX] = {
struct pt_table pttable[MAX_PREFIX + 1 - MIN_PREFIX];
#define PT_HASH(p, plen) \
- &pttable[plen].pt_hashtbl[((p >> plen) ^ (p >> (plen + 5))) & pttable[plen].pt_hashmask]
+ &pttable[plen].pt_hashtbl[((p >> plen) ^ (p >> (plen + 5))) & \
+ pttable[plen].pt_hashmask]
/*
* Statistics collector.