diff options
| author | Stefan Sperling <stsp@cvs.openbsd.org> | 2009-03-29 19:18:21 +0000 |
|---|---|---|
| committer | Stefan Sperling <stsp@cvs.openbsd.org> | 2009-03-29 19:18:21 +0000 |
| commit | 66f1f2214ce8c2d9ee2fc7bb1d4f7ea55d43c191 (patch) | |
| tree | 8789da074fea4108d7c3f448aa9764c25b5fb080 | |
| parent | 99f776f1d86de81e840cae51ac0bc12686068f81 (diff) | |
Remove lsa_find_net(), it isn't needed for OSPFv3.
pointed out by and ok claudio@
| -rw-r--r-- | usr.sbin/ospf6d/rde.h | 3 | ||||
| -rw-r--r-- | usr.sbin/ospf6d/rde_lsdb.c | 23 |
2 files changed, 2 insertions, 24 deletions
diff --git a/usr.sbin/ospf6d/rde.h b/usr.sbin/ospf6d/rde.h index 5bcb71fe52b..1e42020c72b 100644 --- a/usr.sbin/ospf6d/rde.h +++ b/usr.sbin/ospf6d/rde.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rde.h,v 1.13 2009/03/29 19:14:23 stsp Exp $ */ +/* $OpenBSD: rde.h,v 1.14 2009/03/29 19:18:20 stsp Exp $ */ /* * Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org> @@ -146,7 +146,6 @@ void lsa_del(struct rde_nbr *, struct lsa_hdr *); void lsa_age(struct vertex *); struct vertex *lsa_find(struct iface *, u_int16_t, u_int32_t, u_int32_t); struct vertex *lsa_find_rtr(struct area *, u_int32_t); -struct vertex *lsa_find_net(struct area *area, u_int32_t); struct vertex *lsa_find_tree(struct lsa_tree *, u_int16_t, u_int32_t, u_int32_t); u_int16_t lsa_num_links(struct vertex *); void lsa_snap(struct rde_nbr *, u_int32_t); diff --git a/usr.sbin/ospf6d/rde_lsdb.c b/usr.sbin/ospf6d/rde_lsdb.c index 66ef488b667..f057feb8e1a 100644 --- a/usr.sbin/ospf6d/rde_lsdb.c +++ b/usr.sbin/ospf6d/rde_lsdb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde_lsdb.c,v 1.25 2009/03/29 19:14:23 stsp Exp $ */ +/* $OpenBSD: rde_lsdb.c,v 1.26 2009/03/29 19:18:20 stsp Exp $ */ /* * Copyright (c) 2004, 2005 Claudio Jeker <claudio@openbsd.org> @@ -563,27 +563,6 @@ lsa_find_rtr(struct area *area, u_int32_t rtr_id) return (r); } -struct vertex * -lsa_find_net(struct area *area, u_int32_t ls_id) -{ - struct lsa_tree *tree = &area->lsa_tree; - struct vertex *v; - - /* XXX speed me up */ - RB_FOREACH(v, lsa_tree, tree) { - if (v->lsa->hdr.type == LSA_TYPE_NETWORK && - v->lsa->hdr.ls_id == ls_id) { - /* LSA that are deleted are not findable */ - if (v->deleted) - return (NULL); - lsa_age(v); - return (v); - } - } - - return (NULL); -} - u_int16_t lsa_num_links(struct vertex *v) { |