diff options
| author | Mitesh Kanjariya <mitesh@cumulusnetworks.com> | 2018-02-21 00:36:58 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-21 00:36:58 -0800 |
| commit | f487dcaf74c9bd7a716a749d15281d5b92d363d4 (patch) | |
| tree | 5362b8a4081b3b8a13038fa520c8d66a95c0192e /zebra/rib.h | |
| parent | 7fdaec88941d66d831363d32084cc88c5b98ac6c (diff) | |
| parent | 4298f5e937a1fa689047697395f8b741fb9b3d15 (diff) | |
Merge branch 'master' into evpn-bug-fixes
Diffstat (limited to 'zebra/rib.h')
| -rw-r--r-- | zebra/rib.h | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/zebra/rib.h b/zebra/rib.h index 664afd01b8..9a5d88ed15 100644 --- a/zebra/rib.h +++ b/zebra/rib.h @@ -59,7 +59,6 @@ struct route_entry { /* VRF identifier. */ vrf_id_t vrf_id; - vrf_id_t nh_vrf_id; /* Which routing table */ uint32_t table; @@ -231,22 +230,27 @@ typedef enum { } rib_update_event_t; extern struct nexthop *route_entry_nexthop_ifindex_add(struct route_entry *, - ifindex_t); + ifindex_t, + vrf_id_t nh_vrf_id); extern struct nexthop *route_entry_nexthop_blackhole_add(struct route_entry *, enum blackhole_type); extern struct nexthop *route_entry_nexthop_ipv4_add(struct route_entry *, struct in_addr *, - struct in_addr *); + struct in_addr *, + vrf_id_t nh_vrf_id); extern struct nexthop * route_entry_nexthop_ipv4_ifindex_add(struct route_entry *, struct in_addr *, - struct in_addr *, ifindex_t); + struct in_addr *, ifindex_t, + vrf_id_t nh_vrf_id); extern void route_entry_nexthop_delete(struct route_entry *re, struct nexthop *nexthop); extern struct nexthop *route_entry_nexthop_ipv6_add(struct route_entry *, - struct in6_addr *); + struct in6_addr *, + vrf_id_t nh_vrf_id); extern struct nexthop * route_entry_nexthop_ipv6_ifindex_add(struct route_entry *re, - struct in6_addr *ipv6, ifindex_t ifindex); + struct in6_addr *ipv6, ifindex_t ifindex, + vrf_id_t nh_vrf_id); extern void route_entry_nexthop_add(struct route_entry *re, struct nexthop *nexthop); extern void route_entry_copy_nexthops(struct route_entry *re, @@ -294,8 +298,8 @@ extern void rib_uninstall_kernel(struct route_node *rn, struct route_entry *re); /* NOTE: * All rib_add function will not just add prefix into RIB, but * also implicitly withdraw equal prefix of same type. */ -extern int rib_add(afi_t afi, safi_t safi, vrf_id_t vrf_id, vrf_id_t nh_vrf_id, - int type, u_short instance, int flags, struct prefix *p, +extern int rib_add(afi_t afi, safi_t safi, vrf_id_t vrf_id, int type, + u_short instance, int flags, struct prefix *p, struct prefix_ipv6 *src_p, const struct nexthop *nh, u_int32_t table_id, u_int32_t metric, u_int32_t mtu, uint8_t distance, route_tag_t tag); |