Merge remote-tracking branch 'origin/stable/3.0'

diff --cc isisd/isis_lsp.c
index 29e5280ce3c2f4271fb738f1a7e902930ca10b2b,f7ed23aa301953feaded759d31a376e2eb177f56..48a92bdaafc00aa5c45f63269313c24e2e963c97
--- 1/isisd/isis_lsp.c
--- 2/isisd/isis_lsp.c
+++ b/isisd/isis_lsp.c
@@@ -828,107 -826,6 +828,107 @@@ lsp_print (struct isis_lsp *lsp, struc
             lsp_bits2string (&lsp->lsp_header->lsp_bits), VTY_NEWLINE);
  }
  
-           vty_out(vty, "  Metric      : %-8d IS-Extended   : %s%s",
 +static void
 +lsp_print_mt_reach(struct list *list, struct vty *vty,
 +                   char dynhost, uint16_t mtid)
 +{
 +  struct listnode *node;
 +  struct te_is_neigh *neigh;
 +
 +  for (ALL_LIST_ELEMENTS_RO (list, node, neigh))
 +    {
 +      u_char lspid[255];
 +
 +      lspid_print(neigh->neigh_id, lspid, dynhost, 0);
 +      if (mtid == ISIS_MT_IPV4_UNICAST)
 +        {
-           vty_out(vty, "  Metric      : %-8d MT-Reach      : %s %s%s",
++          vty_out(vty, "  Metric      : %-8u IS-Extended   : %s%s",
 +                  GET_TE_METRIC(neigh), lspid, VTY_NEWLINE);
 +        }
 +      else
 +        {
-             vty_out (vty, "  Metric      : %-8d IPv6-Internal : %s/%d%s",
++          vty_out(vty, "  Metric      : %-8u MT-Reach      : %s %s%s",
 +                  GET_TE_METRIC(neigh), lspid,
 +                  isis_mtid2str(mtid), VTY_NEWLINE);
 +        }
 +      if (IS_MPLS_TE(isisMplsTE))
 +        mpls_te_print_detail(vty, neigh);
 +    }
 +}
 +
 +static void
 +lsp_print_mt_ipv6_reach(struct list *list, struct vty *vty, uint16_t mtid)
 +{
 +  struct listnode *node;
 +  struct ipv6_reachability *ipv6_reach;
 +  struct in6_addr in6;
 +  u_char buff[BUFSIZ];
 +
 +  for (ALL_LIST_ELEMENTS_RO (list, node, ipv6_reach))
 +    {
 +      memset (&in6, 0, sizeof (in6));
 +      memcpy (in6.s6_addr, ipv6_reach->prefix,
 +              PSIZE (ipv6_reach->prefix_len));
 +      inet_ntop (AF_INET6, &in6, (char *)buff, BUFSIZ);
 +      if (mtid == ISIS_MT_IPV4_UNICAST)
 +        {
 +          if ((ipv6_reach->control_info &
 +               CTRL_INFO_DISTRIBUTION) == DISTRIBUTION_INTERNAL)
-             vty_out (vty, "  Metric      : %-8d IPv6-External : %s/%d%s",
++            vty_out (vty, "  Metric      : %-8" PRIu32 " IPv6-Internal : %s/%d%s",
 +                     ntohl (ipv6_reach->metric),
 +                     buff, ipv6_reach->prefix_len, VTY_NEWLINE);
 +          else
-             vty_out (vty, "  Metric      : %-8d IPv6-MT-Int   : %s/%d %s%s",
++            vty_out (vty, "  Metric      : %-8" PRIu32 " IPv6-External : %s/%d%s",
 +                     ntohl (ipv6_reach->metric),
 +                     buff, ipv6_reach->prefix_len, VTY_NEWLINE);
 +        }
 +      else
 +        {
 +          if ((ipv6_reach->control_info &
 +               CTRL_INFO_DISTRIBUTION) == DISTRIBUTION_INTERNAL)
-             vty_out (vty, "  Metric      : %-8d IPv6-MT-Ext   : %s/%d %s%s",
++            vty_out (vty, "  Metric      : %-8" PRIu32 " IPv6-MT-Int   : %s/%d %s%s",
 +                     ntohl (ipv6_reach->metric),
 +                     buff, ipv6_reach->prefix_len,
 +                     isis_mtid2str(mtid), VTY_NEWLINE);
 +          else
-           vty_out (vty, "  Metric      : %-8d IPv4-Extended : %s/%d%s",
++            vty_out (vty, "  Metric      : %-8" PRIu32 " IPv6-MT-Ext   : %s/%d %s%s",
 +                     ntohl (ipv6_reach->metric),
 +                     buff, ipv6_reach->prefix_len,
 +                     isis_mtid2str(mtid), VTY_NEWLINE);
 +        }
 +    }
 +}
 +
 +static void
 +lsp_print_mt_ipv4_reach(struct list *list, struct vty *vty, uint16_t mtid)
 +{
 +  struct listnode *node;
 +  struct te_ipv4_reachability *te_ipv4_reach;
 +
 +  for (ALL_LIST_ELEMENTS_RO (list, node, te_ipv4_reach))
 +    {
 +      if (mtid == ISIS_MT_IPV4_UNICAST)
 +        {
 +          /* FIXME: There should be better way to output this stuff. */
-           vty_out (vty, "  Metric      : %-8d IPv4-MT       : %s/%d %s%s",
++          vty_out (vty, "  Metric      : %-8" PRIu32 " IPv4-Extended : %s/%d%s",
 +                   ntohl (te_ipv4_reach->te_metric),
 +                   inet_ntoa (newprefix2inaddr (&te_ipv4_reach->prefix_start,
 +                                                te_ipv4_reach->control)),
 +                   te_ipv4_reach->control & 0x3F, VTY_NEWLINE);
 +        }
 +      else
 +        {
 +          /* FIXME: There should be better way to output this stuff. */
++          vty_out (vty, "  Metric      : %-8" PRIu32 " IPv4-MT       : %s/%d %s%s",
 +                   ntohl (te_ipv4_reach->te_metric),
 +                   inet_ntoa (newprefix2inaddr (&te_ipv4_reach->prefix_start,
 +                                                te_ipv4_reach->control)),
 +                   te_ipv4_reach->control & 0x3F,
 +                   isis_mtid2str(mtid), VTY_NEWLINE);
 +        }
 +    }
 +}
 +
  void
  lsp_print_detail (struct isis_lsp *lsp, struct vty *vty, char dynhost)
  {

diff --cc isisd/isis_redist.c
Simple merge

diff --cc isisd/isis_zebra.c
Simple merge

diff --cc isisd/isis_zebra.h
Simple merge

diff --cc ldpd/adjacency.c
Simple merge

diff --cc ospfd/ospf_interface.c
Simple merge

diff --cc ospfd/ospf_vty.c
Simple merge

diff --cc ospfd/ospf_zebra.c
Simple merge

diff --cc zebra/irdp_interface.c
Simple merge

diff --cc zebra/irdp_main.c
Simple merge

diff --cc zebra/zebra_vty.c
Simple merge