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>

diff --git a/lib/nexthop.h b/lib/nexthop.h
index ee4f569e83c9e1758fab87c9702f50dbaedd459c..b502f293bc478cb911e027d7222832a20584f3ce 100644 (file)
--- 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 81244db9bf91f8bd8d58d5e90b7254ebaac9e3ec..8ac9d08f290ab5140c87218683cdc62f01c97151 100644 (file)
--- 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 dfac8807aa2e5f55f656bcc0921512d1d36409dc..9fc5afff0f392e01bf16638ad16247f4f7f56048 100644 (file)
--- 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 7e183684da40917a8bdbcee660c77c0b94060485..bd121ec83c6ef1d0f56541c1cc34cea451cda610 100644 (file)
--- 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,