summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornorby <norby@openbsd.org>2005-11-14 11:48:05 +0000
committernorby <norby@openbsd.org>2005-11-14 11:48:05 +0000
commit28ab0831d60a8b9b9a0d631cbe47b3228cc276a5 (patch)
treedcaf80881f037954e87c0a474ecb01cc86f8df76
parentprint RCS file path; (diff)
downloadwireguard-openbsd-28ab0831d60a8b9b9a0d631cbe47b3228cc276a5.tar.xz
wireguard-openbsd-28ab0831d60a8b9b9a0d631cbe47b3228cc276a5.zip
Revert candidate list change since it is broken.
ok henning@
-rw-r--r--usr.sbin/ospfd/rde_spf.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/usr.sbin/ospfd/rde_spf.c b/usr.sbin/ospfd/rde_spf.c
index 69ef023310a..b442323b388 100644
--- a/usr.sbin/ospfd/rde_spf.c
+++ b/usr.sbin/ospfd/rde_spf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rde_spf.c,v 1.36 2005/11/12 18:18:24 deraadt Exp $ */
+/* $OpenBSD: rde_spf.c,v 1.37 2005/11/14 11:48:05 norby Exp $ */
/*
* Copyright (c) 2005 Esben Norby <norby@openbsd.org>
@@ -172,18 +172,15 @@ spf_calc(struct area *area)
w->cost = d;
w->prev = v;
calc_next_hop(w, v);
- /*
- * need to readd to candidate list
- * because the list is sorted
- */
- TAILQ_REMOVE(&cand_list, w, cand);
}
} else if (w->cost == LS_INFINITY && d < LS_INFINITY) {
w->cost = d;
+
+ cand_list_add(w);
w->prev = v;
+
calc_next_hop(w, v);
}
- cand_list_add(w);
}
/* cand_list_dump(); */