diff options
| author | Russ White <russ@riw.us> | 2017-07-10 17:11:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-10 17:11:56 -0400 |
| commit | 4ad79cbd11be1d08a73bf0fd389139dbedee76bc (patch) | |
| tree | fd55a2dfa48deee5d64ea69acdbf2a4e39260aea | |
| parent | be2ddfff10343de8cb2e357f1052ffb2448ea830 (diff) | |
| parent | 5f007459f648e282355dc1bd9fc693da196edb0c (diff) | |
Merge pull request #786 from dwalton76/bgpd-peergroup-activate
bgpd: peer-group members 'activate' when they shouldn't
| -rw-r--r-- | bgpd/bgpd.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index b408205672..0026187598 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -2725,6 +2725,8 @@ peer_group_bind (struct bgp *bgp, union sockunion *su, struct peer *peer, peer_group2peer_config_copy_af (group, peer, afi, safi); } } + else if (peer->afc[afi][safi]) + peer_deactivate (peer, afi, safi); } if (peer->group) @@ -2805,6 +2807,8 @@ peer_group_bind (struct bgp *bgp, union sockunion *su, struct peer *peer, peer_af_create(peer, afi, safi); peer_group2peer_config_copy_af (group, peer, afi, safi); } + else if (peer->afc[afi][safi]) + peer_deactivate (peer, afi, safi); SET_FLAG(peer->flags, PEER_FLAG_CONFIG_NODE); |