bgpd: snmp MIB bg4v2 fix invalid address Type value

currently an snmpwalk gives:
BGP4V2-MIB::bgp4V2PeerFsmEstablishedTime.1.ipv6z.10.125.0.2 = Gauge32: 103 seconds
BGP4V2-MIB::bgp4V2PeerFsmEstablishedTime.2.dns.253.0.1.37.0.0.0.0.0.0.0.0.0.0.0.3 = Gauge32: 103 seconds

but ipv6z and dns are not the valid address type this must be ipv4 and
ipv6.

Signed-off-by: Francois Dumontet <francois.dumontet@6wind.com>

1 files changed, 103 insertions, 103 deletions

diff --git a/bgpd/bgp_snmp_bgp4v2.c b/bgpd/bgp_snmp_bgp4v2.c
index adfced175..bda8c75f7 100644
--- a/bgpd/bgp_snmp_bgp4v2.c
+++ b/bgpd/bgp_snmp_bgp4v2.c
@@ -139,7 +139,7 @@ static struct peer *bgpv2PeerTable_lookup(struct variable *v, oid name[],
 	struct peer *peer = NULL;
 	size_t namelen = v ? v->namelen : BGP4V2_PEER_ENTRY_OFFSET;
 	oid *offset = name + namelen;
-	sa_family_t family = name[namelen - 1] == 4 ? AF_INET : AF_INET6;
+	sa_family_t family = name[namelen - 1] == 1 ? AF_INET : AF_INET6;
 	int afi_len = IN_ADDR_SIZE;
 	size_t offsetlen = *length - namelen;
 
@@ -800,616 +800,616 @@ static struct variable bgpv2_variables[] = {
 	 RONLY,
 	 bgpv2PeerTable,
 	 6,
-	 {1, 2, 1, BGP4V2_PEER_INSTANCE, 1, 4}},
+	 {1, 2, 1, BGP4V2_PEER_INSTANCE, 1, 1}},
 	{BGP4V2_PEER_INSTANCE,
 	 ASN_UNSIGNED,
 	 RONLY,
 	 bgpv2PeerTable,
 	 6,
-	 {1, 2, 1, BGP4V2_PEER_INSTANCE, 2, 16}},
+	 {1, 2, 1, BGP4V2_PEER_INSTANCE, 2, 2}},
 	{BGP4V2_PEER_LOCAL_ADDR_TYPE,
 	 ASN_INTEGER,
 	 RONLY,
 	 bgpv2PeerTable,
 	 6,
-	 {1, 2, 1, BGP4V2_PEER_LOCAL_ADDR_TYPE, 1, 4}},
+	 {1, 2, 1, BGP4V2_PEER_LOCAL_ADDR_TYPE, 1, 1}},
 	{BGP4V2_PEER_LOCAL_ADDR_TYPE,
 	 ASN_INTEGER,
 	 RONLY,
 	 bgpv2PeerTable,
 	 6,
-	 {1, 2, 1, BGP4V2_PEER_LOCAL_ADDR_TYPE, 2, 16}},
+	 {1, 2, 1, BGP4V2_PEER_LOCAL_ADDR_TYPE, 2, 2}},
 	{BGP4V2_PEER_LOCAL_ADDR,
 	 ASN_OCTET_STR,
 	 RONLY,
 	 bgpv2PeerTable,
 	 6,
-	 {1, 2, 1, BGP4V2_PEER_LOCAL_ADDR, 1, 4}},
+	 {1, 2, 1, BGP4V2_PEER_LOCAL_ADDR, 1, 1}},
 	{BGP4V2_PEER_LOCAL_ADDR,
 	 ASN_OCTET_STR,
 	 RONLY,
 	 bgpv2PeerTable,
 	 6,
-	 {1, 2, 1, BGP4V2_PEER_LOCAL_ADDR, 2, 16}},
+	 {1, 2, 1, BGP4V2_PEER_LOCAL_ADDR, 2, 2}},
 	{BGP4V2_PEER_REMOTE_ADDR_TYPE,
 	 ASN_INTEGER,
 	 RONLY,
 	 bgpv2PeerTable,
 	 6,
-	 {1, 2, 1, BGP4V2_PEER_REMOTE_ADDR_TYPE, 1, 4}},
+	 {1, 2, 1, BGP4V2_PEER_REMOTE_ADDR_TYPE, 1, 1}},
 	{BGP4V2_PEER_REMOTE_ADDR_TYPE,
 	 ASN_INTEGER,
 	 RONLY,
 	 bgpv2PeerTable,
 	 6,
-	 {1, 2, 1, BGP4V2_PEER_REMOTE_ADDR_TYPE, 2, 16}},
+	 {1, 2, 1, BGP4V2_PEER_REMOTE_ADDR_TYPE, 2, 2}},
 	{BGP4V2_PEER_REMOTE_ADDR,
 	 ASN_OCTET_STR,
 	 RONLY,
 	 bgpv2PeerTable,
 	 6,
-	 {1, 2, 1, BGP4V2_PEER_REMOTE_ADDR, 1, 4}},
+	 {1, 2, 1, BGP4V2_PEER_REMOTE_ADDR, 1, 1}},
 	{BGP4V2_PEER_REMOTE_ADDR,
 	 ASN_OCTET_STR,
 	 RONLY,
 	 bgpv2PeerTable,
 	 6,
-	 {1, 2, 1, BGP4V2_PEER_REMOTE_ADDR, 2, 16}},
+	 {1, 2, 1, BGP4V2_PEER_REMOTE_ADDR, 2, 2}},
 	{BGP4V2_PEER_LOCAL_PORT,
 	 ASN_UNSIGNED,
 	 RONLY,
 	 bgpv2PeerTable,
 	 6,
-	 {1, 2, 1, BGP4V2_PEER_LOCAL_PORT, 1, 4}},
+	 {1, 2, 1, BGP4V2_PEER_LOCAL_PORT, 1, 1}},
 	{BGP4V2_PEER_LOCAL_PORT,
 	 ASN_UNSIGNED,
 	 RONLY,
 	 bgpv2PeerTable,
 	 6,
-	 {1, 2, 1, BGP4V2_PEER_LOCAL_PORT, 2, 16}},
+	 {1, 2, 1, BGP4V2_PEER_LOCAL_PORT, 2, 2}},
 	{BGP4V2_PEER_LOCAL_AS,
 	 ASN_UNSIGNED,
 	 RONLY,
 	 bgpv2PeerTable,
 	 6,
-	 {1, 2, 1, BGP4V2_PEER_LOCAL_AS, 1, 4}},
+	 {1, 2, 1, BGP4V2_PEER_LOCAL_AS, 1, 1}},
 	{BGP4V2_PEER_LOCAL_AS,
 	 ASN_UNSIGNED,
 	 RONLY,
 	 bgpv2PeerTable,
 	 6,
-	 {1, 2, 1, BGP4V2_PEER_LOCAL_AS, 2, 16}},
+	 {1, 2, 1, BGP4V2_PEER_LOCAL_AS, 2, 2}},
 	{BGP4V2_PEER_LOCAL_IDENTIFIER,
 	 ASN_OCTET_STR,
 	 RONLY,
 	 bgpv2PeerTable,
 	 6,
-	 {1, 2, 1, BGP4V2_PEER_LOCAL_IDENTIFIER, 1, 4}},
+	 {1, 2, 1, BGP4V2_PEER_LOCAL_IDENTIFIER, 1, 1}},
 	{BGP4V2_PEER_LOCAL_IDENTIFIER,
 	 ASN_OCTET_STR,
 	 RONLY,
 	 bgpv2PeerTable,
 	 6,
-	 {1, 2, 1, BGP4V2_PEER_LOCAL_IDENTIFIER, 2, 16}},
+	 {1, 2, 1, BGP4V2_PEER_LOCAL_IDENTIFIER, 2, 2}},
 	{BGP4V2_PEER_REMOTE_PORT,
 	 ASN_UNSIGNED,
 	 RONLY,
 	 bgpv2PeerTable,
 	 6,
-	 {1, 2, 1, BGP4V2_PEER_REMOTE_PORT, 1, 4}},
+	 {1, 2, 1, BGP4V2_PEER_REMOTE_PORT, 1, 1}},
 	{BGP4V2_PEER_REMOTE_PORT,
 	 ASN_UNSIGNED,
 	 RONLY,
 	 bgpv2PeerTable,
 	 6,
-	 {1, 2, 1, BGP4V2_PEER_REMOTE_PORT, 2, 16}},
+	 {1, 2, 1, BGP4V2_PEER_REMOTE_PORT, 2, 2}},
 	{BGP4V2_PEER_REMOTE_AS,
 	 ASN_UNSIGNED,
 	 RONLY,
 	 bgpv2PeerTable,
 	 6,
-	 {1, 2, 1, BGP4V2_PEER_REMOTE_AS, 1, 4}},
+	 {1, 2, 1, BGP4V2_PEER_REMOTE_AS, 1, 1}},
 	{BGP4V2_PEER_REMOTE_AS,
 	 ASN_UNSIGNED,
 	 RONLY,
 	 bgpv2PeerTable,
 	 6,
-	 {1, 2, 1, BGP4V2_PEER_REMOTE_AS, 2, 16}},
+	 {1, 2, 1, BGP4V2_PEER_REMOTE_AS, 2, 2}},
 	{BGP4V2_PEER_REMOTE_IDENTIFIER,
 	 ASN_OCTET_STR,
 	 RONLY,
 	 bgpv2PeerTable,
 	 6,
-	 {1, 2, 1, BGP4V2_PEER_REMOTE_IDENTIFIER, 1, 4}},
+	 {1, 2, 1, BGP4V2_PEER_REMOTE_IDENTIFIER, 1, 1}},
 	{BGP4V2_PEER_REMOTE_IDENTIFIER,
 	 ASN_OCTET_STR,
 	 RONLY,
 	 bgpv2PeerTable,
 	 6,
-	 {1, 2, 1, BGP4V2_PEER_REMOTE_IDENTIFIER, 2, 16}},
+	 {1, 2, 1, BGP4V2_PEER_REMOTE_IDENTIFIER, 2, 2}},
 	{BGP4V2_PEER_ADMIN_STATUS,
 	 ASN_INTEGER,
 	 RONLY,
 	 bgpv2PeerTable,
 	 6,
-	 {1, 2, 1, BGP4V2_PEER_ADMIN_STATUS, 1, 4}},
+	 {1, 2, 1, BGP4V2_PEER_ADMIN_STATUS, 1, 1}},
 	{BGP4V2_PEER_ADMIN_STATUS,
 	 ASN_INTEGER,
 	 RONLY,
 	 bgpv2PeerTable,
 	 6,
-	 {1, 2, 1, BGP4V2_PEER_ADMIN_STATUS, 2, 16}},
+	 {1, 2, 1, BGP4V2_PEER_ADMIN_STATUS, 2, 2}},
 	{BGP4V2_PEER_STATE,
 	 ASN_INTEGER,
 	 RONLY,
 	 bgpv2PeerTable,
 	 6,
-	 {1, 2, 1, BGP4V2_PEER_STATE, 1, 4}},
+	 {1, 2, 1, BGP4V2_PEER_STATE, 1, 1}},
 	{BGP4V2_PEER_STATE,
 	 ASN_INTEGER,
 	 RONLY,
 	 bgpv2PeerTable,
 	 6,
-	 {1, 2, 1, BGP4V2_PEER_STATE, 2, 16}},
+	 {1, 2, 1, BGP4V2_PEER_STATE, 2, 2}},
 	{BGP4V2_PEER_DESCRIPTION,
 	 ASN_OCTET_STR,
 	 RONLY,
 	 bgpv2PeerTable,
 	 6,
-	 {1, 2, 1, BGP4V2_PEER_DESCRIPTION, 1, 4}},
+	 {1, 2, 1, BGP4V2_PEER_DESCRIPTION, 1, 1}},
 	{BGP4V2_PEER_DESCRIPTION,
 	 ASN_OCTET_STR,
 	 RONLY,
 	 bgpv2PeerTable,
 	 6,
-	 {1, 2, 1, BGP4V2_PEER_DESCRIPTION, 2, 16}},
+	 {1, 2, 1, BGP4V2_PEER_DESCRIPTION, 2, 2}},
 	/* bgp4V2PeerErrorsEntry */
 	{BGP4V2_PEER_LAST_ERROR_CODE_RECEIVED,
 	 ASN_UNSIGNED,
 	 RONLY,
 	 bgpv2PeerErrorsTable,
 	 6,
-	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_CODE_RECEIVED, 1, 4}},
+	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_CODE_RECEIVED, 1, 1}},
 	{BGP4V2_PEER_LAST_ERROR_CODE_RECEIVED,
 	 ASN_UNSIGNED,
 	 RONLY,
 	 bgpv2PeerErrorsTable,
 	 6,
-	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_CODE_RECEIVED, 2, 16}},
+	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_CODE_RECEIVED, 2, 2}},
 	{BGP4V2_PEER_LAST_ERROR_SUBCODE_RECEIVED,
 	 ASN_UNSIGNED,
 	 RONLY,
 	 bgpv2PeerErrorsTable,
 	 6,
-	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_SUBCODE_RECEIVED, 1, 4}},
+	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_SUBCODE_RECEIVED, 1, 1}},
 	{BGP4V2_PEER_LAST_ERROR_SUBCODE_RECEIVED,
 	 ASN_UNSIGNED,
 	 RONLY,
 	 bgpv2PeerErrorsTable,
 	 6,
-	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_SUBCODE_RECEIVED, 2, 16}},
+	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_SUBCODE_RECEIVED, 2, 2}},
 	{BGP4V2_PEER_LAST_ERROR_RECEIVED_TIME,
 	 ASN_TIMETICKS,
 	 RONLY,
 	 bgpv2PeerErrorsTable,
 	 6,
-	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_RECEIVED_TIME, 1, 4}},
+	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_RECEIVED_TIME, 1, 1}},
 	{BGP4V2_PEER_LAST_ERROR_RECEIVED_TIME,
 	 ASN_TIMETICKS,
 	 RONLY,
 	 bgpv2PeerErrorsTable,
 	 6,
-	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_RECEIVED_TIME, 2, 16}},
+	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_RECEIVED_TIME, 2, 2}},
 	{BGP4V2_PEER_LAST_ERROR_RECEIVED_TEXT,
 	 ASN_OCTET_STR,
 	 RONLY,
 	 bgpv2PeerErrorsTable,
 	 6,
-	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_RECEIVED_TEXT, 1, 4}},
+	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_RECEIVED_TEXT, 1, 1}},
 	{BGP4V2_PEER_LAST_ERROR_RECEIVED_TEXT,
 	 ASN_OCTET_STR,
 	 RONLY,
 	 bgpv2PeerErrorsTable,
 	 6,
-	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_RECEIVED_TEXT, 2, 16}},
+	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_RECEIVED_TEXT, 2, 2}},
 	{BGP4V2_PEER_LAST_ERROR_RECEIVED_DATA,
 	 ASN_OCTET_STR,
 	 RONLY,
 	 bgpv2PeerErrorsTable,
 	 6,
-	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_RECEIVED_DATA, 1, 4}},
+	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_RECEIVED_DATA, 1, 1}},
 	{BGP4V2_PEER_LAST_ERROR_RECEIVED_DATA,
 	 ASN_OCTET_STR,
 	 RONLY,
 	 bgpv2PeerErrorsTable,
 	 6,
-	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_RECEIVED_DATA, 2, 16}},
+	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_RECEIVED_DATA, 2, 2}},
 	{BGP4V2_PEER_LAST_ERROR_CODE_SENT,
 	 ASN_UNSIGNED,
 	 RONLY,
 	 bgpv2PeerErrorsTable,
 	 6,
-	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_CODE_SENT, 1, 4}},
+	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_CODE_SENT, 1, 1}},
 	{BGP4V2_PEER_LAST_ERROR_CODE_SENT,
 	 ASN_UNSIGNED,
 	 RONLY,
 	 bgpv2PeerErrorsTable,
 	 6,
-	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_CODE_SENT, 2, 16}},
+	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_CODE_SENT, 2, 2}},
 	{BGP4V2_PEER_LAST_ERROR_SUBCODE_SENT,
 	 ASN_UNSIGNED,
 	 RONLY,
 	 bgpv2PeerErrorsTable,
 	 6,
-	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_SUBCODE_SENT, 1, 4}},
+	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_SUBCODE_SENT, 1, 1}},
 	{BGP4V2_PEER_LAST_ERROR_SUBCODE_SENT,
 	 ASN_UNSIGNED,
 	 RONLY,
 	 bgpv2PeerErrorsTable,
 	 6,
-	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_SUBCODE_SENT, 2, 16}},
+	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_SUBCODE_SENT, 2, 2}},
 	{BGP4V2_PEER_LAST_ERROR_SENT_TIME,
 	 ASN_TIMETICKS,
 	 RONLY,
 	 bgpv2PeerErrorsTable,
 	 6,
-	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_SENT_TIME, 1, 4}},
+	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_SENT_TIME, 1, 1}},
 	{BGP4V2_PEER_LAST_ERROR_SENT_TIME,
 	 ASN_TIMETICKS,
 	 RONLY,
 	 bgpv2PeerErrorsTable,
 	 6,
-	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_SENT_TIME, 2, 16}},
+	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_SENT_TIME, 2, 2}},
 	{BGP4V2_PEER_LAST_ERROR_SENT_TEXT,
 	 ASN_OCTET_STR,
 	 RONLY,
 	 bgpv2PeerErrorsTable,
 	 6,
-	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_SENT_TEXT, 1, 4}},
+	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_SENT_TEXT, 1, 1}},
 	{BGP4V2_PEER_LAST_ERROR_SENT_TEXT,
 	 ASN_OCTET_STR,
 	 RONLY,
 	 bgpv2PeerErrorsTable,
 	 6,
-	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_SENT_TEXT, 2, 16}},
+	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_SENT_TEXT, 2, 2}},
 	{BGP4V2_PEER_LAST_ERROR_SENT_DATA,
 	 ASN_OCTET_STR,
 	 RONLY,
 	 bgpv2PeerErrorsTable,
 	 6,
-	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_SENT_DATA, 1, 4}},
+	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_SENT_DATA, 1, 1}},
 	{BGP4V2_PEER_LAST_ERROR_SENT_DATA,
 	 ASN_OCTET_STR,
 	 RONLY,
 	 bgpv2PeerErrorsTable,
 	 6,
-	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_SENT_DATA, 2, 16}},
+	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_SENT_DATA, 2, 2}},
 	/* bgp4V2PeerEventTimesEntry */
 	{BGP4V2_PEER_FSM_ESTABLISHED_TIME,
 	 ASN_UNSIGNED,
 	 RONLY,
 	 bgpv2PeerEventTimesTable,
 	 6,
-	 {1, 4, 1, BGP4V2_PEER_FSM_ESTABLISHED_TIME, 1, 4}},
+	 {1, 4, 1, BGP4V2_PEER_FSM_ESTABLISHED_TIME, 1, 1}},
 	{BGP4V2_PEER_FSM_ESTABLISHED_TIME,
 	 ASN_UNSIGNED,
 	 RONLY,
 	 bgpv2PeerEventTimesTable,
 	 6,
-	 {1, 4, 1, BGP4V2_PEER_FSM_ESTABLISHED_TIME, 2, 16}},
+	 {1, 4, 1, BGP4V2_PEER_FSM_ESTABLISHED_TIME, 2, 2}},
 	{BGP4V2_PEER_PEER_IN_UPDATES_ELAPSED_TIME,
 	 ASN_UNSIGNED,
 	 RONLY,
 	 bgpv2PeerEventTimesTable,
 	 6,
-	 {1, 4, 1, BGP4V2_PEER_PEER_IN_UPDATES_ELAPSED_TIME, 1, 4}},
+	 {1, 4, 1, BGP4V2_PEER_PEER_IN_UPDATES_ELAPSED_TIME, 1, 1}},
 	{BGP4V2_PEER_PEER_IN_UPDATES_ELAPSED_TIME,
 	 ASN_UNSIGNED,
 	 RONLY,
 	 bgpv2PeerEventTimesTable,
 	 6,
-	 {1, 4, 1, BGP4V2_PEER_PEER_IN_UPDATES_ELAPSED_TIME, 2, 16}},
+	 {1, 4, 1, BGP4V2_PEER_PEER_IN_UPDATES_ELAPSED_TIME, 2, 2}},
 	/* bgp4V2NlriTable */
 	{BGP4V2_NLRI_INDEX,
 	 ASN_UNSIGNED,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_INDEX, 1, 4}},
