diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c index 77a7836f4f..c5b46487a5 100644 --- a/bgpd/bgp_fsm.c +++ b/bgpd/bgp_fsm.c @@ -2305,12 +2305,12 @@ int bgp_gr_lookup_n_update_all_peer(struct bgp *bgp, break; case GLOBAL_INVALID: zlog_debug( - "%s [BGP_GR]GLOBAL_INVALID", + "%s [BGP_GR] GLOBAL_INVALID", __func__); return BGP_ERR_GR_OPERATION_FAILED; default: zlog_debug( - "%s [BGP_GR]Global unknown ERROR", + "%s [BGP_GR] Global unknown ERROR", __func__); return BGP_ERR_GR_OPERATION_FAILED; } diff --git a/bgpd/bgp_open.c b/bgpd/bgp_open.c index e04964ff36..e743fdda8f 100644 --- a/bgpd/bgp_open.c +++ b/bgpd/bgp_open.c @@ -1355,6 +1355,13 @@ static void bgp_peer_send_gr_capability(struct stream *s, struct peer *peer, * only when GR config is present */ if (CHECK_FLAG(peer->flags, PEER_FLAG_GRACEFUL_RESTART)) { + + if (bgp_flag_check(peer->bgp, + BGP_FLAG_GR_PRESERVE_FWD) && + BGP_DEBUG(graceful_restart, + GRACEFUL_RESTART)) + zlog_debug("[BGP_GR] F bit Set"); + FOREACH_AFI_SAFI (afi, safi) { if (peer->afc[afi][safi]) { if (BGP_DEBUG(graceful_restart, diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c index f114443e0a..e77194a624 100644 --- a/bgpd/bgp_packet.c +++ b/bgpd/bgp_packet.c @@ -746,7 +746,6 @@ void bgp_notify_send_with_data(struct peer *peer, uint8_t code, strlcpy(bgp_notify.data, c, bgp_notify.length); - } } bgp_notify_print(peer, &bgp_notify, "sending");