diff options
| author | Stefan Sperling <stsp@cvs.openbsd.org> | 2009-03-08 14:40:12 +0000 |
|---|---|---|
| committer | Stefan Sperling <stsp@cvs.openbsd.org> | 2009-03-08 14:40:12 +0000 |
| commit | 8788b9131f3e6fc259dabae38425c1b059e8914e (patch) | |
| tree | b952e6c3ddd3d28ebad1d32c5f6cdd5e9430d943 | |
| parent | 1984030ac4e071716f812d0bc94fd040499a649b (diff) | |
Remove #ifdef'd code which had a TODO comment essentially asking
"Do we need anything fancy to determine whether *-prefix-LSAs
are self-originated?"
The answer is "No, we don't, see section 4.6 of RFC5340."
ok claudio@
| -rw-r--r-- | usr.sbin/ospf6d/rde_lsdb.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/usr.sbin/ospf6d/rde_lsdb.c b/usr.sbin/ospf6d/rde_lsdb.c index 0257408cb5b..64667616360 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.19 2009/03/07 00:33:13 stsp Exp $ */ +/* $OpenBSD: rde_lsdb.c,v 1.20 2009/03/08 14:40:11 stsp Exp $ */ /* * Copyright (c) 2004, 2005 Claudio Jeker <claudio@openbsd.org> @@ -346,26 +346,13 @@ int lsa_self(struct rde_nbr *nbr, struct lsa *new, struct vertex *v) { struct lsa *dummy; -#if 0 - struct iface *iface; -#endif if (nbr->self) return (0); - if (rde_router_id() == new->hdr.adv_rtr) - goto self; - -#if 0 - /* TODO: Do we need something like this for *-prefix-LSAs? */ - if (ntohs(new->hdr.type) == LSA_TYPE_NETWORK) - LIST_FOREACH(iface, &nbr->area->iface_list, entry) - if (iface->addr.s_addr == new->hdr.ls_id) - goto self; -#endif + if (rde_router_id() != new->hdr.adv_rtr) + return (0); - return (0); -self: if (v == NULL) { /* * LSA is no longer announced, remove by premature aging. |