+	 {1, 9, 1, BGP4V2_NLRI_INDEX, 1, 1}},
 	{BGP4V2_NLRI_INDEX,
 	 ASN_UNSIGNED,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_INDEX, 2, 16}},
+	 {1, 9, 1, BGP4V2_NLRI_INDEX, 2, 2}},
 	{BGP4V2_NLRI_AFI,
 	 ASN_INTEGER,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_AFI, 1, 4}},
+	 {1, 9, 1, BGP4V2_NLRI_AFI, 1, 1}},
 	{BGP4V2_NLRI_AFI,
 	 ASN_INTEGER,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_AFI, 2, 16}},
+	 {1, 9, 1, BGP4V2_NLRI_AFI, 2, 2}},
 	{BGP4V2_NLRI_SAFI,
 	 ASN_INTEGER,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_SAFI, 1, 4}},
+	 {1, 9, 1, BGP4V2_NLRI_SAFI, 1, 1}},
 	{BGP4V2_NLRI_SAFI,
 	 ASN_INTEGER,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_SAFI, 2, 16}},
+	 {1, 9, 1, BGP4V2_NLRI_SAFI, 2, 2}},
 	{BGP4V2_NLRI_PREFIX_TYPE,
 	 ASN_INTEGER,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_PREFIX_TYPE, 1, 4}},
