diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2018-01-24 21:35:37 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2018-02-09 01:36:18 +0100 |
| commit | 44bdf1590d4eccb8764f2c6f5de48c59e3eff9c2 (patch) | |
| tree | 518d743c04902f49fde4cc0b2624875559e28e16 | |
| parent | *: Track vrfs per nexthop not per route entry (diff) | |
| download | frr-44bdf1590d4eccb8764f2c6f5de48c59e3eff9c2.tar.xz frr-44bdf1590d4eccb8764f2c6f5de48c59e3eff9c2.zip | |
lib, zebra: Move nh_resolve_via_default to appropriate header
The nh_resolve_via_default function is an accessor function
for NHT in zebra. Let's move this function to it's proper
place.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
| -rw-r--r-- | lib/nexthop.h | 12 | ||||
| -rw-r--r-- | zebra/zebra_rib.c | 2 | ||||
| -rw-r--r-- | zebra/zebra_rnh.c | 2 | ||||
| -rw-r--r-- | zebra/zebra_rnh.h | 9 |
4 files changed, 11 insertions, 14 deletions
diff --git a/lib/nexthop.h b/lib/nexthop.h index ee4f569e8..b502f293b 100644 --- a/lib/nexthop.h +++ b/lib/nexthop.h @@ -121,18 +121,6 @@ struct nexthop { (nexthop); \ (nexthop) = nexthop_next(nexthop) -extern int zebra_rnh_ip_default_route; -extern int zebra_rnh_ipv6_default_route; - -static inline int nh_resolve_via_default(int family) -{ - if (((family == AF_INET) && zebra_rnh_ip_default_route) - || ((family == AF_INET6) && zebra_rnh_ipv6_default_route)) - return 1; - else - return 0; -} - struct nexthop *nexthop_new(void); void nexthop_add(struct nexthop **target, struct nexthop *nexthop); diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c index 81244db9b..8ac9d08f2 100644 --- a/zebra/zebra_rib.c +++ b/zebra/zebra_rib.c @@ -484,7 +484,7 @@ static int nexthop_active(afi_t afi, struct route_entry *re, /* However, do not resolve over default route unless explicitly * allowed. */ if (is_default_prefix(&rn->p) - && !nh_resolve_via_default(p.family)) + && !rnh_resolve_via_default(p.family)) return 0; dest = rib_dest_from_rnode(rn); diff --git a/zebra/zebra_rnh.c b/zebra/zebra_rnh.c index dfac8807a..9fc5afff0 100644 --- a/zebra/zebra_rnh.c +++ b/zebra/zebra_rnh.c @@ -659,7 +659,7 @@ static struct route_entry *zebra_rnh_resolve_nexthop_entry(vrf_id_t vrfid, * match route to be exact if so specified */ if (is_default_prefix(&rn->p) && - !nh_resolve_via_default(rn->p.family)) + !rnh_resolve_via_default(rn->p.family)) return NULL; /* Identify appropriate route entry. */ diff --git a/zebra/zebra_rnh.h b/zebra/zebra_rnh.h index 7e183684d..bd121ec83 100644 --- a/zebra/zebra_rnh.h +++ b/zebra/zebra_rnh.h @@ -54,6 +54,15 @@ typedef enum { RNH_NEXTHOP_TYPE, RNH_IMPORT_CHECK_TYPE } rnh_type_t; extern int zebra_rnh_ip_default_route; extern int zebra_rnh_ipv6_default_route; +static inline int rnh_resolve_via_default(int family) +{ + if (((family == AF_INET) && zebra_rnh_ip_default_route) + || ((family == AF_INET6) && zebra_rnh_ipv6_default_route)) + return 1; + else + return 0; +} + extern struct rnh *zebra_add_rnh(struct prefix *p, vrf_id_t vrfid, rnh_type_t type); extern struct rnh *zebra_lookup_rnh(struct prefix *p, vrf_id_t vrfid, |