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>

diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c
index 77a7836f4fb51acbdb01b9d85da2dd61d59957ff..c5b46487a5a1275b2d701850a7f24ca8e4911006 100644 (file)
--- 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 e04964ff36cca75efe54929f82c048f79cdf3226..e743fdda8f2c9ed9300346e7c1f3658a069e4a8e 100644 (file)
--- 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 f114443e0abc823784d5ba478e6c1341df1c3a6d..e77194a6244b70b5909f41efe757c2ee568f4eb9 100644 (file)
--- 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");