+	 {1, 9, 1, BGP4V2_NLRI_PREFIX_TYPE, 1, 1}},
 	{BGP4V2_NLRI_PREFIX_TYPE,
 	 ASN_INTEGER,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_PREFIX_TYPE, 2, 16}},
+	 {1, 9, 1, BGP4V2_NLRI_PREFIX_TYPE, 2, 2}},
 	{BGP4V2_NLRI_PREFIX,
 	 ASN_OCTET_STR,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_PREFIX, 1, 4}},
+	 {1, 9, 1, BGP4V2_NLRI_PREFIX, 1, 1}},
 	{BGP4V2_NLRI_PREFIX,
 	 ASN_OCTET_STR,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_PREFIX, 2, 16}},
+	 {1, 9, 1, BGP4V2_NLRI_PREFIX, 2, 2}},
 	{BGP4V2_NLRI_PREFIX_LEN,
 	 ASN_UNSIGNED,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_PREFIX_LEN, 1, 4}},
+	 {1, 9, 1, BGP4V2_NLRI_PREFIX_LEN, 1, 1}},
 	{BGP4V2_NLRI_PREFIX_LEN,
 	 ASN_UNSIGNED,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_PREFIX_LEN, 2, 16}},
+	 {1, 9, 1, BGP4V2_NLRI_PREFIX_LEN, 2, 2}},
 	{BGP4V2_NLRI_BEST,
 	 ASN_INTEGER,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_BEST, 1, 4}},
