diff options
Diffstat (limited to 'bgpd/bgp_io.c')
| -rw-r--r-- | bgpd/bgp_io.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/bgpd/bgp_io.c b/bgpd/bgp_io.c index 626c36ff05..ab50c545b5 100644 --- a/bgpd/bgp_io.c +++ b/bgpd/bgp_io.c @@ -462,12 +462,10 @@ static uint16_t bgp_read(struct peer *peer) safe_strerror(errno)); if (peer->status == Established) { - if ((CHECK_FLAG(peer->flags, - PEER_FLAG_GRACEFUL_RESTART) || - CHECK_FLAG(peer->flags, - PEER_FLAG_GRACEFUL_RESTART_HELPER)) && - CHECK_FLAG(peer->sflags, - PEER_STATUS_NSF_MODE)) { + if ((CHECK_FLAG(peer->flags, PEER_FLAG_GRACEFUL_RESTART) + || CHECK_FLAG(peer->flags, + PEER_FLAG_GRACEFUL_RESTART_HELPER)) + && CHECK_FLAG(peer->sflags, PEER_STATUS_NSF_MODE)) { peer->last_reset = PEER_DOWN_NSF_CLOSE_SESSION; SET_FLAG(peer->sflags, PEER_STATUS_NSF_WAIT); } else @@ -480,15 +478,13 @@ static uint16_t bgp_read(struct peer *peer) } else if (nbytes == 0) { if (bgp_debug_neighbor_events(peer)) zlog_debug("%s [Event] BGP connection closed fd %d", - peer->host, peer->fd); + peer->host, peer->fd); if (peer->status == Established) { - if ((CHECK_FLAG(peer->flags, - PEER_FLAG_GRACEFUL_RESTART) || - CHECK_FLAG(peer->flags, - PEER_FLAG_GRACEFUL_RESTART_HELPER)) && - CHECK_FLAG(peer->sflags, - PEER_STATUS_NSF_MODE)) { + if ((CHECK_FLAG(peer->flags, PEER_FLAG_GRACEFUL_RESTART) + || CHECK_FLAG(peer->flags, + PEER_FLAG_GRACEFUL_RESTART_HELPER)) + && CHECK_FLAG(peer->sflags, PEER_STATUS_NSF_MODE)) { peer->last_reset = PEER_DOWN_NSF_CLOSE_SESSION; SET_FLAG(peer->sflags, PEER_STATUS_NSF_WAIT); } else |