*: reindentreindent-master-after

indent.py `git ls-files | pcregrep '\.[ch]$' | pcregrep -v '^(ldpd|babeld|nhrpd)/'`

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

1 files changed, 683 insertions, 724 deletions

diff --git a/ospf6d/ospf6_spf.c b/ospf6d/ospf6_spf.c
index 8d2e244c8..86f893bc6 100644
--- a/ospf6d/ospf6_spf.c
+++ b/ospf6d/ospf6_spf.c
@@ -45,721 +45,688 @@
 
 unsigned char conf_debug_ospf6_spf = 0;
 
-static void
-ospf6_spf_copy_nexthops_to_route (struct ospf6_route *rt,
-				  struct ospf6_vertex *v)
+static void ospf6_spf_copy_nexthops_to_route(struct ospf6_route *rt,
+					     struct ospf6_vertex *v)
 {
-  if (rt && v)
-    ospf6_copy_nexthops (rt->nh_list, v->nh_list);
+	if (rt && v)
+		ospf6_copy_nexthops(rt->nh_list, v->nh_list);
 }
 
-static void
-ospf6_spf_merge_nexthops_to_route (struct ospf6_route *rt,
-				   struct ospf6_vertex *v)
+static void ospf6_spf_merge_nexthops_to_route(struct ospf6_route *rt,
+					      struct ospf6_vertex *v)
 {
-  if (rt && v)
-    ospf6_merge_nexthops (rt->nh_list, v->nh_list);
+	if (rt && v)
+		ospf6_merge_nexthops(rt->nh_list, v->nh_list);
 }
 