+	 {1, 9, 1, BGP4V2_NLRI_BEST, 1, 1}},
 	{BGP4V2_NLRI_BEST,
 	 ASN_INTEGER,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_BEST, 2, 16}},
+	 {1, 9, 1, BGP4V2_NLRI_BEST, 2, 2}},
 	{BGP4V2_NLRI_CALC_LOCAL_PREF,
 	 ASN_UNSIGNED,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_CALC_LOCAL_PREF, 1, 4}},
+	 {1, 9, 1, BGP4V2_NLRI_CALC_LOCAL_PREF, 1, 1}},
 	{BGP4V2_NLRI_CALC_LOCAL_PREF,
 	 ASN_UNSIGNED,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_CALC_LOCAL_PREF, 2, 16}},
+	 {1, 9, 1, BGP4V2_NLRI_CALC_LOCAL_PREF, 2, 2}},
 	{BGP4V2_NLRI_ORIGIN,
 	 ASN_INTEGER,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_ORIGIN, 1, 4}},
+	 {1, 9, 1, BGP4V2_NLRI_ORIGIN, 1, 1}},
 	{BGP4V2_NLRI_ORIGIN,
 	 ASN_INTEGER,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_ORIGIN, 2, 16}},
+	 {1, 9, 1, BGP4V2_NLRI_ORIGIN, 2, 2}},
 	{BGP4V2_NLRI_NEXT_HOP_ADDR_TYPE,
 	 ASN_INTEGER,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_NEXT_HOP_ADDR_TYPE, 1, 4}},
