bgpd: Remove BGP's asorig timer, it is no longer used
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by: Donald Sharp <sharpd@cumulusnetworks.com>
diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c
index 9ac3335..1823336 100644
--- a/bgpd/bgp_fsm.c
+++ b/bgpd/bgp_fsm.c
@@ -101,7 +101,6 @@
BGP_TIMER_OFF (peer->t_connect);
BGP_TIMER_OFF (peer->t_holdtime);
BGP_TIMER_OFF (peer->t_keepalive);
- BGP_TIMER_OFF (peer->t_asorig);
BGP_TIMER_OFF (peer->t_routeadv);
break;
@@ -113,7 +112,6 @@
BGP_TIMER_ON (peer->t_connect, bgp_connect_timer, peer->v_connect);
BGP_TIMER_OFF (peer->t_holdtime);
BGP_TIMER_OFF (peer->t_keepalive);
- BGP_TIMER_OFF (peer->t_asorig);
BGP_TIMER_OFF (peer->t_routeadv);
break;
@@ -133,7 +131,6 @@
}
BGP_TIMER_OFF (peer->t_holdtime);
BGP_TIMER_OFF (peer->t_keepalive);
- BGP_TIMER_OFF (peer->t_asorig);
BGP_TIMER_OFF (peer->t_routeadv);
break;
@@ -151,7 +148,6 @@
BGP_TIMER_OFF (peer->t_holdtime);
}
BGP_TIMER_OFF (peer->t_keepalive);
- BGP_TIMER_OFF (peer->t_asorig);
BGP_TIMER_OFF (peer->t_routeadv);
break;
@@ -174,7 +170,6 @@
BGP_TIMER_ON (peer->t_keepalive, bgp_keepalive_timer,
peer->v_keepalive);
}
- BGP_TIMER_OFF (peer->t_asorig);
BGP_TIMER_OFF (peer->t_routeadv);
break;
@@ -198,7 +193,6 @@
BGP_TIMER_ON (peer->t_keepalive, bgp_keepalive_timer,
peer->v_keepalive);
}
- BGP_TIMER_OFF (peer->t_asorig);
break;
case Deleted:
BGP_TIMER_OFF (peer->t_gr_restart);
@@ -209,7 +203,6 @@
BGP_TIMER_OFF (peer->t_connect);
BGP_TIMER_OFF (peer->t_holdtime);
BGP_TIMER_OFF (peer->t_keepalive);
- BGP_TIMER_OFF (peer->t_asorig);
BGP_TIMER_OFF (peer->t_routeadv);
}
}
@@ -522,7 +515,6 @@
BGP_TIMER_OFF (peer->t_connect);
BGP_TIMER_OFF (peer->t_holdtime);
BGP_TIMER_OFF (peer->t_keepalive);
- BGP_TIMER_OFF (peer->t_asorig);
BGP_TIMER_OFF (peer->t_routeadv);
/* Stream reset. */
diff --git a/bgpd/bgp_snmp.c b/bgpd/bgp_snmp.c
index 6a57834..662186b 100644
--- a/bgpd/bgp_snmp.c
+++ b/bgpd/bgp_snmp.c
@@ -74,9 +74,8 @@
#define BGPPEERKEEPALIVE 19
#define BGPPEERHOLDTIMECONFIGURED 20
#define BGPPEERKEEPALIVECONFIGURED 21
-#define BGPPEERMINASORIGINATIONINTERVAL 22
-#define BGPPEERMINROUTEADVERTISEMENTINTERVAL 23
-#define BGPPEERINUPDATEELAPSEDTIME 24
+#define BGPPEERMINROUTEADVERTISEMENTINTERVAL 22
+#define BGPPEERINUPDATEELAPSEDTIME 23
/* BGP MIB bgpIdentifier. */
#define BGPIDENTIFIER 0
@@ -189,8 +188,6 @@
3, {3, 1, 20}},
{BGPPEERKEEPALIVECONFIGURED, INTEGER, RWRITE, bgpPeerTable,
3, {3, 1, 21}},
- {BGPPEERMINASORIGINATIONINTERVAL, INTEGER, RWRITE, bgpPeerTable,
- 3, {3, 1, 22}},
{BGPPEERMINROUTEADVERTISEMENTINTERVAL, INTEGER, RWRITE, bgpPeerTable,
3, {3, 1, 23}},
{BGPPEERINUPDATEELAPSEDTIME, GAUGE32, RONLY, bgpPeerTable,
@@ -440,9 +437,6 @@
peer->keepalive = intval;
peer->v_keepalive = intval;
break;
- case BGPPEERMINASORIGINATIONINTERVAL:
- peer->v_asorig = intval;
- break;
case BGPPEERMINROUTEADVERTISEMENTINTERVAL:
peer->v_routeadv = intval;
break;
@@ -571,10 +565,6 @@
else
return SNMP_INTEGER (peer->v_keepalive);
break;
- case BGPPEERMINASORIGINATIONINTERVAL:
- *write_method = write_bgpPeerTable;
- return SNMP_INTEGER (peer->v_asorig);
- break;
case BGPPEERMINROUTEADVERTISEMENTINTERVAL:
*write_method = write_bgpPeerTable;
return SNMP_INTEGER (peer->v_routeadv);
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 90e77f2..c94c381 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -805,7 +805,6 @@
peer->fd = -1;
peer->v_start = BGP_INIT_START_TIMER;
peer->v_connect = BGP_DEFAULT_CONNECT_RETRY;
- peer->v_asorig = BGP_DEFAULT_ASORIGINATE;
peer->status = Idle;
peer->ostatus = Idle;
peer->weight = 0;
diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h
index be1c007..1db2eb7 100644
--- a/bgpd/bgpd.h
+++ b/bgpd/bgpd.h
@@ -466,7 +466,6 @@
u_int32_t v_connect;
u_int32_t v_holdtime;
u_int32_t v_keepalive;
- u_int32_t v_asorig;
u_int32_t v_routeadv;
u_int32_t v_pmax_restart;
u_int32_t v_gr_restart;
@@ -478,7 +477,6 @@
struct thread *t_connect;
struct thread *t_holdtime;
struct thread *t_keepalive;
- struct thread *t_asorig;
struct thread *t_routeadv;
struct thread *t_pmax_restart;
struct thread *t_gr_restart;
@@ -747,7 +745,6 @@
#define BGP_ERROR_START_TIMER 30
#define BGP_DEFAULT_HOLDTIME 180
#define BGP_DEFAULT_KEEPALIVE 60
-#define BGP_DEFAULT_ASORIGINATE 15
#define BGP_DEFAULT_EBGP_ROUTEADV 30
#define BGP_DEFAULT_IBGP_ROUTEADV 5
#define BGP_CLEAR_CONNECT_RETRY 20