summaryrefslogtreecommitdiff
path: root/zebra/rib.h
diff options
context:
space:
mode:
Diffstat (limited to 'zebra/rib.h')
-rw-r--r--zebra/rib.h17
1 files changed, 9 insertions, 8 deletions
diff --git a/zebra/rib.h b/zebra/rib.h
index 8887053a4c..fa8193bedf 100644
--- a/zebra/rib.h
+++ b/zebra/rib.h
@@ -46,24 +46,22 @@ DECLARE_MGROUP(ZEBRA);
DECLARE_MTYPE(RE);
-enum rnh_type { RNH_NEXTHOP_TYPE, RNH_IMPORT_CHECK_TYPE };
-
PREDECL_LIST(rnh_list);
/* Nexthop structure. */
struct rnh {
uint8_t flags;
-#define ZEBRA_NHT_CONNECTED 0x1
-#define ZEBRA_NHT_DELETED 0x2
-#define ZEBRA_NHT_EXACT_MATCH 0x4
+#define ZEBRA_NHT_CONNECTED 0x1
+#define ZEBRA_NHT_DELETED 0x2
+#define ZEBRA_NHT_EXACT_MATCH 0x4
+#define ZEBRA_NHT_RESOLVE_VIA_DEFAULT 0x8
/* VRF identifier. */
vrf_id_t vrf_id;
afi_t afi;
-
- enum rnh_type type;
+ safi_t safi;
uint32_t seqno;
@@ -110,8 +108,11 @@ struct route_entry {
struct nexthop_group fib_ng;
struct nexthop_group fib_backup_ng;
- /* Nexthop group hash entry ID */
+ /* Nexthop group hash entry IDs. The "installed" id is the id
+ * used in linux/netlink, if available.
+ */
uint32_t nhe_id;
+ uint32_t nhe_installed_id;
/* Tag */
route_tag_t tag;