+	 {1, 9, 1, BGP4V2_NLRI_NEXT_HOP_ADDR_TYPE, 1, 1}},
 	{BGP4V2_NLRI_NEXT_HOP_ADDR_TYPE,
 	 ASN_INTEGER,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_NEXT_HOP_ADDR_TYPE, 2, 16}},
+	 {1, 9, 1, BGP4V2_NLRI_NEXT_HOP_ADDR_TYPE, 2, 2}},
 	{BGP4V2_NLRI_NEXT_HOP_ADDR,
 	 ASN_OCTET_STR,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_NEXT_HOP_ADDR, 1, 4}},
+	 {1, 9, 1, BGP4V2_NLRI_NEXT_HOP_ADDR, 1, 1}},
 	{BGP4V2_NLRI_NEXT_HOP_ADDR,
 	 ASN_OCTET_STR,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_NEXT_HOP_ADDR, 2, 16}},
+	 {1, 9, 1, BGP4V2_NLRI_NEXT_HOP_ADDR, 2, 2}},
 	{BGP4V2_NLRI_LINK_LOCAL_NEXT_HOP_ADDR_TYPE,
 	 ASN_INTEGER,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_LINK_LOCAL_NEXT_HOP_ADDR_TYPE, 1, 4}},
+	 {1, 9, 1, BGP4V2_NLRI_LINK_LOCAL_NEXT_HOP_ADDR_TYPE, 1, 1}},
 	{BGP4V2_NLRI_LINK_LOCAL_NEXT_HOP_ADDR_TYPE,
 	 ASN_INTEGER,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_LINK_LOCAL_NEXT_HOP_ADDR_TYPE, 2, 16}},
