bgpd: fix SAFI for for MPLS labeled VPN-IPv6

* bgpd.h: change value of BGP_SAFI_VPNV6 to 128 (RFC4659, BZ#659)
* bgp_route.c: (bgp_table_stats_vty) fix length argument to strncmp()

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index aabd264a08216a883354989edb2b23bd42c91722..eaedbc4c68c4889446a6cea3b15812c03173a06e 100644 (file)
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -9381,7 +9381,7 @@ bgp_table_stats_vty (struct vty *vty, const char *name,
         safi = SAFI_UNICAST;
       else if (strncmp (safi_str, "vpnv4", 5) == 0)
         safi = BGP_SAFI_VPNV4;
-      else if (strncmp (safi_str, "vpnv6", 6) == 0)
+      else if (strncmp (safi_str, "vpnv6", 5) == 0)
         safi = BGP_SAFI_VPNV6;
       else
         {

diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h
index d415814c4462e11e4a3b8020f78d7d5db12f9bb6..f396f726ac91847f10d2a847540699fbd230cb60 100644 (file)
--- a/bgpd/bgpd.h
+++ b/bgpd/bgpd.h
@@ -729,7 +729,7 @@ struct bgp_nlri
 
 /* SAFI which used in open capability negotiation.  */
 #define BGP_SAFI_VPNV4                         128
-#define BGP_SAFI_VPNV6                         129
+#define BGP_SAFI_VPNV6                         128
 
 /* Max TTL value.  */
 #define TTL_MAX                                255