Merge pull request #7764 from pguibert6WIND/nhrp_shortcut_routes

[mirror_frr.git] / nhrpd / nhrp_route.c

diff --git a/nhrpd/nhrp_route.c b/nhrpd/nhrp_route.c
index ce2b1fe2ffe7182fd5941fb929366b3e471d6632..334f468c18ad48bf2a65e8ef7740a1bc1884a136 100644 (file)
--- a/nhrpd/nhrp_route.c
+++ b/nhrpd/nhrp_route.c
@@ -98,6 +98,7 @@ void nhrp_route_announce(int add, enum nhrp_cache_type type,
 {
        struct zapi_route api;
        struct zapi_nexthop *api_nh;
+       union sockunion *nexthop_ref = (union sockunion *)nexthop;
 
        if (zclient->sock < 0)
                return;
@@ -133,8 +134,14 @@ void nhrp_route_announce(int add, enum nhrp_cache_type type,
 
        switch (api.prefix.family) {
        case AF_INET:
-               if (nexthop) {
-                       api_nh->gate.ipv4 = nexthop->sin.sin_addr;
+               if (api.prefix.prefixlen == IPV4_MAX_BITLEN &&
+                   nexthop_ref &&
+                   memcmp(&nexthop_ref->sin.sin_addr, &api.prefix.u.prefix4,
+                          sizeof(struct in_addr)) == 0) {
+                       nexthop_ref = NULL;
+               }
+               if (nexthop_ref) {
+                       api_nh->gate.ipv4 = nexthop_ref->sin.sin_addr;
                        api_nh->type = NEXTHOP_TYPE_IPV4;
                }
                if (ifp) {
@@ -146,8 +153,14 @@ void nhrp_route_announce(int add, enum nhrp_cache_type type,
                }
                break;
        case AF_INET6:
-               if (nexthop) {
-                       api_nh->gate.ipv6 = nexthop->sin6.sin6_addr;
+               if (api.prefix.prefixlen == IPV6_MAX_BITLEN &&
+                   nexthop_ref &&
+                   memcmp(&nexthop_ref->sin6.sin6_addr, &api.prefix.u.prefix6,
+                          sizeof(struct in6_addr)) == 0) {
+                       nexthop_ref = NULL;
+               }
+               if (nexthop_ref) {
+                       api_nh->gate.ipv6 = nexthop_ref->sin6.sin6_addr;
                        api_nh->type = NEXTHOP_TYPE_IPV6;
                }
                if (ifp) {
@@ -170,8 +183,9 @@ void nhrp_route_announce(int add, enum nhrp_cache_type type,
                zlog_debug(
                        "Zebra send: route %s %pFX nexthop %s metric %u count %d dev %s",
                        add ? "add" : "del", &api.prefix,
-                       nexthop ? inet_ntop(api.prefix.family, &api_nh->gate,
-                                           buf, sizeof(buf))
+                       nexthop_ref ? inet_ntop(api.prefix.family,
+                                               &api_nh->gate,
+                                               buf, sizeof(buf))
                                : "<onlink>",
                        api.metric, api.nexthop_num, ifp ? ifp->name : "none");
        }