+	 {1, 9, 1, BGP4V2_NLRI_LINK_LOCAL_NEXT_HOP_ADDR_TYPE, 2, 2}},
 	{BGP4V2_NLRI_LINK_LOCAL_NEXT_HOP_ADDR,
 	 ASN_OCTET_STR,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_LINK_LOCAL_NEXT_HOP_ADDR, 1, 4}},
+	 {1, 9, 1, BGP4V2_NLRI_LINK_LOCAL_NEXT_HOP_ADDR, 1, 1}},
 	{BGP4V2_NLRI_LINK_LOCAL_NEXT_HOP_ADDR,
 	 ASN_OCTET_STR,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_LINK_LOCAL_NEXT_HOP_ADDR, 2, 16}},
+	 {1, 9, 1, BGP4V2_NLRI_LINK_LOCAL_NEXT_HOP_ADDR, 2, 2}},
 	{BGP4V2_NLRI_LOCAL_PREF_PRESENT,
 	 ASN_INTEGER,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_LOCAL_PREF_PRESENT, 1, 4}},
+	 {1, 9, 1, BGP4V2_NLRI_LOCAL_PREF_PRESENT, 1, 1}},
 	{BGP4V2_NLRI_LOCAL_PREF_PRESENT,
 	 ASN_INTEGER,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_LOCAL_PREF_PRESENT, 2, 16}},