-static unsigned int
-ospf6_spf_get_ifindex_from_nh (struct ospf6_vertex *v)
+static unsigned int ospf6_spf_get_ifindex_from_nh(struct ospf6_vertex *v)
 {
-  struct ospf6_nexthop *nh;
-  struct listnode *node;
-
-  if (v)
-    {
-      node = listhead(v->nh_list);
-      if (node)
-	{
-	  nh = listgetdata (node);
-	  if (nh)
-	    return (nh->ifindex);
+	struct ospf6_nexthop *nh;
+	struct listnode *node;
+
+	if (v) {
+		node = listhead(v->nh_list);
+		if (node) {
+			nh = listgetdata(node);
+			if (nh)
+				return (nh->ifindex);
+		}
 	}
-    }
-  return 0;
+	return 0;
 }
 
-static int
-ospf6_vertex_cmp (void *a, void *b)
+static int ospf6_vertex_cmp(void *a, void *b)
 {
-  struct ospf6_vertex *va = (struct ospf6_vertex *) a;
-  struct ospf6_vertex *vb = (struct ospf6_vertex *) b;
+	struct ospf6_vertex *va = (struct ospf6_vertex *)a;
+	struct ospf6_vertex *vb = (struct ospf6_vertex *)b;
 
-  /* ascending order */
-  if (va->cost != vb->cost)
-    return (va->cost - vb->cost);
-  return (va->hops - vb->hops);
+	/* ascending order */
+	if (va->cost != vb->cost)
+		return (va->cost - vb->cost);
+	return (va->hops - vb->hops);
 }
 
-static int
-ospf6_vertex_id_cmp (void *a, void *b)
+static int ospf6_vertex_id_cmp(void *a, void *b)
 {
-  struct ospf6_vertex *va = (struct ospf6_vertex *) a;
-  struct ospf6_vertex *vb = (struct ospf6_vertex *) b;
-  int ret = 0;
-
-  ret = ntohl (ospf6_linkstate_prefix_adv_router (&va->vertex_id)) -
-        ntohl (ospf6_linkstate_prefix_adv_router (&vb->vertex_id));
-  if (ret)
-    return ret;
-
-  ret = ntohl (ospf6_linkstate_prefix_id (&va->vertex_id)) -
-        ntohl (ospf6_linkstate_prefix_id (&vb->vertex_id));
-  return ret;
+	struct ospf6_vertex *va = (struct ospf6_vertex *)a;
+	struct ospf6_vertex *vb = (struct ospf6_vertex *)b;
+	int ret = 0;
+
+	ret = ntohl(ospf6_linkstate_prefix_adv_router(&va->vertex_id))
+	      - ntohl(ospf6_linkstate_prefix_adv_router(&vb->vertex_id));
+	if (ret)
+		return ret;
+
+	ret = ntohl(ospf6_linkstate_prefix_id(&va->vertex_id))
+	      - ntohl(ospf6_linkstate_prefix_id(&vb->vertex_id));
+	return ret;
 }
 
-static struct ospf6_vertex *
-ospf6_vertex_create (struct ospf6_lsa *lsa)
+static struct ospf6_vertex *ospf6_vertex_create(struct ospf6_lsa *lsa)
 {
-  struct ospf6_vertex *v;
+	struct ospf6_vertex *v;
 
-  v = (struct ospf6_vertex *)
-    XMALLOC (MTYPE_OSPF6_VERTEX, sizeof (struct ospf6_vertex));
+	v = (struct ospf6_vertex *)XMALLOC(MTYPE_OSPF6_VERTEX,
+					   sizeof(struct ospf6_vertex));
 
-  /* type */
-  if (ntohs (lsa->header->type) == OSPF6_LSTYPE_ROUTER)
-    v->type = OSPF6_VERTEX_TYPE_ROUTER;
-  else if (ntohs (lsa->header->type) == OSPF6_LSTYPE_NETWORK)
-    v->type = OSPF6_VERTEX_TYPE_NETWORK;
-  else
-    assert (0);
+	/* type */
+	if (ntohs(lsa->header->type) == OSPF6_LSTYPE_ROUTER)
+		v->type = OSPF6_VERTEX_TYPE_ROUTER;
+	else if (ntohs(lsa->header->type) == OSPF6_LSTYPE_NETWORK)
+		v->type = OSPF6_VERTEX_TYPE_NETWORK;
+	else
+		assert(0);
 
-  /* vertex_id */
-  ospf6_linkstate_prefix (lsa->header->adv_router, lsa->header->id,
-                          &v->vertex_id);
+	/* vertex_id */
+	ospf6_linkstate_prefix(lsa->header->adv_router, lsa->header->id,
+			       &v->vertex_id);
 
-  /* name */
-  ospf6_linkstate_prefix2str (&v->vertex_id, v->name, sizeof (v->name));
+	/* name */
+	ospf6_linkstate_prefix2str(&v->vertex_id, v->name, sizeof(v->name));
 
-  if (IS_OSPF6_DEBUG_SPF (PROCESS))
-    zlog_debug ("%s: Creating vertex %s of type %s", __func__, v->name,
-		((ntohs (lsa->header->type) == OSPF6_LSTYPE_ROUTER) ? "Router" : "N/W"));
+	if (IS_OSPF6_DEBUG_SPF(PROCESS))
+		zlog_debug("%s: Creating vertex %s of type %s", __func__,
+			   v->name,
+			   ((ntohs(lsa->header->type) == OSPF6_LSTYPE_ROUTER)
+				    ? "Router"
+				    : "N/W"));
 
-  /* Associated LSA */
-  v->lsa = lsa;
+	/* Associated LSA */
+	v->lsa = lsa;
 
-  /* capability bits + options */
-  v->capability = *(u_char *)(OSPF6_LSA_HEADER_END (lsa->header));
-  v->options[0] = *(u_char *)(OSPF6_LSA_HEADER_END (lsa->header) + 1);
-  v->options[1] = *(u_char *)(OSPF6_LSA_HEADER_END (lsa->header) + 2);
-  v->options[2] = *(u_char *)(OSPF6_LSA_HEADER_END (lsa->header) + 3);
+	/* capability bits + options */
+	v->capability = *(u_char *)(OSPF6_LSA_HEADER_END(lsa->header));
+	v->options[0] = *(u_char *)(OSPF6_LSA_HEADER_END(lsa->header) + 1);
+	v->options[1] = *(u_char *)(OSPF6_LSA_HEADER_END(lsa->header) + 2);
+	v->options[2] = *(u_char *)(OSPF6_LSA_HEADER_END(lsa->header) + 3);
 
-  v->nh_list =  list_new();
+	v->nh_list = list_new();
 
-  v->parent = NULL;
-  v->child_list = list_new ();
-  v->child_list->cmp = ospf6_vertex_id_cmp;
+	v->parent = NULL;
+	v->child_list = list_new();
+	v->child_list->cmp = ospf6_vertex_id_cmp;
 
-  return v;
+	return v;
 }
 
-static void
-ospf6_vertex_delete (struct ospf6_vertex *v)
+static void ospf6_vertex_delete(struct ospf6_vertex *v)
 {
-  list_delete(v->nh_list);
-  list_delete (v->child_list);
-  XFREE (MTYPE_OSPF6_VERTEX, v);
+	list_delete(v->nh_list);
+	list_delete(v->child_list);
+	XFREE(MTYPE_OSPF6_VERTEX, v);
 }
 
-static struct ospf6_lsa *
-ospf6_lsdesc_lsa (caddr_t lsdesc, struct ospf6_vertex *v)
+static struct ospf6_lsa *ospf6_lsdesc_lsa(caddr_t lsdesc,
+					  struct ospf6_vertex *v)
 {
-  struct ospf6_lsa *lsa;
-  u_int16_t type = 0;
-  u_int32_t id = 0, adv_router = 0;
-
-  if (VERTEX_IS_TYPE (NETWORK, v))
-    {
-      type = htons (OSPF6_LSTYPE_ROUTER);
-      id = htonl (0);
-      adv_router = NETWORK_LSDESC_GET_NBR_ROUTERID (lsdesc);
-    }
-  else
-    {
-      if (ROUTER_LSDESC_IS_TYPE (POINTTOPOINT, lsdesc))
-        {
-          type = htons (OSPF6_LSTYPE_ROUTER);
-          id = htonl (0);
-          adv_router = ROUTER_LSDESC_GET_NBR_ROUTERID (lsdesc);
-        }
-      else if (ROUTER_LSDESC_IS_TYPE (TRANSIT_NETWORK, lsdesc))
-        {
-          type = htons (OSPF6_LSTYPE_NETWORK);
-          id = htonl (ROUTER_LSDESC_GET_NBR_IFID (lsdesc));
-          adv_router = ROUTER_LSDESC_GET_NBR_ROUTERID (lsdesc);
-        }
-    }
-
-  lsa = ospf6_lsdb_lookup (type, id, adv_router, v->area->lsdb);
-
-  if (IS_OSPF6_DEBUG_SPF (PROCESS))
-    {
-      char ibuf[16], abuf[16];
-      inet_ntop (AF_INET, &id, ibuf, sizeof (ibuf));
-      inet_ntop (AF_INET, &adv_router, abuf, sizeof (abuf));
-      if (lsa)
-        zlog_debug ("  Link to: %s", lsa->name);
-      else
-        zlog_debug ("  Link to: [%s Id:%s Adv:%s] No LSA",
-		    ospf6_lstype_name (type), ibuf, abuf);
-    }
-
-  return lsa;
+	struct ospf6_lsa *lsa;
+	u_int16_t type = 0;
+	u_int32_t id = 0, adv_router = 0;
+
+	if (VERTEX_IS_TYPE(NETWORK, v)) {
+		type = htons(OSPF6_LSTYPE_ROUTER);
+		id = htonl(0);
+		adv_router = NETWORK_LSDESC_GET_NBR_ROUTERID(lsdesc);
+	} else {
+		if (ROUTER_LSDESC_IS_TYPE(POINTTOPOINT, lsdesc)) {
+			type = htons(OSPF6_LSTYPE_ROUTER);
+			id = htonl(0);
+			adv_router = ROUTER_LSDESC_GET_NBR_ROUTERID(lsdesc);
+		} else if (ROUTER_LSDESC_IS_TYPE(TRANSIT_NETWORK, lsdesc)) {
+			type = htons(OSPF6_LSTYPE_NETWORK);
+			id = htonl(ROUTER_LSDESC_GET_NBR_IFID(lsdesc));
+			adv_router = ROUTER_LSDESC_GET_NBR_ROUTERID(lsdesc);
+		}
+	}
+
+	lsa = ospf6_lsdb_lookup(type, id, adv_router, v->area->lsdb);
+
+	if (IS_OSPF6_DEBUG_SPF(PROCESS)) {
+		char ibuf[16], abuf[16];
+		inet_ntop(AF_INET, &id, ibuf, sizeof(ibuf));
+		inet_ntop(AF_INET, &adv_router, abuf, sizeof(abuf));
+		if (lsa)
+			zlog_debug("  Link to: %s", lsa->name);
+		else
+			zlog_debug("  Link to: [%s Id:%s Adv:%s] No LSA",
+				   ospf6_lstype_name(type), ibuf, abuf);
+	}
+
+	return lsa;
 }
 
-static char *
-ospf6_lsdesc_backlink (struct ospf6_lsa *lsa,
-                       caddr_t lsdesc, struct ospf6_vertex *v)
+static char *ospf6_lsdesc_backlink(struct ospf6_lsa *lsa, caddr_t lsdesc,
+				   struct ospf6_vertex *v)
 {
-  caddr_t backlink, found = NULL;
-  int size;
-
-  size = (OSPF6_LSA_IS_TYPE (ROUTER, lsa) ?
-          sizeof (struct ospf6_router_lsdesc) :
-          sizeof (struct ospf6_network_lsdesc));
-  for (backlink = OSPF6_LSA_HEADER_END (lsa->header) + 4;
-       backlink + size <= OSPF6_LSA_END (lsa->header); backlink += size)
-    {
-      assert (! (OSPF6_LSA_IS_TYPE (NETWORK, lsa) &&
-                 VERTEX_IS_TYPE (NETWORK, v)));
-
-      if (OSPF6_LSA_IS_TYPE (NETWORK, lsa) &&
-          NETWORK_LSDESC_GET_NBR_ROUTERID (backlink)
-            == v->lsa->header->adv_router)
-        found = backlink;
-      else if (VERTEX_IS_TYPE (NETWORK, v) &&
-          ROUTER_LSDESC_IS_TYPE (TRANSIT_NETWORK, backlink) &&
-          ROUTER_LSDESC_GET_NBR_ROUTERID (backlink)
-            == v->lsa->header->adv_router &&
-          ROUTER_LSDESC_GET_NBR_IFID (backlink)
-            == ntohl (v->lsa->header->id))
-        found = backlink;
-      else
-        {
-          if (! ROUTER_LSDESC_IS_TYPE (POINTTOPOINT, backlink) ||
-              ! ROUTER_LSDESC_IS_TYPE (POINTTOPOINT, lsdesc))
-            continue;
-          if (ROUTER_LSDESC_GET_NBR_IFID (backlink) !=
-              ROUTER_LSDESC_GET_IFID (lsdesc) ||
-              ROUTER_LSDESC_GET_NBR_IFID (lsdesc) !=
-              ROUTER_LSDESC_GET_IFID (backlink))
-            continue;
-          if (ROUTER_LSDESC_GET_NBR_ROUTERID (backlink) !=
-              v->lsa->header->adv_router ||
-              ROUTER_LSDESC_GET_NBR_ROUTERID (lsdesc) !=
-              lsa->header->adv_router)
-            continue;
-          found = backlink;
-        }
-    }
-
-  if (IS_OSPF6_DEBUG_SPF (PROCESS))
-    zlog_debug ("  Backlink %s", (found ? "OK" : "FAIL"));
-
-  return found;
+	caddr_t backlink, found = NULL;
+	int size;
+
+	size = (OSPF6_LSA_IS_TYPE(ROUTER, lsa)
+			? sizeof(struct ospf6_router_lsdesc)
+			: sizeof(struct ospf6_network_lsdesc));
+	for (backlink = OSPF6_LSA_HEADER_END(lsa->header) + 4;
+	     backlink + size <= OSPF6_LSA_END(lsa->header); backlink += size) {
+		assert(!(OSPF6_LSA_IS_TYPE(NETWORK, lsa)
+			 && VERTEX_IS_TYPE(NETWORK, v)));
+
+		if (OSPF6_LSA_IS_TYPE(NETWORK, lsa)
+		    && NETWORK_LSDESC_GET_NBR_ROUTERID(backlink)
+			       == v->lsa->header->adv_router)
+			found = backlink;
+		else if (VERTEX_IS_TYPE(NETWORK, v)
+			 && ROUTER_LSDESC_IS_TYPE(TRANSIT_NETWORK, backlink)
+			 && ROUTER_LSDESC_GET_NBR_ROUTERID(backlink)
+				    == v->lsa->header->adv_router
+			 && ROUTER_LSDESC_GET_NBR_IFID(backlink)
+				    == ntohl(v->lsa->header->id))
+			found = backlink;
+		else {
+			if (!ROUTER_LSDESC_IS_TYPE(POINTTOPOINT, backlink)
+			    || !ROUTER_LSDESC_IS_TYPE(POINTTOPOINT, lsdesc))
+				continue;
+			if (ROUTER_LSDESC_GET_NBR_IFID(backlink)
+				    != ROUTER_LSDESC_GET_IFID(lsdesc)
+			    || ROUTER_LSDESC_GET_NBR_IFID(lsdesc)
+				       != ROUTER_LSDESC_GET_IFID(backlink))
+				continue;
+			if (ROUTER_LSDESC_GET_NBR_ROUTERID(backlink)
+				    != v->lsa->header->adv_router
+			    || ROUTER_LSDESC_GET_NBR_ROUTERID(lsdesc)
+				       != lsa->header->adv_router)
+				continue;
+			found = backlink;
+		}
+	}
+
+	if (IS_OSPF6_DEBUG_SPF(PROCESS))
+		zlog_debug("  Backlink %s", (found ? "OK" : "FAIL"));
+
+	return found;
 }
 
-static void
-ospf6_nexthop_calc (struct ospf6_vertex *w, struct ospf6_vertex *v,
-                    caddr_t lsdesc)
+static void ospf6_nexthop_calc(struct ospf6_vertex *w, struct ospf6_vertex *v,
+			       caddr_t lsdesc)
 {
-  int i;
-  ifindex_t ifindex;
-  struct ospf6_interface *oi;
-  u_int16_t type;
-  u_int32_t adv_router;
-  struct ospf6_lsa *lsa;
-  struct ospf6_link_lsa *link_lsa;
-  char buf[64];
-
-  assert (VERTEX_IS_TYPE (ROUTER, w));
-  ifindex = (VERTEX_IS_TYPE (NETWORK, v) ? ospf6_spf_get_ifindex_from_nh (v) :
-             ROUTER_LSDESC_GET_IFID (lsdesc));
-  if (ifindex == 0)
-    {
-      zlog_err ("No nexthop ifindex at vertex %s", v->name);
-      return;
-    }
-
-  oi = ospf6_interface_lookup_by_ifindex (ifindex);
-  if (oi == NULL)
-    {
-      if (IS_OSPF6_DEBUG_SPF (PROCESS))
-        zlog_debug ("Can't find interface in SPF: ifindex %d", ifindex);
-      return;
-    }
-
-  type = htons (OSPF6_LSTYPE_LINK);
-  adv_router = (VERTEX_IS_TYPE (NETWORK, v) ?
-                NETWORK_LSDESC_GET_NBR_ROUTERID (lsdesc) :
-                ROUTER_LSDESC_GET_NBR_ROUTERID (lsdesc));
-
-  i = 0;
-  for (ALL_LSDB_TYPED_ADVRTR(oi->lsdb, type, adv_router, lsa))
-    {
-      if (VERTEX_IS_TYPE (ROUTER, v) &&
-          htonl (ROUTER_LSDESC_GET_NBR_IFID (lsdesc)) != lsa->header->id)
-        continue;
-
-      link_lsa = (struct ospf6_link_lsa *) OSPF6_LSA_HEADER_END (lsa->header);
-      if (IS_OSPF6_DEBUG_SPF (PROCESS))
-        {
-          inet_ntop (AF_INET6, &link_lsa->linklocal_addr, buf, sizeof (buf));
-          zlog_debug ("  nexthop %s from %s", buf, lsa->name);
-        }
-
-      ospf6_add_nexthop (w->nh_list, ifindex, &link_lsa->linklocal_addr);
-      i++;
-    }
-
-  if (i == 0 && IS_OSPF6_DEBUG_SPF (PROCESS))
-    zlog_debug ("No nexthop for %s found", w->name);
+	int i;
+	ifindex_t ifindex;
+	struct ospf6_interface *oi;
+	u_int16_t type;
+	u_int32_t adv_router;
+	struct ospf6_lsa *lsa;
+	struct ospf6_link_lsa *link_lsa;
+	char buf[64];
+
+	assert(VERTEX_IS_TYPE(ROUTER, w));
+	ifindex = (VERTEX_IS_TYPE(NETWORK, v) ? ospf6_spf_get_ifindex_from_nh(v)
+					      : ROUTER_LSDESC_GET_IFID(lsdesc));
+	if (ifindex == 0) {
+		zlog_err("No nexthop ifindex at vertex %s", v->name);
+		return;
+	}
+
+	oi = ospf6_interface_lookup_by_ifindex(ifindex);
+	if (oi == NULL) {
+		if (IS_OSPF6_DEBUG_SPF(PROCESS))
+			zlog_debug("Can't find interface in SPF: ifindex %d",
+				   ifindex);
+		return;
+	}
+
+	type = htons(OSPF6_LSTYPE_LINK);
+	adv_router = (VERTEX_IS_TYPE(NETWORK, v)
+			      ? NETWORK_LSDESC_GET_NBR_ROUTERID(lsdesc)
+			      : ROUTER_LSDESC_GET_NBR_ROUTERID(lsdesc));
+
+	i = 0;
+	for (ALL_LSDB_TYPED_ADVRTR(oi->lsdb, type, adv_router, lsa)) {
+		if (VERTEX_IS_TYPE(ROUTER, v)
+		    && htonl(ROUTER_LSDESC_GET_NBR_IFID(lsdesc))
+			       != lsa->header->id)
+			continue;
+
+		link_lsa = (struct ospf6_link_lsa *)OSPF6_LSA_HEADER_END(
+			lsa->header);
+		if (IS_OSPF6_DEBUG_SPF(PROCESS)) {
+			inet_ntop(AF_INET6, &link_lsa->linklocal_addr, buf,
+				  sizeof(buf));
+			zlog_debug("  nexthop %s from %s", buf, lsa->name);
+		}
+
+		ospf6_add_nexthop(w->nh_list, ifindex,
+				  &link_lsa->linklocal_addr);
+		i++;
+	}
+
+	if (i == 0 && IS_OSPF6_DEBUG_SPF(PROCESS))
+		zlog_debug("No nexthop for %s found", w->name);
 }
 
-static int
-ospf6_spf_install (struct ospf6_vertex *v,
-                   struct ospf6_route_table *result_table)
+static int ospf6_spf_install(struct ospf6_vertex *v,
+			     struct ospf6_route_table *result_table)
 {
-  struct ospf6_route *route, *parent_route;
-  struct ospf6_vertex *prev;
-
-  if (IS_OSPF6_DEBUG_SPF (PROCESS))
-    zlog_debug ("SPF install %s hops %d cost %d",
-		v->name, v->hops, v->cost);
-
-  route = ospf6_route_lookup (&v->vertex_id, result_table);
-  if (route && route->path.cost < v->cost)
-    {
-      if (IS_OSPF6_DEBUG_SPF (PROCESS))
-        zlog_debug ("  already installed with lower cost (%d), ignore",
-		    route->path.cost);
-      ospf6_vertex_delete (v);
-      return -1;
-    }
-  else if (route && route->path.cost == v->cost)
-    {
-      if (IS_OSPF6_DEBUG_SPF (PROCESS))
-        zlog_debug ("  another path found, merge");
-
-      ospf6_spf_merge_nexthops_to_route (route, v);
-
-      prev = (struct ospf6_vertex *) route->route_option;
-      assert (prev->hops <= v->hops);
-      ospf6_vertex_delete (v);
-
-      return -1;
-    }
-
-  /* There should be no case where candidate being installed (variable
-     "v") is closer than the one in the SPF tree (variable "route").
-     In the case something has gone wrong with the behavior of
-     Priority-Queue. */
-
-  /* the case where the route exists already is handled and returned
-     up to here. */
-  assert (route == NULL);
-
-  route = ospf6_route_create ();
-  memcpy (&route->prefix, &v->vertex_id, sizeof (struct prefix));
-  route->type = OSPF6_DEST_TYPE_LINKSTATE;
-  route->path.type = OSPF6_PATH_TYPE_INTRA;
-  route->path.origin.type = v->lsa->header->type;
-  route->path.origin.id = v->lsa->header->id;
-  route->path.origin.adv_router = v->lsa->header->adv_router;
-  route->path.metric_type = 1;
-  route->path.cost = v->cost;
-  route->path.u.cost_e2 = v->hops;
-  route->path.router_bits = v->capability;
-  route->path.options[0] = v->options[0];
-  route->path.options[1] = v->options[1];
-  route->path.options[2] = v->options[2];
-
-  ospf6_spf_copy_nexthops_to_route (route, v);
-
-  /*
-   * The SPF logic implementation does not transfer the multipathing properties
-   * of a parent to a child node. Thus if there was a 3-way multipath to a
-   * node's parent and a single hop from the parent to the child, the logic of
-   * creating new vertices and computing next hops prevents there from being 3
-   * paths to the child node. This is primarily because the resolution of
-   * multipath is done in this routine, not in the main spf loop.
-   *
-   * The following logic addresses that problem by merging the parent's nexthop
-   * information with the child's, if the parent is not the root of the tree.
-   * This is based on the assumption that before a node's route is installed,
-   * its parent's route's nexthops have already been installed.
-   */
-  if (v->parent && v->parent->hops)
-    {
-      parent_route = ospf6_route_lookup (&v->parent->vertex_id, result_table);
-      if (parent_route)
-	{
-	  ospf6_route_merge_nexthops (route, parent_route);
+	struct ospf6_route *route, *parent_route;
+	struct ospf6_vertex *prev;
+
+	if (IS_OSPF6_DEBUG_SPF(PROCESS))
+		zlog_debug("SPF install %s hops %d cost %d", v->name, v->hops,
+			   v->cost);
+
+	route = ospf6_route_lookup(&v->vertex_id, result_table);
+	if (route && route->path.cost < v->cost) {
+		if (IS_OSPF6_DEBUG_SPF(PROCESS))
+			zlog_debug(
+				"  already installed with lower cost (%d), ignore",
+				route->path.cost);
+		ospf6_vertex_delete(v);
+		return -1;
+	} else if (route && route->path.cost == v->cost) {
+		if (IS_OSPF6_DEBUG_SPF(PROCESS))
+			zlog_debug("  another path found, merge");
+
+		ospf6_spf_merge_nexthops_to_route(route, v);
+
+		prev = (struct ospf6_vertex *)route->route_option;
+		assert(prev->hops <= v->hops);
+		ospf6_vertex_delete(v);
+
+		return -1;
 	}
-    }
 
-  if (v->parent)
-    listnode_add_sort (v->parent->child_list, v);
-  route->route_option = v;
+	/* There should be no case where candidate being installed (variable
+	   "v") is closer than the one in the SPF tree (variable "route").
+	   In the case something has gone wrong with the behavior of
+	   Priority-Queue. */
+
+	/* the case where the route exists already is handled and returned
+	   up to here. */
+	assert(route == NULL);
+
+	route = ospf6_route_create();
+	memcpy(&route->prefix, &v->vertex_id, sizeof(struct prefix));
+	route->type = OSPF6_DEST_TYPE_LINKSTATE;
+	route->path.type = OSPF6_PATH_TYPE_INTRA;
+	route->path.origin.type = v->lsa->header->type;
+	route->path.origin.id = v->lsa->header->id;
+	route->path.origin.adv_router = v->lsa->header->adv_router;
+	route->path.metric_type = 1;
+	route->path.cost = v->cost;
+	route->path.u.cost_e2 = v->hops;
+	route->path.router_bits = v->capability;
+	route->path.options[0] = v->options[0];
+	route->path.options[1] = v->options[1];
+	route->path.options[2] = v->options[2];
+
+	ospf6_spf_copy_nexthops_to_route(route, v);
+
+	/*
+	 * The SPF logic implementation does not transfer the multipathing
+	 * properties
+	 * of a parent to a child node. Thus if there was a 3-way multipath to a
+	 * node's parent and a single hop from the parent to the child, the
+	 * logic of
+	 * creating new vertices and computing next hops prevents there from
+	 * being 3
+	 * paths to the child node. This is primarily because the resolution of
+	 * multipath is done in this routine, not in the main spf loop.
+	 *
+	 * The following logic addresses that problem by merging the parent's
+	 * nexthop
+	 * information with the child's, if the parent is not the root of the
+	 * tree.
+	 * This is based on the assumption that before a node's route is
+	 * installed,
+	 * its parent's route's nexthops have already been installed.
+	 */
+	if (v->parent && v->parent->hops) {
+		parent_route =
+			ospf6_route_lookup(&v->parent->vertex_id, result_table);
+		if (parent_route) {
+			ospf6_route_merge_nexthops(route, parent_route);
+		}
+	}
+
+	if (v->parent)
+		listnode_add_sort(v->parent->child_list, v);
+	route->route_option = v;
 
-  ospf6_route_add (route, result_table);
-  return 0;
+	ospf6_route_add(route, result_table);
+	return 0;
 }
 
-void
-ospf6_spf_table_finish (struct ospf6_route_table *result_table)
+void ospf6_spf_table_finish(struct ospf6_route_table *result_table)
 {
-  struct ospf6_route *route, *nroute;
-  struct ospf6_vertex *v;
-  for (route = ospf6_route_head (result_table); route;
-       route = nroute)
-    {
-      nroute = ospf6_route_next (route);
-      v = (struct ospf6_vertex *) route->route_option;
-      ospf6_vertex_delete (v);
-      ospf6_route_remove (route, result_table);
-    }
+	struct ospf6_route *route, *nroute;
+	struct ospf6_vertex *v;
+	for (route = ospf6_route_head(result_table); route; route = nroute) {
+		nroute = ospf6_route_next(route);
+		v = (struct ospf6_vertex *)route->route_option;
+		ospf6_vertex_delete(v);
+		ospf6_route_remove(route, result_table);
+	}
 }
 
-static const char *ospf6_spf_reason_str[] =
-  {
-    "R+",
-    "R-",
-    "N+",
-    "N-",
-    "L+",
-    "L-",
-    "R*",
-    "N*",
-  };
-
-void ospf6_spf_reason_string (unsigned int reason, char *buf, int size)
+static const char *ospf6_spf_reason_str[] = {
+	"R+", "R-", "N+", "N-", "L+", "L-", "R*", "N*",
+};
+
+void ospf6_spf_reason_string(unsigned int reason, char *buf, int size)
 {
-  unsigned int bit;
-  int len = 0;
-
-  if (!buf)
-    return;
-
-  for (bit = 0; bit < array_size(ospf6_spf_reason_str); bit++)
-    {
-      if ((reason & (1 << bit)) && (len < size))
-	{
-	  len += snprintf((buf + len), (size - len), "%s%s",
-			  (len > 0) ? ", " : "", ospf6_spf_reason_str[bit]);
+	unsigned int bit;
+	int len = 0;
+
+	if (!buf)
+		return;
+
+	for (bit = 0; bit < array_size(ospf6_spf_reason_str); bit++) {
+		if ((reason & (1 << bit)) && (len < size)) {
+			len += snprintf((buf + len), (size - len), "%s%s",
+					(len > 0) ? ", " : "",
+					ospf6_spf_reason_str[bit]);
+		}
 	}
-    }
 }
 
 /* RFC2328 16.1.  Calculating the shortest-path tree for an area */
 /* RFC2740 3.8.1.  Calculating the shortest path tree for an area */
-void
-ospf6_spf_calculation (u_int32_t router_id,
-                       struct ospf6_route_table *result_table,
-                       struct ospf6_area *oa)
+void ospf6_spf_calculation(u_int32_t router_id,
+			   struct ospf6_route_table *result_table,
+			   struct ospf6_area *oa)
 {
-  struct pqueue *candidate_list;
-  struct ospf6_vertex *root, *v, *w;
-  int size;
-  caddr_t lsdesc;
-  struct ospf6_lsa *lsa;
-  struct in6_addr address;
-
-  ospf6_spf_table_finish (result_table);
-
-  /* Install the calculating router itself as the root of the SPF tree */
-  /* construct root vertex */
-  lsa = ospf6_lsdb_lookup (htons (OSPF6_LSTYPE_ROUTER), htonl (0),
-                           router_id, oa->lsdb_self);
-  if (lsa == NULL)
-    {
-      if (IS_OSPF6_DEBUG_SPF (PROCESS))
-	zlog_debug ("%s: No router LSA for area %s\n",
-		    __func__, oa->name);
-      return;
-    }
-
-  /* initialize */
-  candidate_list = pqueue_create ();
-  candidate_list->cmp = ospf6_vertex_cmp;
-
-  root = ospf6_vertex_create (lsa);
-  root->area = oa;
-  root->cost = 0;
-  root->hops = 0;
-  inet_pton (AF_INET6, "::1", &address);
-
-  /* Actually insert root to the candidate-list as the only candidate */
-  pqueue_enqueue (root, candidate_list);
-
-  /* Iterate until candidate-list becomes empty */
-  while (candidate_list->size)
-    {
-      /* get closest candidate from priority queue */
-      v = pqueue_dequeue (candidate_list);
-
-      /* installing may result in merging or rejecting of the vertex */
-      if (ospf6_spf_install (v, result_table) < 0)
-        continue;
-
-      /* Skip overloaded routers */
-      if ((OSPF6_LSA_IS_TYPE (ROUTER, v->lsa) &&
-	   ospf6_router_is_stub_router (v->lsa)))
-	continue;
-
-      /* For each LS description in the just-added vertex V's LSA */
-      size = (VERTEX_IS_TYPE (ROUTER, v) ?
-              sizeof (struct ospf6_router_lsdesc) :
-              sizeof (struct ospf6_network_lsdesc));
-      for (lsdesc = OSPF6_LSA_HEADER_END (v->lsa->header) + 4;
-           lsdesc + size <= OSPF6_LSA_END (v->lsa->header); lsdesc += size)
-        {
-          lsa = ospf6_lsdesc_lsa (lsdesc, v);
-          if (lsa == NULL)
-            continue;
-
-	  if (OSPF6_LSA_IS_MAXAGE (lsa))
-	    continue;
-
-          if (! ospf6_lsdesc_backlink (lsa, lsdesc, v))
-            continue;
-
-          w = ospf6_vertex_create (lsa);
-          w->area = oa;
-          w->parent = v;
-          if (VERTEX_IS_TYPE (ROUTER, v))
-            {
-              w->cost = v->cost + ROUTER_LSDESC_GET_METRIC (lsdesc);
-              w->hops = v->hops + (VERTEX_IS_TYPE (NETWORK, w) ? 0 : 1);
-            }
-          else /* NETWORK */
-            {
-              w->cost = v->cost;
-              w->hops = v->hops + 1;
-            }
-
-          /* nexthop calculation */
-          if (w->hops == 0)
-	    ospf6_add_nexthop (w->nh_list, ROUTER_LSDESC_GET_IFID (lsdesc), NULL);
-          else if (w->hops == 1 && v->hops == 0)
-            ospf6_nexthop_calc (w, v, lsdesc);
-          else
-            {
-	      ospf6_copy_nexthops (w->nh_list, v->nh_list);
-            }
-
-          /* add new candidate to the candidate_list */
-          if (IS_OSPF6_DEBUG_SPF (PROCESS))
-            zlog_debug ("  New candidate: %s hops %d cost %d",
-			w->name, w->hops, w->cost);
-          pqueue_enqueue (w, candidate_list);
-        }
-    }
-
-  pqueue_delete (candidate_list);
-
-  oa->spf_calculation++;
+	struct pqueue *candidate_list;
+	struct ospf6_vertex *root, *v, *w;
+	int size;
+	caddr_t lsdesc;
+	struct ospf6_lsa *lsa;
+	struct in6_addr address;
+
+	ospf6_spf_table_finish(result_table);
+
+	/* Install the calculating router itself as the root of the SPF tree */
+	/* construct root vertex */
+	lsa = ospf6_lsdb_lookup(htons(OSPF6_LSTYPE_ROUTER), htonl(0), router_id,
+				oa->lsdb_self);
+	if (lsa == NULL) {
+		if (IS_OSPF6_DEBUG_SPF(PROCESS))
+			zlog_debug("%s: No router LSA for area %s\n", __func__,
+				   oa->name);
+		return;
+	}
+
+	/* initialize */
+	candidate_list = pqueue_create();
+	candidate_list->cmp = ospf6_vertex_cmp;
+
+	root = ospf6_vertex_create(lsa);
+	root->area = oa;
+	root->cost = 0;
+	root->hops = 0;
+	inet_pton(AF_INET6, "::1", &address);
+
+	/* Actually insert root to the candidate-list as the only candidate */
+	pqueue_enqueue(root, candidate_list);
+
+	/* Iterate until candidate-list becomes empty */
+	while (candidate_list->size) {
+		/* get closest candidate from priority queue */
+		v = pqueue_dequeue(candidate_list);
+
+		/* installing may result in merging or rejecting of the vertex
+		 */
+		if (ospf6_spf_install(v, result_table) < 0)
+			continue;
+
+		/* Skip overloaded routers */
+		if ((OSPF6_LSA_IS_TYPE(ROUTER, v->lsa)
+		     && ospf6_router_is_stub_router(v->lsa)))
+			continue;
+
+		/* For each LS description in the just-added vertex V's LSA */
+		size = (VERTEX_IS_TYPE(ROUTER, v)
+				? sizeof(struct ospf6_router_lsdesc)
+				: sizeof(struct ospf6_network_lsdesc));
+		for (lsdesc = OSPF6_LSA_HEADER_END(v->lsa->header) + 4;
+		     lsdesc + size <= OSPF6_LSA_END(v->lsa->header);
+		     lsdesc += size) {
+			lsa = ospf6_lsdesc_lsa(lsdesc, v);
+			if (lsa == NULL)
+				continue;
+
+			if (OSPF6_LSA_IS_MAXAGE(lsa))
+				continue;
+
+			if (!ospf6_lsdesc_backlink(lsa, lsdesc, v))
+				continue;
+
+			w = ospf6_vertex_create(lsa);
+			w->area = oa;
+			w->parent = v;
+			if (VERTEX_IS_TYPE(ROUTER, v)) {
+				w->cost = v->cost
+					  + ROUTER_LSDESC_GET_METRIC(lsdesc);
+				w->hops =
+					v->hops
+					+ (VERTEX_IS_TYPE(NETWORK, w) ? 0 : 1);
+			} else /* NETWORK */
+			{
+				w->cost = v->cost;
+				w->hops = v->hops + 1;
+			}
+
+			/* nexthop calculation */
+			if (w->hops == 0)
+				ospf6_add_nexthop(
+					w->nh_list,
+					ROUTER_LSDESC_GET_IFID(lsdesc), NULL);
+			else if (w->hops == 1 && v->hops == 0)
+				ospf6_nexthop_calc(w, v, lsdesc);
+			else {
+				ospf6_copy_nexthops(w->nh_list, v->nh_list);
+			}
+
+			/* add new candidate to the candidate_list */
+			if (IS_OSPF6_DEBUG_SPF(PROCESS))
+				zlog_debug(
+					"  New candidate: %s hops %d cost %d",
+					w->name, w->hops, w->cost);
+			pqueue_enqueue(w, candidate_list);
+		}
+	}
+
+	pqueue_delete(candidate_list);
+
+	oa->spf_calculation++;
 }
 
-static void
-ospf6_spf_log_database (struct ospf6_area *oa)
+static void ospf6_spf_log_database(struct ospf6_area *oa)
 {
-  char *p, *end, buffer[256];
-  struct listnode *node;
-  struct ospf6_interface *oi;
-
-  p = buffer;
-  end = buffer + sizeof (buffer);
-
-  snprintf (p, end - p, "SPF on DB (#LSAs):");
-  p = (buffer + strlen (buffer) < end ? buffer + strlen (buffer) : end);
-  snprintf (p, end - p, " Area %s: %d", oa->name, oa->lsdb->count);
-  p = (buffer + strlen (buffer) < end ? buffer + strlen (buffer) : end);
-
-  for (ALL_LIST_ELEMENTS_RO (oa->if_list, node, oi))
-    {
-      snprintf (p, end - p, " I/F %s: %d",
-                oi->interface->name, oi->lsdb->count);
-      p = (buffer + strlen (buffer) < end ? buffer + strlen (buffer) : end);
-    }
-
-  zlog_debug ("%s", buffer);
+	char *p, *end, buffer[256];
+	struct listnode *node;
+	struct ospf6_interface *oi;
+
+	p = buffer;
+	end = buffer + sizeof(buffer);
+
+	snprintf(p, end - p, "SPF on DB (#LSAs):");
+	p = (buffer + strlen(buffer) < end ? buffer + strlen(buffer) : end);
+	snprintf(p, end - p, " Area %s: %d", oa->name, oa->lsdb->count);
+	p = (buffer + strlen(buffer) < end ? buffer + strlen(buffer) : end);
+
+	for (ALL_LIST_ELEMENTS_RO(oa->if_list, node, oi)) {
+		snprintf(p, end - p, " I/F %s: %d", oi->interface->name,
+			 oi->lsdb->count);
+		p = (buffer + strlen(buffer) < end ? buffer + strlen(buffer)
+						   : end);
+	}
+
+	zlog_debug("%s", buffer);
 }
 
-static int
-ospf6_spf_calculation_thread (struct thread *t)
+static int ospf6_spf_calculation_thread(struct thread *t)
 {
-  struct ospf6_area *oa;
-  struct ospf6 *ospf6;
-  struct timeval start, end, runtime;
-  struct listnode *node;
-  int areas_processed = 0;
-  char rbuf[32];
-
-  ospf6 = (struct ospf6 *)THREAD_ARG (t);
-  ospf6->t_spf_calc = NULL;
-
-  /* execute SPF calculation */
-  monotime(&start);
-
-  if (ospf6_is_router_abr (ospf6))
-    ospf6_abr_range_reset_cost (ospf6);
-
-  for (ALL_LIST_ELEMENTS_RO(ospf6->area_list, node, oa))
-    {
-
-      if (oa == ospf6->backbone)
-	continue;
-
-      if (IS_OSPF6_DEBUG_SPF (PROCESS))
-	zlog_debug ("SPF calculation for Area %s", oa->name);
-      if (IS_OSPF6_DEBUG_SPF (DATABASE))
-	ospf6_spf_log_database (oa);
-
-      ospf6_spf_calculation (ospf6->router_id, oa->spf_table, oa);
-      ospf6_intra_route_calculation (oa);
-      ospf6_intra_brouter_calculation (oa);
-
-      areas_processed++;
-    }
-
-  if (ospf6->backbone)
-    {
-      if (IS_OSPF6_DEBUG_SPF (PROCESS))
-	zlog_debug ("SPF calculation for Backbone area %s",
-		    ospf6->backbone->name);
-      if (IS_OSPF6_DEBUG_SPF (DATABASE))
-	ospf6_spf_log_database(ospf6->backbone);
-
-      ospf6_spf_calculation(ospf6->router_id, ospf6->backbone->spf_table,
-			    ospf6->backbone);
-      ospf6_intra_route_calculation(ospf6->backbone);
-      ospf6_intra_brouter_calculation(ospf6->backbone);
-      areas_processed++;
-    }
-
-  if (ospf6_is_router_abr (ospf6))
-    ospf6_abr_defaults_to_stub (ospf6);
-
-  monotime(&end);
-  timersub (&end, &start, &runtime);
-
-  ospf6->ts_spf_duration = runtime;
-
-  ospf6_spf_reason_string(ospf6->spf_reason, rbuf, sizeof(rbuf));
-
-  if (IS_OSPF6_DEBUG_SPF (PROCESS) || IS_OSPF6_DEBUG_SPF (TIME))
-    zlog_debug ("SPF runtime: %lld sec %lld usec",
-		(long long)runtime.tv_sec, (long long)runtime.tv_usec);
-
-  zlog_info("SPF processing: # Areas: %d, SPF runtime: %lld sec %lld usec, "
-	    "Reason: %s\n", areas_processed,
-	    (long long)runtime.tv_sec, (long long)runtime.tv_usec,
-	    rbuf);
-  ospf6->last_spf_reason = ospf6->spf_reason;
-  ospf6_reset_spf_reason(ospf6);
-  return 0;
+	struct ospf6_area *oa;
+	struct ospf6 *ospf6;
+	struct timeval start, end, runtime;
+	struct listnode *node;
+	int areas_processed = 0;
+	char rbuf[32];
+
+	ospf6 = (struct ospf6 *)THREAD_ARG(t);
+	ospf6->t_spf_calc = NULL;
+
+	/* execute SPF calculation */
+	monotime(&start);
+
+	if (ospf6_is_router_abr(ospf6))
+		ospf6_abr_range_reset_cost(ospf6);
+
+	for (ALL_LIST_ELEMENTS_RO(ospf6->area_list, node, oa)) {
+
+		if (oa == ospf6->backbone)
+			continue;
+
+		if (IS_OSPF6_DEBUG_SPF(PROCESS))
+			zlog_debug("SPF calculation for Area %s", oa->name);
+		if (IS_OSPF6_DEBUG_SPF(DATABASE))
+			ospf6_spf_log_database(oa);
+
+		ospf6_spf_calculation(ospf6->router_id, oa->spf_table, oa);
+		ospf6_intra_route_calculation(oa);
+		ospf6_intra_brouter_calculation(oa);
+
+		areas_processed++;
+	}
+
+	if (ospf6->backbone) {
+		if (IS_OSPF6_DEBUG_SPF(PROCESS))
+			zlog_debug("SPF calculation for Backbone area %s",
+				   ospf6->backbone->name);
+		if (IS_OSPF6_DEBUG_SPF(DATABASE))
+			ospf6_spf_log_database(ospf6->backbone);
+
+		ospf6_spf_calculation(ospf6->router_id,
+				      ospf6->backbone->spf_table,
+				      ospf6->backbone);
+		ospf6_intra_route_calculation(ospf6->backbone);
+		ospf6_intra_brouter_calculation(ospf6->backbone);
+		areas_processed++;
+	}
+
+	if (ospf6_is_router_abr(ospf6))
+		ospf6_abr_defaults_to_stub(ospf6);
+
+	monotime(&end);
+	timersub(&end, &start, &runtime);
+
+	ospf6->ts_spf_duration = runtime;
+
+	ospf6_spf_reason_string(ospf6->spf_reason, rbuf, sizeof(rbuf));
+
+	if (IS_OSPF6_DEBUG_SPF(PROCESS) || IS_OSPF6_DEBUG_SPF(TIME))
+		zlog_debug("SPF runtime: %lld sec %lld usec",
+			   (long long)runtime.tv_sec,
+			   (long long)runtime.tv_usec);
+
+	zlog_info(
+		"SPF processing: # Areas: %d, SPF runtime: %lld sec %lld usec, "
+		"Reason: %s\n",
+		areas_processed, (long long)runtime.tv_sec,
+		(long long)runtime.tv_usec, rbuf);
+	ospf6->last_spf_reason = ospf6->spf_reason;
+	ospf6_reset_spf_reason(ospf6);
+	return 0;
 }
 
 /* Add schedule for SPF calculation.  To avoid frequenst SPF calc, we
    set timer for SPF calc. */
-void
-ospf6_spf_schedule (struct ospf6 *ospf6, unsigned int reason)
+void ospf6_spf_schedule(struct ospf6 *ospf6, unsigned int reason)
 {
-  unsigned long delay, elapsed, ht;
-
-  ospf6_set_spf_reason(ospf6, reason);
-
-  if (IS_OSPF6_DEBUG_SPF(PROCESS) || IS_OSPF6_DEBUG_SPF (TIME))
-    {
-      char rbuf[32];
-      ospf6_spf_reason_string(reason, rbuf, sizeof(rbuf));
-      zlog_debug ("SPF: calculation timer scheduled (reason %s)", rbuf);
-    }
-
-  /* OSPF instance does not exist. */
-  if (ospf6 == NULL)
-    return;
-
-  /* SPF calculation timer is already scheduled. */
-  if (ospf6->t_spf_calc)
-    {
-      if (IS_OSPF6_DEBUG_SPF(PROCESS) || IS_OSPF6_DEBUG_SPF (TIME))
-        zlog_debug ("SPF: calculation timer is already scheduled: %p",
-                    (void *)ospf6->t_spf_calc);
-      return;
-    }
-
-  elapsed = monotime_since(&ospf6->ts_spf, NULL) / 1000LL;
-  ht = ospf6->spf_holdtime * ospf6->spf_hold_multiplier;
-
-  if (ht > ospf6->spf_max_holdtime)
-    ht = ospf6->spf_max_holdtime;
-
-  /* Get SPF calculation delay time. */
-  if (elapsed < ht)
-    {
-      /* Got an event within the hold time of last SPF. We need to
-       * increase the hold_multiplier, if it's not already at/past
-       * maximum value, and wasn't already increased..
-       */
-      if (ht < ospf6->spf_max_holdtime)
-        ospf6->spf_hold_multiplier++;
-
-      /* always honour the SPF initial delay */
-      if ( (ht - elapsed) < ospf6->spf_delay)
-        delay = ospf6->spf_delay;
-      else
-        delay = ht - elapsed;
-    }
-  else
-    {
-      /* Event is past required hold-time of last SPF */
-      delay = ospf6->spf_delay;
-      ospf6->spf_hold_multiplier = 1;
-    }
-
-  if (IS_OSPF6_DEBUG_SPF(PROCESS) || IS_OSPF6_DEBUG_SPF (TIME))
-    zlog_debug ("SPF: calculation timer delay = %ld", delay);
-
-  zlog_info ("SPF: Scheduled in %ld msec", delay);
-
-  ospf6->t_spf_calc = NULL;
-  thread_add_timer_msec(master, ospf6_spf_calculation_thread, ospf6, delay,
-                        &ospf6->t_spf_calc);
+	unsigned long delay, elapsed, ht;
+
+	ospf6_set_spf_reason(ospf6, reason);
+
+	if (IS_OSPF6_DEBUG_SPF(PROCESS) || IS_OSPF6_DEBUG_SPF(TIME)) {
+		char rbuf[32];
+		ospf6_spf_reason_string(reason, rbuf, sizeof(rbuf));
+		zlog_debug("SPF: calculation timer scheduled (reason %s)",
+			   rbuf);
+	}
+
+	/* OSPF instance does not exist. */
+	if (ospf6 == NULL)
+		return;
+
+	/* SPF calculation timer is already scheduled. */
+	if (ospf6->t_spf_calc) {
+		if (IS_OSPF6_DEBUG_SPF(PROCESS) || IS_OSPF6_DEBUG_SPF(TIME))
+			zlog_debug(
+				"SPF: calculation timer is already scheduled: %p",
+				(void *)ospf6->t_spf_calc);
+		return;
+	}
+
+	elapsed = monotime_since(&ospf6->ts_spf, NULL) / 1000LL;
+	ht = ospf6->spf_holdtime * ospf6->spf_hold_multiplier;
+
+	if (ht > ospf6->spf_max_holdtime)
+		ht = ospf6->spf_max_holdtime;
+
+	/* Get SPF calculation delay time. */
+	if (elapsed < ht) {
+		/* Got an event within the hold time of last SPF. We need to
+		 * increase the hold_multiplier, if it's not already at/past
+		 * maximum value, and wasn't already increased..
+		 */
+		if (ht < ospf6->spf_max_holdtime)
+			ospf6->spf_hold_multiplier++;
+
+		/* always honour the SPF initial delay */
+		if ((ht - elapsed) < ospf6->spf_delay)
+			delay = ospf6->spf_delay;
+		else
+			delay = ht - elapsed;
+	} else {
+		/* Event is past required hold-time of last SPF */
+		delay = ospf6->spf_delay;
+		ospf6->spf_hold_multiplier = 1;
+	}
+
+	if (IS_OSPF6_DEBUG_SPF(PROCESS) || IS_OSPF6_DEBUG_SPF(TIME))
+		zlog_debug("SPF: calculation timer delay = %ld", delay);
+
+	zlog_info("SPF: Scheduled in %ld msec", delay);
+
+	ospf6->t_spf_calc = NULL;
+	thread_add_timer_msec(master, ospf6_spf_calculation_thread, ospf6,
+			      delay, &ospf6->t_spf_calc);
 }
 
-void
-ospf6_spf_display_subtree (struct vty *vty, const char *prefix, int rest,
-                           struct ospf6_vertex *v)
+void ospf6_spf_display_subtree(struct vty *vty, const char *prefix, int rest,
+			       struct ospf6_vertex *v)
 {
-  struct listnode *node, *nnode;
-  struct ospf6_vertex *c;
-  char *next_prefix;
-  int len;
-  int restnum;
-
-  /* "prefix" is the space prefix of the display line */
-  vty_out (vty, "%s+-%s [%d]\n", prefix, v->name, v->cost);
-
-  len = strlen (prefix) + 4;
-  next_prefix = (char *) malloc (len);
-  if (next_prefix == NULL)
-    {
-      vty_out (vty, "malloc failed\n");
-      return;
-    }
-  snprintf (next_prefix, len, "%s%s", prefix, (rest ? "|  " : "   "));
-
-  restnum = listcount (v->child_list);
-  for (ALL_LIST_ELEMENTS (v->child_list, node, nnode, c))
-    {
-      restnum--;
-      ospf6_spf_display_subtree (vty, next_prefix, restnum, c);
-    }
-
-  free (next_prefix);
+	struct listnode *node, *nnode;
+	struct ospf6_vertex *c;
+	char *next_prefix;
+	int len;
+	int restnum;
+
+	/* "prefix" is the space prefix of the display line */
+	vty_out(vty, "%s+-%s [%d]\n", prefix, v->name, v->cost);
+
+	len = strlen(prefix) + 4;
+	next_prefix = (char *)malloc(len);
+	if (next_prefix == NULL) {
+		vty_out(vty, "malloc failed\n");
+		return;
+	}
+	snprintf(next_prefix, len, "%s%s", prefix, (rest ? "|  " : "   "));
+
+	restnum = listcount(v->child_list);
+	for (ALL_LIST_ELEMENTS(v->child_list, node, nnode, c)) {
+		restnum--;
+		ospf6_spf_display_subtree(vty, next_prefix, restnum, c);
+	}
+
+	free(next_prefix);
 }
 
 DEFUN (debug_ospf6_spf_process,
@@ -771,10 +738,10 @@ DEFUN (debug_ospf6_spf_process,
        "Debug Detailed SPF Process\n"
       )
 {
-  unsigned char level = 0;
-  level = OSPF6_DEBUG_SPF_PROCESS;
-  OSPF6_DEBUG_SPF_ON (level);
-  return CMD_SUCCESS;
+	unsigned char level = 0;
+	level = OSPF6_DEBUG_SPF_PROCESS;
+	OSPF6_DEBUG_SPF_ON(level);
+	return CMD_SUCCESS;
 }
 
 DEFUN (debug_ospf6_spf_time,
@@ -786,10 +753,10 @@ DEFUN (debug_ospf6_spf_time,
        "Measure time taken by SPF Calculation\n"
       )
 {
-  unsigned char level = 0;
-  level = OSPF6_DEBUG_SPF_TIME;
-  OSPF6_DEBUG_SPF_ON (level);
-  return CMD_SUCCESS;
+	unsigned char level = 0;
+	level = OSPF6_DEBUG_SPF_TIME;
+	OSPF6_DEBUG_SPF_ON(level);
+	return CMD_SUCCESS;
 }
 
 DEFUN (debug_ospf6_spf_database,
@@ -801,10 +768,10 @@ DEFUN (debug_ospf6_spf_database,
        "Log number of LSAs at SPF Calculation time\n"
       )
 {
-  unsigned char level = 0;
-  level = OSPF6_DEBUG_SPF_DATABASE;
-  OSPF6_DEBUG_SPF_ON (level);
-  return CMD_SUCCESS;
+	unsigned char level = 0;
+	level = OSPF6_DEBUG_SPF_DATABASE;
+	OSPF6_DEBUG_SPF_ON(level);
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_debug_ospf6_spf_process,
@@ -817,10 +784,10 @@ DEFUN (no_debug_ospf6_spf_process,
        "Quit Debugging Detailed SPF Process\n"
       )
 {
-  unsigned char level = 0;
-  level = OSPF6_DEBUG_SPF_PROCESS;
-  OSPF6_DEBUG_SPF_OFF (level);
-  return CMD_SUCCESS;
+	unsigned char level = 0;
+	level = OSPF6_DEBUG_SPF_PROCESS;
+	OSPF6_DEBUG_SPF_OFF(level);
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_debug_ospf6_spf_time,
@@ -833,10 +800,10 @@ DEFUN (no_debug_ospf6_spf_time,
        "Quit Measuring time taken by SPF Calculation\n"
       )
 {
-  unsigned char level = 0;
-  level = OSPF6_DEBUG_SPF_TIME;
-  OSPF6_DEBUG_SPF_OFF (level);
-  return CMD_SUCCESS;
+	unsigned char level = 0;
+	level = OSPF6_DEBUG_SPF_TIME;
+	OSPF6_DEBUG_SPF_OFF(level);
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_debug_ospf6_spf_database,
@@ -849,24 +816,22 @@ DEFUN (no_debug_ospf6_spf_database,
        "Quit Logging number of LSAs at SPF Calculation time\n"
       )
 {
-  unsigned char level = 0;
-  level = OSPF6_DEBUG_SPF_DATABASE;
-  OSPF6_DEBUG_SPF_OFF (level);
-  return CMD_SUCCESS;
+	unsigned char level = 0;
+	level = OSPF6_DEBUG_SPF_DATABASE;
+	OSPF6_DEBUG_SPF_OFF(level);
+	return CMD_SUCCESS;
 }
 
-static int
-ospf6_timers_spf_set (struct vty *vty, unsigned int delay,
-                     unsigned int hold,
-                     unsigned int max)
+static int ospf6_timers_spf_set(struct vty *vty, unsigned int delay,
+				unsigned int hold, unsigned int max)
 {
-  VTY_DECLVAR_CONTEXT(ospf6, ospf);
+	VTY_DECLVAR_CONTEXT(ospf6, ospf);
 
-  ospf->spf_delay = delay;
-  ospf->spf_holdtime = hold;
-  ospf->spf_max_holdtime = max;
+	ospf->spf_delay = delay;
+	ospf->spf_holdtime = hold;
+	ospf->spf_max_holdtime = max;
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (ospf6_timers_throttle_spf,
@@ -879,16 +844,16 @@ DEFUN (ospf6_timers_throttle_spf,
        "Initial hold time (msec) between consecutive SPF calculations\n"
        "Maximum hold time (msec)\n")
 {
-  int idx_number = 3;
-  int idx_number_2 = 4;
-  int idx_number_3 = 5;
-  unsigned int delay, hold, max;
+	int idx_number = 3;
+	int idx_number_2 = 4;
+	int idx_number_3 = 5;
+	unsigned int delay, hold, max;
 
-  delay = strtoul(argv[idx_number]->arg, NULL, 10);
-  hold = strtoul(argv[idx_number_2]->arg, NULL, 10);
-  max = strtoul(argv[idx_number_3]->arg, NULL, 10);
+	delay = strtoul(argv[idx_number]->arg, NULL, 10);
+	hold = strtoul(argv[idx_number_2]->arg, NULL, 10);
+	max = strtoul(argv[idx_number_3]->arg, NULL, 10);
 
-  return ospf6_timers_spf_set (vty, delay, hold, max);
+	return ospf6_timers_spf_set(vty, delay, hold, max);
 }
 
 DEFUN (no_ospf6_timers_throttle_spf,
@@ -902,58 +867,52 @@ DEFUN (no_ospf6_timers_throttle_spf,
        "Initial hold time (msec) between consecutive SPF calculations\n"
        "Maximum hold time (msec)\n")
 {
-  return ospf6_timers_spf_set (vty,
-                              OSPF_SPF_DELAY_DEFAULT,
-                              OSPF_SPF_HOLDTIME_DEFAULT,
-                              OSPF_SPF_MAX_HOLDTIME_DEFAULT);
+	return ospf6_timers_spf_set(vty, OSPF_SPF_DELAY_DEFAULT,
+				    OSPF_SPF_HOLDTIME_DEFAULT,
+				    OSPF_SPF_MAX_HOLDTIME_DEFAULT);
 }
 
 
-int
-config_write_ospf6_debug_spf (struct vty *vty)
+int config_write_ospf6_debug_spf(struct vty *vty)
 {
-  if (IS_OSPF6_DEBUG_SPF (PROCESS))
-    vty_out (vty, "debug ospf6 spf process\n");
-  if (IS_OSPF6_DEBUG_SPF (TIME))
-    vty_out (vty, "debug ospf6 spf time\n");
-  if (IS_OSPF6_DEBUG_SPF (DATABASE))
-    vty_out (vty, "debug ospf6 spf database\n");
-  return 0;
+	if (IS_OSPF6_DEBUG_SPF(PROCESS))
+		vty_out(vty, "debug ospf6 spf process\n");
+	if (IS_OSPF6_DEBUG_SPF(TIME))
+		vty_out(vty, "debug ospf6 spf time\n");
+	if (IS_OSPF6_DEBUG_SPF(DATABASE))
+		vty_out(vty, "debug ospf6 spf database\n");
+	return 0;
 }
 
-void
-ospf6_spf_config_write (struct vty *vty)
+void ospf6_spf_config_write(struct vty *vty)
 {
 
-  if (ospf6->spf_delay != OSPF_SPF_DELAY_DEFAULT ||
-      ospf6->spf_holdtime != OSPF_SPF_HOLDTIME_DEFAULT ||
-      ospf6->spf_max_holdtime != OSPF_SPF_MAX_HOLDTIME_DEFAULT)
-    vty_out (vty, " timers throttle spf %d %d %d\n",
-	     ospf6->spf_delay, ospf6->spf_holdtime,
-	     ospf6->spf_max_holdtime);
-
+	if (ospf6->spf_delay != OSPF_SPF_DELAY_DEFAULT
+	    || ospf6->spf_holdtime != OSPF_SPF_HOLDTIME_DEFAULT
+	    || ospf6->spf_max_holdtime != OSPF_SPF_MAX_HOLDTIME_DEFAULT)
+		vty_out(vty, " timers throttle spf %d %d %d\n",
+			ospf6->spf_delay, ospf6->spf_holdtime,
+			ospf6->spf_max_holdtime);
 }
 
-void
-install_element_ospf6_debug_spf (void)
+void install_element_ospf6_debug_spf(void)
 {
-  install_element (ENABLE_NODE, &debug_ospf6_spf_process_cmd);
-  install_element (ENABLE_NODE, &debug_ospf6_spf_time_cmd);
-  install_element (ENABLE_NODE, &debug_ospf6_spf_database_cmd);
-  install_element (ENABLE_NODE, &no_debug_ospf6_spf_process_cmd);
-  install_element (ENABLE_NODE, &no_debug_ospf6_spf_time_cmd);
-  install_element (ENABLE_NODE, &no_debug_ospf6_spf_database_cmd);
-  install_element (CONFIG_NODE, &debug_ospf6_spf_process_cmd);
-  install_element (CONFIG_NODE, &debug_ospf6_spf_time_cmd);
-  install_element (CONFIG_NODE, &debug_ospf6_spf_database_cmd);
-  install_element (CONFIG_NODE, &no_debug_ospf6_spf_process_cmd);
-  install_element (CONFIG_NODE, &no_debug_ospf6_spf_time_cmd);
-  install_element (CONFIG_NODE, &no_debug_ospf6_spf_database_cmd);
+	install_element(ENABLE_NODE, &debug_ospf6_spf_process_cmd);
+	install_element(ENABLE_NODE, &debug_ospf6_spf_time_cmd);
+	install_element(ENABLE_NODE, &debug_ospf6_spf_database_cmd);
+	install_element(ENABLE_NODE, &no_debug_ospf6_spf_process_cmd);
+	install_element(ENABLE_NODE, &no_debug_ospf6_spf_time_cmd);
+	install_element(ENABLE_NODE, &no_debug_ospf6_spf_database_cmd);
+	install_element(CONFIG_NODE, &debug_ospf6_spf_process_cmd);
+	install_element(CONFIG_NODE, &debug_ospf6_spf_time_cmd);
+	install_element(CONFIG_NODE, &debug_ospf6_spf_database_cmd);
+	install_element(CONFIG_NODE, &no_debug_ospf6_spf_process_cmd);
+	install_element(CONFIG_NODE, &no_debug_ospf6_spf_time_cmd);
+	install_element(CONFIG_NODE, &no_debug_ospf6_spf_database_cmd);
 }
 
-void
-ospf6_spf_init (void)
+void ospf6_spf_init(void)
 {
-  install_element (OSPF6_NODE, &ospf6_timers_throttle_spf_cmd);
-  install_element (OSPF6_NODE, &no_ospf6_timers_throttle_spf_cmd);
+	install_element(OSPF6_NODE, &ospf6_timers_throttle_spf_cmd);
+	install_element(OSPF6_NODE, &no_ospf6_timers_throttle_spf_cmd);
 }