diff options
author | Claudio Jeker <claudio@cvs.openbsd.org> | 2004-11-19 10:03:35 +0000 |
---|---|---|
committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2004-11-19 10:03:35 +0000 |
commit | c8c1b4b036238ce6a8b0c0c4d99ffc433f3bd63d (patch) | |
tree | 345eb6174d1066d9a33169c72932e0eda0aee1fb /usr.sbin/bgpd | |
parent | 705db17b321e58f9ccd397c0b03ee6f3100d5268 (diff) |
Make "set network 127.0.0.1" work and use = instead of |= for the
blackhole/reject case as $$ is not zeroed. This caused funny results in
merge_filterset(). OK henning@
Diffstat (limited to 'usr.sbin/bgpd')
-rw-r--r-- | usr.sbin/bgpd/parse.y | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.sbin/bgpd/parse.y b/usr.sbin/bgpd/parse.y index 91d85050a33..4de7725958a 100644 --- a/usr.sbin/bgpd/parse.y +++ b/usr.sbin/bgpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.145 2004/11/18 17:07:38 henning Exp $ */ +/* $OpenBSD: parse.y,v 1.146 2004/11/19 10:03:34 claudio Exp $ */ /* * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -1114,13 +1114,14 @@ filter_set_opt : LOCALPREF number { $$.med = $2; } | NEXTHOP address { + $$.flags = SET_NEXTHOP; memcpy(&$$.nexthop, &$2, sizeof($$.nexthop)); } | NEXTHOP BLACKHOLE { - $$.flags |= SET_NEXTHOP_BLACKHOLE; + $$.flags = SET_NEXTHOP_BLACKHOLE; } | NEXTHOP REJECT { - $$.flags |= SET_NEXTHOP_REJECT; + $$.flags = SET_NEXTHOP_REJECT; } | PREPEND_SELF number { $$.flags = SET_PREPEND_SELF; |