From 3dfc79c20d5b95ca3ab37478fc39aa8cfa9645da Mon Sep 17 00:00:00 2001 From: Daniel Walton Date: Sat, 14 May 2016 02:29:11 +0000 Subject: [PATCH] OSPF ANVL failures in 3.0 Signed-off-by: Daniel Walton Reviewed-by: Donald Sharp Ticket: CM-10088 When we pulled this patch from upstream there was one spot where we incorrectly used min_ls_interval (5s) instead of min_ls_arrival (1s). commit ac7424f9dec0d49d891e0b457afa8e31c2b854fe Author: Michael Rossberg Date: Mon Jul 27 21:05:44 2015 +0200 configuration options for faster OSPF convergence Allow configuration of faster OSPF convergence via the min_ls_interval and min_ls_arrival timer lengths. This patch was originated by Michael, and cross-ported to Cumulus's Quagga. --- ospfd/ospf_flood.c | 2 +- ospfd/ospf_zebra.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ospfd/ospf_flood.c b/ospfd/ospf_flood.c index 5a6893a6f8..c641b190fb 100644 --- a/ospfd/ospf_flood.c +++ b/ospfd/ospf_flood.c @@ -284,7 +284,7 @@ ospf_flood (struct ospf *ospf, struct ospf_neighbor *nbr, ; /* Accept this LSA for quick LSDB resynchronization. */ } else if (tv_cmp (tv_sub (recent_relative_time (), current->tv_recv), - intms2tv (ospf->min_ls_interval)) < 0) + intms2tv (ospf->min_ls_arrival)) < 0) { if (IS_DEBUG_OSPF_EVENT) zlog_debug ("LSA[Flooding]: LSA is received recently."); diff --git a/ospfd/ospf_zebra.c b/ospfd/ospf_zebra.c index 49a35a11c0..ffdfd750d2 100644 --- a/ospfd/ospf_zebra.c +++ b/ospfd/ospf_zebra.c @@ -1264,8 +1264,8 @@ ospf_distribute_list_update (struct ospf *ospf, uintptr_t type, /* Set timer. */ ospf->t_distribute_update = - thread_add_timer (master, ospf_distribute_list_update_timer, - (void *) type, ospf->min_ls_interval); + thread_add_timer_msec (master, ospf_distribute_list_update_timer, + (void *) type, ospf->min_ls_interval); } /* If access-list is updated, apply some check. */ -- 2.39.5