diff options
| author | Russ White <russ@riw.us> | 2020-08-25 16:31:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-25 16:31:01 +0200 |
| commit | e3dcd431cdc7f91f1bc75b5634615ec83dbf75ea (patch) | |
| tree | 1409d2db540d5d29e53b65ef724d34234f12be59 /bgpd/bgp_fsm.c | |
| parent | Merge pull request #6975 from opensourcerouting/topotest-zebra-nl-buf-size (diff) | |
| parent | bgpd: alias for bgp no shutdown cmd (diff) | |
| download | frr-e3dcd431cdc7f91f1bc75b5634615ec83dbf75ea.tar.xz frr-e3dcd431cdc7f91f1bc75b5634615ec83dbf75ea.zip | |
Merge pull request #6938 from opensourcerouting/bgp-instance-shutdown
bgpd: BGP instance administrative shutdown
Diffstat (limited to 'bgpd/bgp_fsm.c')
| -rw-r--r-- | bgpd/bgp_fsm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c index c8e5a308e..28e93c409 100644 --- a/bgpd/bgp_fsm.c +++ b/bgpd/bgp_fsm.c @@ -1548,6 +1548,8 @@ int bgp_start(struct peer *peer) peer->host); if (CHECK_FLAG(peer->flags, PEER_FLAG_SHUTDOWN)) peer->last_reset = PEER_DOWN_USER_SHUTDOWN; + else if (CHECK_FLAG(peer->bgp->flags, BGP_FLAG_SHUTDOWN)) + peer->last_reset = PEER_DOWN_USER_SHUTDOWN; else if (CHECK_FLAG(peer->sflags, PEER_STATUS_PREFIX_OVERFLOW)) peer->last_reset = PEER_DOWN_PFX_COUNT; return -1; |