summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2020-08-07 12:44:48 -0400
committerGitHub <noreply@github.com>2020-08-07 12:44:48 -0400
commitcd211e2049e672d96dd1c549fcd259f68e0d57ea (patch)
treec2d73c8d44fbb652f084eed53edacbdb9a50a239
parent690e4f9dff41b78e630efee96eabb11864804452 (diff)
parent392721e8b98b5d4b9a0c2f560a34e320eb836bff (diff)
Merge pull request #6875 from opensourcerouting/bgpd-fsm-legacy-cleanup
bgpd: fsm legacy thread reset cleanup
-rw-r--r--bgpd/bgp_fsm.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c
index e133cde6a5..ab3b88da7a 100644
--- a/bgpd/bgp_fsm.c
+++ b/bgpd/bgp_fsm.c
@@ -470,7 +470,6 @@ static int bgp_start_timer(struct thread *thread)
struct peer *peer;
peer = THREAD_ARG(thread);
- peer->t_start = NULL;
if (bgp_debug_neighbor_events(peer))
zlog_debug("%s [FSM] Timer (start timer expire).", peer->host);
@@ -492,8 +491,6 @@ static int bgp_connect_timer(struct thread *thread)
assert(!peer->t_write);
assert(!peer->t_read);
- peer->t_connect = NULL;
-
if (bgp_debug_neighbor_events(peer))
zlog_debug("%s [FSM] Timer (connect timer expire)", peer->host);
@@ -516,7 +513,6 @@ static int bgp_holdtime_timer(struct thread *thread)
struct peer *peer;
peer = THREAD_ARG(thread);
- peer->t_holdtime = NULL;
if (bgp_debug_neighbor_events(peer))
zlog_debug("%s [FSM] Timer (holdtime timer expire)",
@@ -552,7 +548,6 @@ int bgp_routeadv_timer(struct thread *thread)
struct peer *peer;
peer = THREAD_ARG(thread);
- peer->t_routeadv = NULL;
if (bgp_debug_neighbor_events(peer))
zlog_debug("%s [FSM] Timer (routeadv timer expire)",
@@ -612,7 +607,6 @@ static int bgp_graceful_restart_timer_expire(struct thread *thread)
safi_t safi;
peer = THREAD_ARG(thread);
- peer->t_gr_restart = NULL;
/* NSF delete stale route */
for (afi = AFI_IP; afi < AFI_MAX; afi++)
@@ -641,7 +635,6 @@ static int bgp_graceful_stale_timer_expire(struct thread *thread)
safi_t safi;
peer = THREAD_ARG(thread);
- peer->t_gr_stale = NULL;
if (bgp_debug_neighbor_events(peer))
zlog_debug("%s graceful restart stalepath timer expired",
@@ -674,8 +667,6 @@ static int bgp_graceful_deferral_timer_expire(struct thread *thread)
"afi %d, safi %d : graceful restart deferral timer expired",
afi, safi);
- bgp->gr_info[afi][safi].t_select_deferral = NULL;
-
bgp->gr_info[afi][safi].eor_required = 0;
bgp->gr_info[afi][safi].eor_received = 0;
XFREE(MTYPE_TMP, info);