From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 18 Jan 2017 15:17:20 +0000 (-0500)
Subject: zebra: Fix compile warnings under freebsd
X-Git-Tag: frr-3.0-branchpoint~76^2~5
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=9bf7536273d673b8f37ffb9f6297465e245547e6;p=matthieu%2Ffrr.git

zebra: Fix compile warnings under freebsd

Compiling under clang we see compiler warnings
Fix them.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/zebra/kernel_socket.c b/zebra/kernel_socket.c
index 6d81c9d052..fd059dfee7 100644
--- a/zebra/kernel_socket.c
+++ b/zebra/kernel_socket.c
@@ -927,7 +927,7 @@ rtm_read (struct rt_msghdr *rtm)
         int ret;
         if (! IS_ZEBRA_DEBUG_RIB)
           return;
-        ret = rib_lookup_ipv4_route (&p, &gate, VRF_DEFAULT);
+        ret = rib_lookup_ipv4_route ((struct prefix_ipv4 *)&p, &gate, VRF_DEFAULT);
         prefix2str (&p, buf, sizeof(buf));
         switch (rtm->rtm_type)
         {
@@ -951,7 +951,7 @@ rtm_read (struct rt_msghdr *rtm)
               case ZEBRA_RIB_FOUND_EXACT: /* RIB RR == FIB RR */
                 zlog_debug ("%s: %s %s: done Ok",
                   __func__, lookup (rtm_type_str, rtm->rtm_type), buf);
-                rib_lookup_and_dump (&p, VRF_DEFAULT);
+                rib_lookup_and_dump ((struct prefix_ipv4 *)&p, VRF_DEFAULT);
                 return;
                 break;
             }
@@ -964,18 +964,18 @@ rtm_read (struct rt_msghdr *rtm)
               case ZEBRA_RIB_FOUND_EXACT:
                 zlog_debug ("%s: %s %s: desync: RR is still in RIB, while already not in FIB",
                   __func__, lookup (rtm_type_str, rtm->rtm_type), buf);
-                rib_lookup_and_dump (&p, VRF_DEFAULT);
+                rib_lookup_and_dump ((struct prefix_ipv4 *)&p, VRF_DEFAULT);
                 break;
               case ZEBRA_RIB_FOUND_CONNECTED:
               case ZEBRA_RIB_FOUND_NOGATE:
                 zlog_debug ("%s: %s %s: desync: RR is still in RIB, plus gate differs",
                   __func__, lookup (rtm_type_str, rtm->rtm_type), buf);
-                rib_lookup_and_dump (&p, VRF_DEFAULT);
+                rib_lookup_and_dump ((struct prefix_ipv4 *)&p, VRF_DEFAULT);
                 break;
               case ZEBRA_RIB_NOTFOUND: /* RIB RR == FIB RR */
                 zlog_debug ("%s: %s %s: done Ok",
                   __func__, lookup (rtm_type_str, rtm->rtm_type), buf);
-                rib_lookup_and_dump (&p, VRF_DEFAULT);
+                rib_lookup_and_dump ((struct prefix_ipv4 *)&p, VRF_DEFAULT);
                 return;
                 break;
             }
diff --git a/zebra/zebra_fpm.c b/zebra/zebra_fpm.c
index 8b337152b4..d91cda9fb0 100644
--- a/zebra/zebra_fpm.c
+++ b/zebra/zebra_fpm.c
@@ -883,7 +883,9 @@ zfpm_encode_route (rib_dest_t *dest, struct rib *rib, char *in_buf,
 		   size_t in_buf_len, fpm_msg_type_e *msg_type)
 {
   size_t len;
+#ifdef HAVE_NETLINK
   int cmd;
+#endif
   len = 0;
 
   *msg_type = FPM_MSG_TYPE_NONE;
diff --git a/zebra/zserv.c b/zebra/zserv.c
index 6a15b9a251..f53b2270f1 100644
--- a/zebra/zserv.c
+++ b/zebra/zserv.c
@@ -2386,7 +2386,7 @@ zebra_find_client (u_char proto)
   return NULL;
 }
 
-
+#ifdef HAVE_NETLINK
 /* Display default rtm_table for all clients. */
 DEFUN (show_table,
        show_table_cmd,
@@ -2419,6 +2419,7 @@ DEFUN (no_config_table,
   zebrad.rtm_table_default = 0;
   return CMD_SUCCESS;
 }
+#endif
 
 DEFUN (ip_forwarding,
        ip_forwarding_cmd,