summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Franke <chris@opensourcerouting.org>2012-11-19 11:17:31 +0000
committerDavid Lamparter <equinox@opensourcerouting.org>2013-01-14 16:00:58 +0100
commit15c713485699fd22dfa5b7ce3ca7c6be049f1033 (patch)
tree26348d73018fa2351410e88ca1cde0e12acae1a6
parent24e50f2013e64a73b1f7ecdbd5688360002d09f7 (diff)
bgpd: store "no neighbor activate" for IPv4 unicast
If a neighbor was in a peer group for any AFI/SAFI, bgpd would never write a "no neighbor activate" line for IPv4 unicast, so a valid setup like following could be configured, but not saved: router bgp 64600 bgp router-id 198.51.100.1 network 198.51.100.0/24 neighbor peers peer-group neighbor 2001:db8::2 remote-as 64601 no neighbor 2001:db8::2 activate ! address-family ipv6 network 2001:db8:1::/48 neighbor peers activate neighbor peers soft-reconfiguration inbound neighbor 2001:db8::2 peer-group peers exit-address-family ! Signed-off-by: Christian Franke <chris@opensourcerouting.org> Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
-rw-r--r--bgpd/bgpd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 908bdd94..0b3f0a8e 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -4915,7 +4915,7 @@ bgp_config_write_peer (struct vty *vty, struct bgp *bgp,
vty_out (vty, " neighbor %s strict-capability-match%s", addr,
VTY_NEWLINE);
- if (! peer_group_active (peer))
+ if (! peer->af_group[AFI_IP][SAFI_UNICAST])
{
if (bgp_flag_check (bgp, BGP_FLAG_NO_DEFAULT_IPV4))
{