+	 {1, 9, 1, BGP4V2_NLRI_LOCAL_PREF_PRESENT, 2, 2}},
 	{BGP4V2_NLRI_LOCAL_PREF,
 	 ASN_UNSIGNED,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_LOCAL_PREF, 1, 4}},
+	 {1, 9, 1, BGP4V2_NLRI_LOCAL_PREF, 1, 1}},
 	{BGP4V2_NLRI_LOCAL_PREF,
 	 ASN_UNSIGNED,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_LOCAL_PREF, 2, 16}},
+	 {1, 9, 1, BGP4V2_NLRI_LOCAL_PREF, 2, 2}},
 	{BGP4V2_NLRI_MED_PRESENT,
 	 ASN_INTEGER,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_MED_PRESENT, 1, 4}},
+	 {1, 9, 1, BGP4V2_NLRI_MED_PRESENT, 1, 1}},
 	{BGP4V2_NLRI_MED_PRESENT,
 	 ASN_INTEGER,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_MED_PRESENT, 2, 16}},
+	 {1, 9, 1, BGP4V2_NLRI_MED_PRESENT, 2, 2}},
 	{BGP4V2_NLRI_MED,
 	 ASN_UNSIGNED,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_MED, 1, 4}},
+	 {1, 9, 1, BGP4V2_NLRI_MED, 1, 1}},
 	{BGP4V2_NLRI_MED,
 	 ASN_UNSIGNED,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_MED, 2, 16}},
+	 {1, 9, 1, BGP4V2_NLRI_MED, 2, 2}},
 	{BGP4V2_NLRI_ATOMIC_AGGREGATE,
 	 ASN_INTEGER,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_ATOMIC_AGGREGATE, 1, 4}},
+	 {1, 9, 1, BGP4V2_NLRI_ATOMIC_AGGREGATE, 1, 1}},
 	{BGP4V2_NLRI_ATOMIC_AGGREGATE,
 	 ASN_INTEGER,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_ATOMIC_AGGREGATE, 2, 16}},
