zebra: fix wrong gateway for fpm debug

The wrong parameter is passed in `inet_ntop()` of `zfpm_log_route_info()` in
old fpm module, so the display of gateway is always wrong. Just remove
that extra ampersand.

Additionally, use "none" as gateway value for the case of no gateway.

Signed-off-by: anlan_cs <vic.lan@pica8.com>

diff --git a/zebra/zebra_fpm_netlink.c b/zebra/zebra_fpm_netlink.c
index ca897251e2198e28385d155cdb7a9d6a1932b9e4..5cefa16cdd1f94b721e0f0e2ecf79bc0d3ba0458 100644 (file)
--- a/zebra/zebra_fpm_netlink.c
+++ b/zebra/zebra_fpm_netlink.c
@@ -539,10 +539,15 @@ static void zfpm_log_route_info(struct netlink_route_info *ri,
        for (i = 0; i < ri->num_nhs; i++) {
                nhi = &ri->nhs[i];
 
-               if (ri->af == AF_INET)
-                       inet_ntop(AF_INET, &nhi->gateway, buf, sizeof(buf));
-               else
-                       inet_ntop(AF_INET6, &nhi->gateway, buf, sizeof(buf));
+               if (nhi->gateway) {
+                       if (ri->af == AF_INET)
+                               inet_ntop(AF_INET, nhi->gateway, buf,
+                                         sizeof(buf));
+                       else
+                               inet_ntop(AF_INET6, nhi->gateway, buf,
+                                         sizeof(buf));
+               } else
+                       strlcpy(buf, "none", sizeof(buf));
 
                zfpm_debug("  Intf: %u, Gateway: %s, Recursive: %s, Type: %s, Encap type: %s",
                           nhi->if_index, buf, nhi->recursive ? "yes" : "no",