summaryrefslogtreecommitdiff
path: root/proto/ospf/topology.h
diff options
context:
space:
mode:
authorOndrej Zajicek <santiago@crfreenet.org>2010-12-07 23:35:39 +0100
committerOndrej Zajicek <santiago@crfreenet.org>2010-12-07 23:35:39 +0100
commit57c574d82a44d10143aba7aaea6d1384d850c079 (patch)
tree095e00deaeedd0907652dd2e6a01f40968281bde /proto/ospf/topology.h
parent9852f81064a38d35ff1bd5cc9fab7fc33926c83c (diff)
Multipath support for OSPF
Diffstat (limited to 'proto/ospf/topology.h')
-rw-r--r--proto/ospf/topology.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/proto/ospf/topology.h b/proto/ospf/topology.h
index b185c7f3..9521e3eb 100644
--- a/proto/ospf/topology.h
+++ b/proto/ospf/topology.h
@@ -20,9 +20,8 @@ struct top_hash_entry
// struct ospf_area *oa;
void *lsa_body;
bird_clock_t inst_t; /* Time of installation into DB */
- ip_addr nh; /* Next hop */
+ struct mpnh *nhs; /* Computed nexthops - valid only in ospf_rt_spf() */
ip_addr lb; /* In OSPFv2, link back address. In OSPFv3, any global address in the area useful for vlinks */
- struct ospf_iface *nhi; /* Next hop interface - valid only in ospf_rt_spf()*/
#ifdef OSPFv3
u32 lb_id; /* Interface ID of link back iface (for bcast or NBMA networks) */
#endif
@@ -32,7 +31,8 @@ struct top_hash_entry
#define OUTSPF 0
#define CANDIDATE 1
#define INSPF 2
- u8 padding;
+ u8 nhs_reuse; /* Whether nhs nodes can be reused during merging.
+ See a note in rt.c:merge_nexthops() */
};
struct top_graph