bgpd: Remove change that makes NHT tickle BGP FSM.
* bgpd NHT patch makes NHT tickle FSM to restart session attempts that
are still very early, pre sending of messages. Not really necessary,
and conceptually it may be nicer to just keep these two pieces
separate from each other.
* bgpd.h: Remove NHT_Update FSM event
* bgp_fsm.c: Remove NHT_Update event action from the FSM.
* bgp_nht.c: Remove NHT_Update event.
diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c
index 9d86655..9f0b64c 100644
--- a/bgpd/bgp_fsm.c
+++ b/bgpd/bgp_fsm.c
@@ -971,7 +971,6 @@
{bgp_ignore, Idle}, /* Receive_UPDATE_message */
{bgp_ignore, Idle}, /* Receive_NOTIFICATION_message */
{bgp_ignore, Idle}, /* Clearing_Completed */
- {bgp_start, Connect}, /* NHT_Update */
},
{
/* Connect */
@@ -989,7 +988,6 @@
{bgp_ignore, Idle}, /* Receive_UPDATE_message */
{bgp_stop, Idle}, /* Receive_NOTIFICATION_message */
{bgp_ignore, Idle}, /* Clearing_Completed */
- {bgp_reconnect, Connect},/* NHT_Update */
},
{
/* Active, */
@@ -1007,7 +1005,6 @@
{bgp_ignore, Idle}, /* Receive_UPDATE_message */
{bgp_stop_with_error, Idle}, /* Receive_NOTIFICATION_message */
{bgp_ignore, Idle}, /* Clearing_Completed */
- {bgp_start, Connect}, /* NHT_Update */
},
{
/* OpenSent, */
@@ -1025,7 +1022,6 @@
{bgp_fsm_event_error, Idle}, /* Receive_UPDATE_message */
{bgp_stop_with_error, Idle}, /* Receive_NOTIFICATION_message */
{bgp_ignore, Idle}, /* Clearing_Completed */
- {bgp_ignore, OpenSent}, /* NHT_Update */
},
{
/* OpenConfirm, */
@@ -1043,7 +1039,6 @@
{bgp_ignore, Idle}, /* Receive_UPDATE_message */
{bgp_stop_with_error, Idle}, /* Receive_NOTIFICATION_message */
{bgp_ignore, Idle}, /* Clearing_Completed */
- {bgp_ignore, OpenConfirm}, /* NHT_Update */
},
{
/* Established, */
@@ -1061,7 +1056,6 @@
{bgp_fsm_update, Established}, /* Receive_UPDATE_message */
{bgp_stop_with_error, Clearing}, /* Receive_NOTIFICATION_message */
{bgp_ignore, Idle}, /* Clearing_Completed */
- {bgp_ignore, Established}, /* NHT_Update */
},
{
/* Clearing, */
@@ -1079,7 +1073,6 @@
{bgp_stop, Clearing}, /* Receive_UPDATE_message */
{bgp_stop, Clearing}, /* Receive_NOTIFICATION_message */
{bgp_clearing_completed, Idle}, /* Clearing_Completed */
- {bgp_ignore, Clearing}, /* NHT_Update */
},
{
/* Deleted, */
@@ -1097,7 +1090,6 @@
{bgp_ignore, Deleted}, /* Receive_UPDATE_message */
{bgp_ignore, Deleted}, /* Receive_NOTIFICATION_message */
{bgp_ignore, Deleted}, /* Clearing_Completed */
- {bgp_ignore, Deleted}, /* NHT_Update */
},
};
@@ -1118,7 +1110,6 @@
"Receive_UPDATE_message",
"Receive_NOTIFICATION_message",
"Clearing_Completed",
- "NHT_Update",
};
/* Execute event process. */
diff --git a/bgpd/bgp_nht.c b/bgpd/bgp_nht.c
index 8c87a64..1158ab1 100644
--- a/bgpd/bgp_nht.c
+++ b/bgpd/bgp_nht.c
@@ -580,7 +580,6 @@
{
if (BGP_DEBUG(nht, NHT))
zlog_debug("%s: Updating peer (%s) status with NHT", __FUNCTION__, peer->host);
- BGP_EVENT_ADD (peer, NHT_Update);
SET_FLAG(bnc->flags, BGP_NEXTHOP_PEER_NOTIFIED);
}
diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h
index 0c13156..2b279cd 100644
--- a/bgpd/bgpd.h
+++ b/bgpd/bgpd.h
@@ -747,7 +747,6 @@
#define Receive_UPDATE_message 12
#define Receive_NOTIFICATION_message 13
#define Clearing_Completed 14
-#define NHT_Update 15
#define BGP_EVENTS_MAX 16
/* BGP timers default value. */