From bc541a0d490f87b87b90f9ccf4da077756512e59 Mon Sep 17 00:00:00 2001 From: pav Date: Tue, 15 Mar 2005 22:22:45 +0000 Subject: - patch for annoing OSPF infinite loop when time goes back PR: ports/78855 Submitted by: Boris Kovalenko (maintainer) --- net/quagga/files/patch-ospfd::ospf_lsa.c | 37 ++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 net/quagga/files/patch-ospfd::ospf_lsa.c (limited to 'net/quagga/files') diff --git a/net/quagga/files/patch-ospfd::ospf_lsa.c b/net/quagga/files/patch-ospfd::ospf_lsa.c new file mode 100644 index 000000000000..6b63a0b69552 --- /dev/null +++ b/net/quagga/files/patch-ospfd::ospf_lsa.c @@ -0,0 +1,37 @@ +--- ospfd/ospf_lsa.c.orig Wed Dec 22 19:16:02 2004 ++++ ospfd/ospf_lsa.c Mon Mar 7 12:24:04 2005 +@@ -3665,6 +3665,7 @@ + struct listnode *node; + struct ospf *ospf = THREAD_ARG (t); + int i; ++ time_t ct; + struct list *lsa_to_refresh = list_new (); + + if (IS_DEBUG_OSPF (lsa, LSA_REFRESH)) +@@ -3672,15 +3673,25 @@ + + + i = ospf->lsa_refresh_queue.index; ++ ++ if ((ct = time(NULL)) < ospf->lsa_refresher_started) { ++ zlog_debug ("LSA[Refresh]: ospf_lsa_refresh_walker(): HACK: fixing lsa_refresher_started: %d -> %d", ospf->lsa_refresher_started, ct); ++ ospf->lsa_refresher_started = ct; ++ } + + ospf->lsa_refresh_queue.index = + (ospf->lsa_refresh_queue.index + +- (time (NULL) - ospf->lsa_refresher_started) / OSPF_LSA_REFRESHER_GRANULARITY) ++ (ct - ospf->lsa_refresher_started) / OSPF_LSA_REFRESHER_GRANULARITY) + % OSPF_LSA_REFRESHER_SLOTS; + + if (IS_DEBUG_OSPF (lsa, LSA_REFRESH)) + zlog_debug ("LSA[Refresh]: ospf_lsa_refresh_walker(): next index %d", + ospf->lsa_refresh_queue.index); ++ ++ if (ospf->lsa_refresh_queue.index >= OSPF_LSA_REFRESHER_SLOTS) { ++ zlog_debug ("LSA[Refresh]: ospf_lsa_refresh_walker(): HACK: fixing index: %hu -> 0", ospf->lsa_refresh_queue.index); ++ ospf->lsa_refresh_queue.index = 0; ++ } + + for (;i != ospf->lsa_refresh_queue.index; + i = (i + 1) % OSPF_LSA_REFRESHER_SLOTS) -- cgit