summaryrefslogtreecommitdiff
path: root/usr.sbin/ospfd
diff options
context:
space:
mode:
authorClaudio Jeker <claudio@cvs.openbsd.org>2007-10-16 21:03:32 +0000
committerClaudio Jeker <claudio@cvs.openbsd.org>2007-10-16 21:03:32 +0000
commit9552110ecc1014f8622dafb62499ff0f1186a77f (patch)
treea198c92163e44f138fa496b5efb961b76e75f4ed /usr.sbin/ospfd
parent5e4c09f28b5a0bee1158e9580567bfa1f3677d98 (diff)
Use v->type insead of v->lsa->hdr.type. Idea came while looking at ospf6d.
OK norby@
Diffstat (limited to 'usr.sbin/ospfd')
-rw-r--r--usr.sbin/ospfd/rde_lsdb.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/ospfd/rde_lsdb.c b/usr.sbin/ospfd/rde_lsdb.c
index 2e3d8c9e2a2..9b494c6cb68 100644
--- a/usr.sbin/ospfd/rde_lsdb.c
+++ b/usr.sbin/ospfd/rde_lsdb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rde_lsdb.c,v 1.38 2007/04/10 13:26:39 claudio Exp $ */
+/* $OpenBSD: rde_lsdb.c,v 1.39 2007/10/16 21:03:31 claudio Exp $ */
/*
* Copyright (c) 2004, 2005 Claudio Jeker <claudio@openbsd.org>
@@ -677,7 +677,7 @@ lsa_merge(struct rde_nbr *nbr, struct lsa *lsa, struct vertex *v)
free(v->lsa);
v->lsa = lsa;
start_spf_timer();
- if (lsa->hdr.type != LSA_TYPE_EXTERNAL)
+ if (v->type != LSA_TYPE_EXTERNAL)
nbr->area->dirty = 1;
/* set correct timeout for reflooding the LSA */
@@ -699,8 +699,8 @@ lsa_remove_invalid_sums(struct area *area)
/* XXX speed me up */
for (v = RB_MIN(lsa_tree, tree); v != NULL; v = nv) {
nv = RB_NEXT(lsa_tree, tree, v);
- if ((v->lsa->hdr.type == LSA_TYPE_SUM_NETWORK ||
- v->lsa->hdr.type == LSA_TYPE_SUM_ROUTER) &&
+ if ((v->type == LSA_TYPE_SUM_NETWORK ||
+ v->type == LSA_TYPE_SUM_ROUTER) &&
v->self && v->cost == LS_INFINITY &&
v->deleted == 0) {
/*