diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2009-08-21 09:27:52 +0200 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2009-08-21 09:27:52 +0200 |
| commit | c3226991a061415fa83b757cbff678111c586e58 (patch) | |
| tree | ecbc7e7a5a2724463e2672bf8a3d1f64956467c0 /proto/ospf/topology.h | |
| parent | 3aab39f589c352e30e9db92346b579dd561482b3 (diff) | |
| download | bird-c3226991a061415fa83b757cbff678111c586e58.tar bird-c3226991a061415fa83b757cbff678111c586e58.zip | |
Temporary OSPFv3 development commit
Diffstat (limited to 'proto/ospf/topology.h')
| -rw-r--r-- | proto/ospf/topology.h | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/proto/ospf/topology.h b/proto/ospf/topology.h index 21e545e..4555bea 100644 --- a/proto/ospf/topology.h +++ b/proto/ospf/topology.h @@ -13,12 +13,11 @@ struct top_hash_entry { /* Index for fast mapping (type,rtrid,LSid)->vertex */ snode n; node cn; /* For adding into list of candidates - * in intra-area routing table - * calculation - */ + in intra-area routing table calculation */ struct top_hash_entry *next; /* Next in hash chain */ struct ospf_lsa_header lsa; - struct ospf_area *oa; + u32 domain; /* Area ID for area-wide LSAs, Iface ID for link-wide LSAs */ + // struct ospf_area *oa; void *lsa_body; bird_clock_t inst_t; /* Time of installation into DB */ ip_addr nh; /* Next hop */ @@ -48,13 +47,19 @@ struct top_graph struct top_graph *ospf_top_new(pool *); void ospf_top_free(struct top_graph *); void ospf_top_dump(struct top_graph *, struct proto *); -struct top_hash_entry *ospf_hash_find_header(struct top_graph *f, u32 areaid, +struct top_hash_entry *ospfxx_hash_find_header(struct top_graph *f, u32 areaid, struct ospf_lsa_header *h); -struct top_hash_entry *ospf_hash_get_header(struct top_graph *f, struct ospf_area *oa, +struct top_hash_entry *ospfxx_hash_get_header(struct top_graph *f, u32 domain, struct ospf_lsa_header *h); -struct top_hash_entry *ospf_hash_find(struct top_graph *, u32 areaid, u32 lsa, u32 rtr, + +struct top_hash_entry *ospfxx_hash_find_smart(struct top_graph *f, struct ospf_iface *ifa, + struct ospf_lsa_header *h); +struct top_hash_entry *ospfxx_hash_get_smart(struct top_graph *f, struct ospf_iface *ifa, + struct ospf_lsa_header *h); + +struct top_hash_entry *ospfxx_hash_find(struct top_graph *, u32 domain, u32 lsa, u32 rtr, u32 type); -struct top_hash_entry *ospf_hash_get(struct top_graph *, struct ospf_area *oa, u32 lsa, u32 rtr, +struct top_hash_entry *ospfxx_hash_get(struct top_graph *, u32 domain, u32 lsa, u32 rtr, u32 type); void ospf_hash_delete(struct top_graph *, struct top_hash_entry *); void originate_rt_lsa(struct ospf_area *oa); @@ -64,7 +69,7 @@ int max_ext_lsa(unsigned pxlen); void originate_ext_lsa(net * n, rte * e, struct proto_ospf *po, struct ea_list *attrs); void check_sum_lsa(struct proto_ospf *po, ort *nf, int); -void originate_sum_lsa(struct ospf_area *oa, struct fib_node *fn, int type, int metric); +void originate_sum_lsa(struct ospf_area *oa, struct fib_node *fn, int type, int metric, u32 options); void flush_sum_lsa(struct ospf_area *oa, struct fib_node *fn, int type); |