summaryrefslogtreecommitdiff
path: root/bgpd
diff options
context:
space:
mode:
authorJorge Boncompte [DTI2] <jorge@dti2.net>2012-06-20 17:45:50 +0200
committerDavid Lamparter <equinox@opensourcerouting.org>2012-06-21 09:48:56 +0200
commite2c38e6c9767e30d5683022653b1cf91b186f9d4 (patch)
tree692f274468ac2075d70a7da87888935ab545a44b /bgpd
parentc9e4f8623642fc005c97830256000bef5680aa26 (diff)
bgpd: Fix for commit 6a4677b7, fixes BZ#729
The timers are rearmed after events processing. After 6a4677b7 we do not generate events that can rearm the holdtime timer. Fix it's to call bgp_timer_set() directly as it's done from bgp_event(). Signed-off-by: Jorge Boncompte [DTI2] <jorge@dti2.net> Tested-by: Martin Winter <mwinter@opensourcerouting.org> Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'bgpd')
-rw-r--r--bgpd/bgp_packet.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c
index 024f5e7b..2d62c8da 100644
--- a/bgpd/bgp_packet.c
+++ b/bgpd/bgp_packet.c
@@ -1854,8 +1854,9 @@ bgp_update_receive (struct peer *peer, bgp_size_t size)
peer->update_in++;
peer->update_time = bgp_clock ();
- /* Cancel holdtime timer */
+ /* Rearm holdtime timer */
BGP_TIMER_OFF (peer->t_holdtime);
+ bgp_timer_set (peer);
return 0;
}