diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2007-10-11 19:02:48 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2007-10-11 19:02:48 +0000 |
| commit | deb1254f305c711065855299168d55d33b866098 (patch) | |
| tree | 1fa060d968a5621c7675df28433805cb21ea1bb2 /usr.sbin/ospf6d/rde.c | |
| parent | c21299fb858339f872a81938f9e140b59c1f620d (diff) | |
From ospfd:
Bye bye global ospf options. OSPF options are per area (at least the one
flag that we set). So introduce a area_ospf_options() function that will
return the correct flags for each area. This makes stub area support a lot
easier.
Don't check for OSPF_OPTION_E in the parent. OSPF_OPTION_E is per area and
so the parent process has no way to know if it should redistribute or not.
Diffstat (limited to 'usr.sbin/ospf6d/rde.c')
| -rw-r--r-- | usr.sbin/ospf6d/rde.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/ospf6d/rde.c b/usr.sbin/ospf6d/rde.c index 61a0ece00b4..e34c1b268d2 100644 --- a/usr.sbin/ospf6d/rde.c +++ b/usr.sbin/ospf6d/rde.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde.c,v 1.1 2007/10/08 10:44:51 norby Exp $ */ +/* $OpenBSD: rde.c,v 1.2 2007/10/11 19:02:47 claudio Exp $ */ /* * Copyright (c) 2004, 2005 Claudio Jeker <claudio@openbsd.org> @@ -60,7 +60,7 @@ struct lsa *rde_asext_get(struct rroute *); struct lsa *rde_asext_put(struct rroute *); struct lsa *orig_asext_lsa(struct rroute *, u_int16_t); -struct lsa *orig_sum_lsa(struct rt_node *, u_int8_t, int); +struct lsa *orig_sum_lsa(struct rt_node *, struct area *, u_int8_t, int); struct ospfd_conf *rdeconf = NULL, *nconf = NULL; struct imsgbuf *ibuf_ospfe; @@ -1076,7 +1076,7 @@ rde_summary_update(struct rt_node *rte, struct area *area) /* update lsa but only if it was changed */ v = lsa_find(area, type, rte->prefix.s_addr, rde_router_id()); - lsa = orig_sum_lsa(rte, type, rte->invalid); + lsa = orig_sum_lsa(rte, area, type, rte->invalid); lsa_merge(rde_nbr_self(area), lsa, v); if (v == NULL) @@ -1140,7 +1140,7 @@ orig_asext_lsa(struct rroute *rr, u_int16_t age) } struct lsa * -orig_sum_lsa(struct rt_node *rte, u_int8_t type, int invalid) +orig_sum_lsa(struct rt_node *rte, struct area *area, u_int8_t type, int invalid) { struct lsa *lsa; u_int16_t len; |