patches/002-fix-metric-output.patch

   1 --- a/bgpd/bgp_debug.c
   2 +++ b/bgpd/bgp_debug.c
   3 @@ -194,11 +194,11 @@ bgp_dump_attr (struct peer *peer, struct
   4  #endif /* HAVE_IPV6 */
   5
   6    if (CHECK_FLAG (attr->flag, ATTR_FLAG_BIT (BGP_ATTR_LOCAL_PREF)))
   7 -    snprintf (buf + strlen (buf), size - strlen (buf), ", localpref %d",
   8 +    snprintf (buf + strlen (buf), size - strlen (buf), ", localpref %u",
   9               attr->local_pref);
  10
  11    if (CHECK_FLAG (attr->flag, ATTR_FLAG_BIT (BGP_ATTR_MULTI_EXIT_DISC)))
  12 -    snprintf (buf + strlen (buf), size - strlen (buf), ", metric %d",
  13 +    snprintf (buf + strlen (buf), size - strlen (buf), ", metric %u",
  14               attr->med);
  15
  16    if (CHECK_FLAG (attr->flag, ATTR_FLAG_BIT (BGP_ATTR_COMMUNITIES)))
  17 --- a/bgpd/bgp_route.c
  18 +++ b/bgpd/bgp_route.c
  19 @@ -5954,7 +5954,7 @@ route_vty_out_detail (struct vty *vty, s
  20           if (! CHECK_FLAG (binfo->flags, BGP_INFO_VALID))
  21             vty_out (vty, " (inaccessible)");
  22           else if (binfo->extra && binfo->extra->igpmetric)
  23 -           vty_out (vty, " (metric %d)", binfo->extra->igpmetric);
  24 +           vty_out (vty, " (metric %u)", binfo->extra->igpmetric);
  25           vty_out (vty, " from %s", sockunion2str (&binfo->peer->su, buf, SU_ADDRSTRLEN));
  26           if (attr->flag & ATTR_FLAG_BIT(BGP_ATTR_ORIGINATOR_ID))
  27             vty_out (vty, " (%s)", inet_ntoa (attr->extra->originator_id));
  28 --- a/bgpd/bgp_vty.c
  29 +++ b/bgpd/bgp_vty.c
  30 @@ -8966,7 +8966,7 @@ bgp_config_write_redistribute (struct vt
  31           vty_out (vty, " redistribute %s", zebra_route_string(i));
  32
  33           if (bgp->redist_metric_flag[afi][i])
  34 -           vty_out (vty, " metric %d", bgp->redist_metric[afi][i]);
  35 +           vty_out (vty, " metric %u", bgp->redist_metric[afi][i]);
  36
  37           if (bgp->rmap[afi][i].name)
  38             vty_out (vty, " route-map %s", bgp->rmap[afi][i].name);
  39 --- a/zebra/zebra_vty.c
  40 +++ b/zebra/zebra_vty.c
  41 @@ -541,7 +541,7 @@ vty_show_ip_route_detail (struct vty *vt
  42                inet_ntoa (rn->p.u.prefix4), rn->p.prefixlen,
  43                VTY_NEWLINE);
  44        vty_out (vty, "  Known via \"%s\"", zebra_route_string (rib->type));
  45 -      vty_out (vty, ", distance %d, metric %d", rib->distance, rib->metric);
  46 +      vty_out (vty, ", distance %u, metric %u", rib->distance, rib->metric);
  47        if (CHECK_FLAG (rib->flags, ZEBRA_FLAG_SELECTED))
  48         vty_out (vty, ", best");
  49        if (rib->refcnt)
  50 @@ -1519,7 +1519,7 @@ vty_show_ipv6_route_detail (struct vty *
  51                rn->p.prefixlen,
  52                VTY_NEWLINE);
  53        vty_out (vty, "  Known via \"%s\"", zebra_route_string (rib->type));
  54 -      vty_out (vty, ", distance %d, metric %d", rib->distance, rib->metric);
  55 +      vty_out (vty, ", distance %u, metric %u", rib->distance, rib->metric);
  56        if (CHECK_FLAG (rib->flags, ZEBRA_FLAG_SELECTED))
  57         vty_out (vty, ", best");
  58        if (rib->refcnt)