summaryrefslogtreecommitdiff
path: root/zebra/rib.h
diff options
context:
space:
mode:
Diffstat (limited to 'zebra/rib.h')
-rw-r--r--zebra/rib.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/zebra/rib.h b/zebra/rib.h
index c39abaffcc..0353c9bb99 100644
--- a/zebra/rib.h
+++ b/zebra/rib.h
@@ -99,9 +99,6 @@ struct route_entry {
/* Type fo this route. */
int type;
- /* Source protocol instance */
- unsigned short instance;
-
/* VRF identifier. */
vrf_id_t vrf_id;
@@ -115,9 +112,6 @@ struct route_entry {
uint32_t mtu;
uint32_t nexthop_mtu;
- /* Distance. */
- uint8_t distance;
-
/* Flags of this route.
* This flag's definition is in lib/zebra.h ZEBRA_FLAG_* and is exposed
* to clients via Zserv
@@ -146,6 +140,12 @@ struct route_entry {
/* Sequence value incremented for each dataplane operation */
uint32_t dplane_sequence;
+
+ /* Source protocol instance */
+ uint16_t instance;
+
+ /* Distance. */
+ uint8_t distance;
};
#define RIB_SYSTEM_ROUTE(R) RSYSTEM_ROUTE((R)->type)
@@ -400,7 +400,7 @@ extern struct route_entry *rib_lookup_ipv4(struct prefix_ipv4 *p,
extern void rib_update(vrf_id_t vrf_id, rib_update_event_t event);
extern void rib_update_table(struct route_table *table,
rib_update_event_t event);
-extern void rib_sweep_route(void);
+extern int rib_sweep_route(struct thread *t);
extern void rib_sweep_table(struct route_table *table);
extern void rib_close_table(struct route_table *table);
extern void rib_init(void);