commit ddc943dec3c017583f81cce388c7d453293156c7
author Jorge Boncompte [DTI2] <jorge@dti2.net> Fri Apr 13 13:46:07 2012 +0200
committer David Lamparter <equinox@diac24.net> Wed May 02 17:03:21 2012 +0200
tree a36d2bca91b1f3a7545a135b3bafccc40d0ca47b
parent 8794e8d229dc9fe29ea31424883433d4880ef408

bgpd, zebra: Fix format for some metric outputs

Metrics are unsigned values.

  * bgpd/bgp_{debug,route,vty}.c,
  * zebra/zebra_vty.c: replace %d with %u for metrics & distances

Signed-off-by: Jorge Boncompte [DTI2] <jorge@dti2.net>
[reworded commit message]
Signed-off-by: David Lamparter <equinox@diac24.net>

bgpd/bgp_debug.c

diff --git a/bgpd/bgp_debug.c b/bgpd/bgp_debug.c
index 8e16186..e3e3ec8 100644
--- a/bgpd/bgp_debug.c
+++ b/bgpd/bgp_debug.c
@@ -194,11 +194,11 @@
 #endif /* HAVE_IPV6 */
 
   if (CHECK_FLAG (attr->flag, ATTR_FLAG_BIT (BGP_ATTR_LOCAL_PREF)))
-    snprintf (buf + strlen (buf), size - strlen (buf), ", localpref %d",
+    snprintf (buf + strlen (buf), size - strlen (buf), ", localpref %u",
 	      attr->local_pref);
 
   if (CHECK_FLAG (attr->flag, ATTR_FLAG_BIT (BGP_ATTR_MULTI_EXIT_DISC))) 
-    snprintf (buf + strlen (buf), size - strlen (buf), ", metric %d",
+    snprintf (buf + strlen (buf), size - strlen (buf), ", metric %u",
 	      attr->med);
 
   if (CHECK_FLAG (attr->flag, ATTR_FLAG_BIT (BGP_ATTR_COMMUNITIES))) 

bgpd/bgp_route.c

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 087f839..9f8d823 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -5954,7 +5954,7 @@
 	  if (! CHECK_FLAG (binfo->flags, BGP_INFO_VALID))
 	    vty_out (vty, " (inaccessible)"); 
 	  else if (binfo->extra && binfo->extra->igpmetric)
-	    vty_out (vty, " (metric %d)", binfo->extra->igpmetric);
+	    vty_out (vty, " (metric %u)", binfo->extra->igpmetric);
 	  vty_out (vty, " from %s", sockunion2str (&binfo->peer->su, buf, SU_ADDRSTRLEN));
 	  if (attr->flag & ATTR_FLAG_BIT(BGP_ATTR_ORIGINATOR_ID))
 	    vty_out (vty, " (%s)", inet_ntoa (attr->extra->originator_id));

bgpd/bgp_vty.c

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index cbe0b44..bba1c7d 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -8966,7 +8966,7 @@
 	  vty_out (vty, " redistribute %s", zebra_route_string(i));
 
 	  if (bgp->redist_metric_flag[afi][i])
-	    vty_out (vty, " metric %d", bgp->redist_metric[afi][i]);
+	    vty_out (vty, " metric %u", bgp->redist_metric[afi][i]);
 
 	  if (bgp->rmap[afi][i].name)
 	    vty_out (vty, " route-map %s", bgp->rmap[afi][i].name);