+	 {1, 9, 1, BGP4V2_NLRI_ATOMIC_AGGREGATE, 2, 2}},
 	{BGP4V2_NLRI_AGGREGATOR_PRESENT,
 	 ASN_INTEGER,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_AGGREGATOR_PRESENT, 1, 4}},
+	 {1, 9, 1, BGP4V2_NLRI_AGGREGATOR_PRESENT, 1, 1}},
 	{BGP4V2_NLRI_AGGREGATOR_PRESENT,
 	 ASN_INTEGER,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_AGGREGATOR_PRESENT, 2, 16}},
+	 {1, 9, 1, BGP4V2_NLRI_AGGREGATOR_PRESENT, 2, 2}},
 	{BGP4V2_NLRI_AGGREGATOR_AS,
 	 ASN_UNSIGNED,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_AGGREGATOR_AS, 1, 4}},
+	 {1, 9, 1, BGP4V2_NLRI_AGGREGATOR_AS, 1, 1}},
 	{BGP4V2_NLRI_AGGREGATOR_AS,
 	 ASN_UNSIGNED,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_AGGREGATOR_AS, 2, 16}},
+	 {1, 9, 1, BGP4V2_NLRI_AGGREGATOR_AS, 2, 2}},
 	{BGP4V2_NLRI_AGGREGATOR_ADDR,
 	 ASN_OCTET_STR,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_AGGREGATOR_ADDR, 1, 4}},
+	 {1, 9, 1, BGP4V2_NLRI_AGGREGATOR_ADDR, 1, 1}},
 	{BGP4V2_NLRI_AGGREGATOR_ADDR,
 	 ASN_OCTET_STR,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_AGGREGATOR_ADDR, 2, 16}},
+	 {1, 9, 1, BGP4V2_NLRI_AGGREGATOR_ADDR, 2, 2}},
 	{BGP4V2_NLRI_AS_PATH_CALC_LENGTH,
 	 ASN_UNSIGNED,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_AS_PATH_CALC_LENGTH, 1, 4}},
+	 {1, 9, 1, BGP4V2_NLRI_AS_PATH_CALC_LENGTH, 1, 1}},
 	{BGP4V2_NLRI_AS_PATH_CALC_LENGTH,
 	 ASN_UNSIGNED,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_AS_PATH_CALC_LENGTH, 2, 16}},
+	 {1, 9, 1, BGP4V2_NLRI_AS_PATH_CALC_LENGTH, 2, 2}},
 	{BGP4V2_NLRI_AS_PATH_STRING,
 	 ASN_OCTET_STR,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_AS_PATH_STRING, 1, 4}},
+	 {1, 9, 1, BGP4V2_NLRI_AS_PATH_STRING, 1, 1}},
 	{BGP4V2_NLRI_AS_PATH_STRING,
 	 ASN_OCTET_STR,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_AS_PATH_STRING, 2, 16}},
+	 {1, 9, 1, BGP4V2_NLRI_AS_PATH_STRING, 2, 2}},
 	{BGP4V2_NLRI_AS_PATH,
 	 ASN_OCTET_STR,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_AS_PATH, 1, 4}},
+	 {1, 9, 1, BGP4V2_NLRI_AS_PATH, 1, 1}},
 	{BGP4V2_NLRI_AS_PATH,
 	 ASN_OCTET_STR,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_AS_PATH, 2, 16}},
+	 {1, 9, 1, BGP4V2_NLRI_AS_PATH, 2, 2}},
 	{BGP4V2_NLRI_PATH_ATTR_UNKNOWN,
 	 ASN_OCTET_STR,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_PATH_ATTR_UNKNOWN, 1, 4}},
+	 {1, 9, 1, BGP4V2_NLRI_PATH_ATTR_UNKNOWN, 1, 1}},
 	{BGP4V2_NLRI_PATH_ATTR_UNKNOWN,
 	 ASN_OCTET_STR,
 	 RONLY,
 	 bgp4v2PathAttrTable,
 	 6,
-	 {1, 9, 1, BGP4V2_NLRI_PATH_ATTR_UNKNOWN, 2, 16}},
+	 {1, 9, 1, BGP4V2_NLRI_PATH_ATTR_UNKNOWN, 2, 2}},
 };
 
 int bgp_snmp_bgp4v2_init(struct event_loop *tm)