bgpd: Added bgp graceful restart additional debug logs.

bgp graceful restart additional debug logs, resolved
merge conflicts.

Signed-off-by: Biswajit Sadhu <sadhub@vmware.com>
This commit is contained in:
bisdhdh 2019-12-01 10:52:06 +05:30
parent 2ba1fe6951
commit 4a6e80fbf2
3 changed files with 9 additions and 3 deletions

View file

@ -2305,12 +2305,12 @@ int bgp_gr_lookup_n_update_all_peer(struct bgp *bgp,
break; break;
case GLOBAL_INVALID: case GLOBAL_INVALID:
zlog_debug( zlog_debug(
"%s [BGP_GR]GLOBAL_INVALID", "%s [BGP_GR] GLOBAL_INVALID",
__func__); __func__);
return BGP_ERR_GR_OPERATION_FAILED; return BGP_ERR_GR_OPERATION_FAILED;
default: default:
zlog_debug( zlog_debug(
"%s [BGP_GR]Global unknown ERROR", "%s [BGP_GR] Global unknown ERROR",
__func__); __func__);
return BGP_ERR_GR_OPERATION_FAILED; return BGP_ERR_GR_OPERATION_FAILED;
} }

View file

@ -1355,6 +1355,13 @@ static void bgp_peer_send_gr_capability(struct stream *s, struct peer *peer,
* only when GR config is present * only when GR config is present
*/ */
if (CHECK_FLAG(peer->flags, PEER_FLAG_GRACEFUL_RESTART)) { 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) { FOREACH_AFI_SAFI (afi, safi) {
if (peer->afc[afi][safi]) { if (peer->afc[afi][safi]) {
if (BGP_DEBUG(graceful_restart, if (BGP_DEBUG(graceful_restart,

View file

@ -746,7 +746,6 @@ void bgp_notify_send_with_data(struct peer *peer, uint8_t code,
strlcpy(bgp_notify.data, c, strlcpy(bgp_notify.data, c,
bgp_notify.length); bgp_notify.length);
} }
} }
bgp_notify_print(peer, &bgp_notify, "sending"); bgp_notify_print(peer, &bgp_notify, "sending");