summaryrefslogtreecommitdiff
path: root/usr.sbin/bgpd/rde.c
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/bgpd/rde.c')
-rw-r--r--usr.sbin/bgpd/rde.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/usr.sbin/bgpd/rde.c b/usr.sbin/bgpd/rde.c
index e56d5b78237..220b5666ac2 100644
--- a/usr.sbin/bgpd/rde.c
+++ b/usr.sbin/bgpd/rde.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rde.c,v 1.139 2004/08/06 12:04:08 claudio Exp $ */
+/* $OpenBSD: rde.c,v 1.140 2004/08/10 13:02:08 claudio Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -685,7 +685,7 @@ rde_update_dispatch(struct imsg *imsg)
}
/* apply default overrides */
- rde_apply_set(asp, &peer->conf.attrset);
+ rde_apply_set(asp, &peer->conf.attrset, AF_INET);
/* parse nlri prefix */
while (nlri_len > 0) {
@@ -760,6 +760,9 @@ rde_update_dispatch(struct imsg *imsg)
mpp += pos;
mplen -= pos;
+ /* apply default overrides */
+ rde_apply_set(asp, &peer->conf.attrset, AF_INET6);
+
switch (afi) {
case AFI_IPv6:
while (mplen > 0) {
@@ -1961,7 +1964,7 @@ network_add(struct network_config *nc, int flagstatic)
/* the nexthop is unset unless a default set overrides it */
/* apply default overrides */
- rde_apply_set(asp, &nc->attrset);
+ rde_apply_set(asp, &nc->attrset, nc->prefix.af);
if (flagstatic)
path_update(&peerself, asp, &nc->prefix, nc->prefixlen);