diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2009-09-04 11:06:51 +0200 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2009-09-04 11:06:51 +0200 |
| commit | f9c799a00e705b1420b214628c2bb2a30bf491d9 (patch) | |
| tree | 23386935f0128d31acab5f86da41774cac0a4de5 /proto/ospf/topology.c | |
| parent | d2ceaf4ec82837239a35ace00399ce3aa845849e (diff) | |
| download | bird-f9c799a00e705b1420b214628c2bb2a30bf491d9.tar bird-f9c799a00e705b1420b214628c2bb2a30bf491d9.zip | |
Temporary OSPFv3 development commit (changing multicast support).
Diffstat (limited to 'proto/ospf/topology.c')
| -rw-r--r-- | proto/ospf/topology.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/proto/ospf/topology.c b/proto/ospf/topology.c index 8263010..8f64c4c 100644 --- a/proto/ospf/topology.c +++ b/proto/ospf/topology.c @@ -174,7 +174,7 @@ originate_rt_lsa_body(struct ospf_area *oa, u16 *length) ASSERT(po->lsab_used == 0); rt = lsab_allocz(po, sizeof(struct ospf_lsa_rt)); - rt->options = 0 + rt->options = 0; if (po->areano > 1) rt->options |= OPT_RT_B; @@ -445,7 +445,9 @@ update_rt_lsa(struct ospf_area *oa) */ originate_rt_lsa(oa); +#ifdef OSPFv3 originate_prefix_rt_lsa(oa); +#endif schedule_rtcalc(po); oa->origrt = 0; @@ -577,12 +579,16 @@ update_net_lsa(struct ospf_iface *ifa) if ((ifa->state != OSPF_IS_DR) || (ifa->fadj == 0)) { flush_net_lsa(ifa); +#ifdef OSPFv3 flush_prefix_net_lsa(ifa); +#endif } else { originate_net_lsa(ifa); +#ifdef OSPFv3 originate_prefix_net_lsa(ifa); +#endif } schedule_rtcalc(po); @@ -1353,6 +1359,16 @@ ospf_top_rehash(struct top_graph *f, int step) ospf_top_ht_free(oldt); } +#ifdef OSPFv2 + +u32 +ospf_lsa_domain(u32 type, struct ospf_iface *ifa) +{ + return (type == LSA_T_EXT) ? 0 : ifa->oa->areaid; +} + +#else /* OSPFv3 */ + u32 ospf_lsa_domain(u32 type, struct ospf_iface *ifa) { @@ -1370,6 +1386,8 @@ ospf_lsa_domain(u32 type, struct ospf_iface *ifa) } } +#endif + struct top_hash_entry * ospf_hash_find_header(struct top_graph *f, u32 domain, struct ospf_lsa_header *h) { |