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 75a59cb42c03263de2f274f32cb36a6e82608afb..1da5d1da069d4c3527951b576fccfd10f57b8ab7 100644 (file)
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -9090,7 +9090,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 a5afaedcc3f16f242b4ee1cf89403f2b28403e10..73a9ea12a7c698aefb7fb74ee5698fdb051a5fe6 100644 (file)
--- a/bgpd/bgpd.h
+++ b/bgpd/bgpd.h
@@ -726,7 +726,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