Combine the static_ipv[4|6]_nexthop_same into static_nexthop_same.
Signed-off-by: Donald Sharp <[email protected]>
---
zebra/zebra_rib.c | 38 ++++++++++++++++----------------------
1 file changed, 16 insertions(+), 22 deletions(-)
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index de71c9c..4bcfc15 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -2318,7 +2318,7 @@ static_install_route (afi_t afi, safi_t safi, struct
prefix *p, struct static_ro
}
static int
-static_ipv4_nexthop_same (struct nexthop *nexthop, struct static_route *si)
+static_nexthop_same (struct nexthop *nexthop, struct static_route *si)
{
if (nexthop->type == NEXTHOP_TYPE_IPV4
&& si->type == STATIC_IPV4_GATEWAY
@@ -2331,6 +2331,19 @@ static_ipv4_nexthop_same (struct nexthop *nexthop,
struct static_route *si)
if (nexthop->type == NEXTHOP_TYPE_BLACKHOLE
&& si->type == STATIC_IPV4_BLACKHOLE)
return 1;
+ if (nexthop->type == NEXTHOP_TYPE_IPV6
+ && si->type == STATIC_IPV6_GATEWAY
+ && IPV6_ADDR_SAME (&nexthop->gate.ipv6, &si->addr.ipv6))
+ return 1;
+ if (nexthop->type == NEXTHOP_TYPE_IFNAME
+ && si->type == STATIC_IPV6_IFNAME
+ && strcmp (nexthop->ifname, si->ifname) == 0)
+ return 1;
+ if (nexthop->type == NEXTHOP_TYPE_IPV6_IFNAME
+ && si->type == STATIC_IPV6_GATEWAY_IFNAME
+ && IPV6_ADDR_SAME (&nexthop->gate.ipv6, &si->addr.ipv6)
+ && strcmp (nexthop->ifname, si->ifname) == 0)
+ return 1;
return 0;
}
@@ -2370,7 +2383,7 @@ static_uninstall_ipv4 (safi_t safi, struct prefix *p,
struct static_route *si)
/* Lookup nexthop. */
for (nexthop = rib->nexthop; nexthop; nexthop = nexthop->next)
- if (static_ipv4_nexthop_same (nexthop, si))
+ if (static_nexthop_same (nexthop, si))
break;
/* Can't find nexthop. */
@@ -2788,25 +2801,6 @@ rib_delete_ipv6 (int type, int flags, struct prefix_ipv6
*p,
return 0;
}
-static int
-static_ipv6_nexthop_same (struct nexthop *nexthop, struct static_route *si)
-{
- if (nexthop->type == NEXTHOP_TYPE_IPV6
- && si->type == STATIC_IPV6_GATEWAY
- && IPV6_ADDR_SAME (&nexthop->gate.ipv6, &si->addr.ipv6))
- return 1;
- if (nexthop->type == NEXTHOP_TYPE_IFNAME
- && si->type == STATIC_IPV6_IFNAME
- && strcmp (nexthop->ifname, si->ifname) == 0)
- return 1;
- if (nexthop->type == NEXTHOP_TYPE_IPV6_IFNAME
- && si->type == STATIC_IPV6_GATEWAY_IFNAME
- && IPV6_ADDR_SAME (&nexthop->gate.ipv6, &si->addr.ipv6)
- && strcmp (nexthop->ifname, si->ifname) == 0)
- return 1;
- return 0;
-}
-
static void
static_uninstall_ipv6 (struct prefix *p, struct static_route *si)
{
@@ -2842,7 +2836,7 @@ static_uninstall_ipv6 (struct prefix *p, struct
static_route *si)
/* Lookup nexthop. */
for (nexthop = rib->nexthop; nexthop; nexthop = nexthop->next)
- if (static_ipv6_nexthop_same (nexthop, si))
+ if (static_nexthop_same (nexthop, si))
break;
/* Can't find nexthop. */
--
1.7.10.4
_______________________________________________
Quagga-dev mailing list
[email protected]
https://lists.quagga.net/mailman/listinfo/quagga-dev
