OSPF ANVL failures in 3.0

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by:   Donald Sharp <sharpd@cumulusnetworks.com>
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 <michael.rossberg@tu-ilmenau.de>
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.

diff --git a/ospfd/ospf_flood.c b/ospfd/ospf_flood.c
index 5a6893a6f860eb48799e044bd4e287f951069078..c641b190fb79093a080dd6e24b3e2ed111e143f8 100644 (file)
--- 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 49a35a11c0891641832c3ca41191463cbaf3d516..ffdfd750d2bfbebe41d46224389e12770fbcfdfe 100644 (file)
--- 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. */