Merge pull request #12501 from opensourcerouting/feature/bgp4v2_bgp4V2PeerEventTimesTable

bgpd: SNMP continued work on IPv6

2 files changed, 721 insertions, 1 deletions

diff --git a/bgpd/bgp_snmp_bgp4v2.c b/bgpd/bgp_snmp_bgp4v2.c
index 1be28e0b2d..9c91a30804 100644
--- a/bgpd/bgp_snmp_bgp4v2.c
+++ b/bgpd/bgp_snmp_bgp4v2.c
@@ -380,6 +380,397 @@ static uint8_t *bgpv2PeerErrorsTable(struct variable *v, oid name[],
 	return NULL;
 }
 
+static uint8_t *bgpv2PeerEventTimesTable(struct variable *v, oid name[],
+					 size_t *length, int exact,
+					 size_t *var_len,
+					 WriteMethod **write_method)
+{
+	struct peer *peer;
+	struct ipaddr addr = {};
+
+	if (smux_header_table(v, name, length, exact, var_len, write_method) ==
+	    MATCH_FAILED)
+		return NULL;
+
+	peer = bgpv2PeerTable_lookup(v, name, length, exact, &addr);
+	if (!peer)
+		return NULL;
+
+	switch (v->magic) {
+	case BGP4V2_PEER_FSM_ESTABLISHED_TIME:
+		if (!peer->uptime)
+			return SNMP_INTEGER(0);
+		else
+			return SNMP_INTEGER(monotime(NULL) - peer->uptime);
+	case BGP4V2_PEER_PEER_IN_UPDATES_ELAPSED_TIME:
+		if (!peer->update_time)
+			return SNMP_INTEGER(0);
+		else
+			return SNMP_INTEGER(monotime(NULL) - peer->update_time);
+	default:
+		break;
+	}
+
+	return NULL;
+}
+
+static struct bgp_path_info *
+bgp4v2PathAttrLookup(struct variable *v, oid name[], size_t *length,
+		     struct bgp *bgp, struct prefix *addr, int exact)
+{
+	oid *offset;
+	int offsetlen;
+	struct bgp_path_info *path;
+	struct bgp_dest *dest;
+	union sockunion su;
+	unsigned int len;
+	struct ipaddr paddr = {};
+	size_t namelen = v ? v->namelen : BGP4V2_NLRI_ENTRY_OFFSET;
+	sa_family_t family = name[namelen - 1] == 4 ? AF_INET : AF_INET6;
+	afi_t afi = AFI_IP;
+	size_t afi_len = IN_ADDR_SIZE;
+
+	if (family == AF_INET6) {
+		afi = AFI_IP6;
+		afi_len = IN6_ADDR_SIZE;
+	}
+
+#define BGP_NLRI_ENTRY_OFFSET (afi_len + 1 + afi_len)
+
+	sockunion_init(&su);
+
+	if (exact) {
+		if (*length - v->namelen != BGP_NLRI_ENTRY_OFFSET)
+			return NULL;
+
+		/* Set OID offset for prefix */
+		offset = name + v->namelen;
+		if (family == AF_INET)
+			oid2in_addr(offset, afi_len, &addr->u.prefix4);
+		else
+			oid2in6_addr(offset, &addr->u.prefix6);
+		offset += afi_len;
+
+		/* Prefix length */
+		addr->prefixlen = *offset;
+		addr->family = family;
+		offset++;
+
+		/* Peer address */
+		su.sin.sin_family = family;
+		if (family == AF_INET)
+			oid2in_addr(offset, afi_len, &su.sin.sin_addr);
+		else
+			oid2in6_addr(offset, &su.sin6.sin6_addr);
+
+		/* Lookup node */
+		dest = bgp_node_lookup(bgp->rib[afi][SAFI_UNICAST], addr);
+		if (dest) {
+			for (path = bgp_dest_get_bgp_path_info(dest); path;
+			     path = path->next)
+				if (sockunion_same(&path->peer->su, &su))
+					return path;
+
+			bgp_dest_unlock_node(dest);
+		}
+
+		return NULL;
+	}
+
+	offset = name + v->namelen;
+	offsetlen = *length - v->namelen;
+	len = offsetlen;
+
+	if (offsetlen == 0) {
+		dest = bgp_table_top(bgp->rib[afi][SAFI_UNICAST]);
+	} else {
+		if (len > afi_len)
+			len = afi_len;
+
+		if (family == AF_INET)
+			oid2in_addr(offset, len, &addr->u.prefix4);
+		else
+			oid2in6_addr(offset, &addr->u.prefix6);
+
+		offset += afi_len;
+		offsetlen -= afi_len;
+
+		if (offsetlen > 0)
+			addr->prefixlen = *offset;
+		else
+			addr->prefixlen = len * 8;
+
+		dest = bgp_node_get(bgp->rib[afi][SAFI_UNICAST], addr);
+
+		offset++;
+		offsetlen--;
+	}
+
+	if (offsetlen > 0) {
+		len = offsetlen;
+		if (len > afi_len)
+			len = afi_len;
+
+		if (family == AF_INET)
+			oid2in_addr(offset, len, &paddr.ip._v4_addr);
+		else
+			oid2in6_addr(offset, &paddr.ip._v6_addr);
+	} else {
+		if (family == AF_INET)
+			memset(&paddr.ip._v4_addr, 0, afi_len);
+		else
+			memset(&paddr.ip._v6_addr, 0, afi_len);
+	}
+
+	if (!dest)
+		return NULL;
+
+	while ((dest = bgp_route_next(dest))) {
+		struct bgp_path_info *min = NULL;
+
+		for (path = bgp_dest_get_bgp_path_info(dest); path;
+		     path = path->next) {
+			sa_family_t path_family =
+				sockunion_family(&path->peer->su);
+
+			if (path_family == AF_INET &&
+			    IPV4_ADDR_CMP(&paddr.ip._v4_addr,
+					  &path->peer->su.sin.sin_addr) < 0) {
+				if (!min ||
+				    (min &&
+				     IPV4_ADDR_CMP(
+					     &path->peer->su.sin.sin_addr,
+					     &min->peer->su.sin.sin_addr) < 0))
+					min = path;
+			} else if (path_family == AF_INET6 &&
+				   IPV6_ADDR_CMP(
+					   &paddr.ip._v6_addr,
+					   &path->peer->su.sin6.sin6_addr) <
+					   0) {
+				if (!min ||
+				    (min &&
+				     IPV6_ADDR_CMP(
+					     &path->peer->su.sin6.sin6_addr,
+					     &min->peer->su.sin6.sin6_addr) <
+					     0))
+					min = path;
+			}
+		}
+
+		if (min) {
+			const struct prefix *rn_p = bgp_dest_get_prefix(dest);
+
+			*length = v->namelen + BGP_NLRI_ENTRY_OFFSET;
+
+			offset = name + v->namelen;
+
+			if (family == AF_INET)
+				oid_copy_in_addr(offset, &rn_p->u.prefix4);
+			else
+				oid_copy_in6_addr(offset, &rn_p->u.prefix6);
+
+			offset += afi_len;
+			*offset = rn_p->prefixlen;
+			offset++;
+
+			if (family == AF_INET) {
+				oid_copy_in_addr(offset,
+						 &min->peer->su.sin.sin_addr);
+				addr->u.prefix4 = rn_p->u.prefix4;
+			} else {
+				oid_copy_in6_addr(
+					offset, &min->peer->su.sin6.sin6_addr);
+				addr->u.prefix6 = rn_p->u.prefix6;
+			}
+
+			addr->prefixlen = rn_p->prefixlen;
+
+			bgp_dest_unlock_node(dest);
+
+			return min;
+		}
+
+		if (family == AF_INET)
+			memset(&paddr.ip._v4_addr, 0, afi_len);
+		else
+			memset(&paddr.ip._v6_addr, 0, afi_len);
+	}
+
+	return NULL;
+}
+
+static uint8_t *bgp4v2PathAttrTable(struct variable *v, oid name[],
+				    size_t *length, int exact, size_t *var_len,
+				    WriteMethod **write_method)
+{
+	struct bgp *bgp;
+	struct bgp_path_info *path;
+	struct peer_af *paf = NULL;
+	struct prefix addr = {};
+	const struct prefix *prefix = NULL;
+	enum bgp_af_index index;
+
+	bgp = bgp_get_default();
+	if (!bgp)
+		return NULL;
+
+	if (smux_header_table(v, name, length, exact, var_len, write_method) ==
+	    MATCH_FAILED)
+		return NULL;
+
+	path = bgp4v2PathAttrLookup(v, name, length, bgp, &addr, exact);
+	if (!path)
+		return NULL;
+
+	prefix = bgp_dest_get_prefix(path->net);
+
+	AF_FOREACH (index) {
+		paf = path->peer->peer_af_array[index];
+		if (paf)
+			break;
+	}
+
+	switch (v->magic) {
+	case BGP4V2_NLRI_INDEX:
+		return SNMP_INTEGER(0);
+	case BGP4V2_NLRI_AFI:
+		if (paf)
+			return SNMP_INTEGER(paf->afi);
+		else
+			return SNMP_INTEGER(0);
+	case BGP4V2_NLRI_SAFI:
+		if (paf)
+			return SNMP_INTEGER(paf->safi);
+		else
+			return SNMP_INTEGER(0);
+	case BGP4V2_NLRI_PREFIX_TYPE:
+		if (paf)
+			return SNMP_INTEGER(paf->afi);
+		else
+			return SNMP_INTEGER(0);
+	case BGP4V2_NLRI_PREFIX:
+		if (prefix->family == AF_INET6)
+			return SNMP_IP6ADDRESS(prefix->u.prefix6);
+		else
+			return SNMP_IPADDRESS(prefix->u.prefix4);
+	case BGP4V2_NLRI_PREFIX_LEN:
+		return SNMP_INTEGER(prefix->prefixlen);
+	case BGP4V2_NLRI_BEST:
+		if (CHECK_FLAG(path->flags, BGP_PATH_SELECTED))
+			return SNMP_INTEGER(1);
+		else
+			return SNMP_INTEGER(0);
+	case BGP4V2_NLRI_CALC_LOCAL_PREF:
+		if (CHECK_FLAG(path->attr->flag,
+			       ATTR_FLAG_BIT(BGP_ATTR_LOCAL_PREF)))
+			return SNMP_INTEGER(path->attr->local_pref);
+		else
+			return SNMP_INTEGER(0);
+	case BGP4V2_NLRI_ORIGIN:
+		switch (path->attr->origin) {
+		case BGP_ORIGIN_IGP:
+			return SNMP_INTEGER(1);
+		case BGP_ORIGIN_EGP:
+			return SNMP_INTEGER(2);
+		case BGP_ORIGIN_INCOMPLETE:
+			return SNMP_INTEGER(3);
+		default:
+			return SNMP_INTEGER(0);
+		}
+	case BGP4V2_NLRI_NEXT_HOP_ADDR_TYPE:
+		switch (path->attr->mp_nexthop_len) {
+		case BGP_ATTR_NHLEN_IPV4:
+			return SNMP_INTEGER(1);
+		case BGP_ATTR_NHLEN_IPV6_GLOBAL:
+			return SNMP_INTEGER(2);
+		case BGP_ATTR_NHLEN_IPV6_GLOBAL_AND_LL:
+			if (path->attr->mp_nexthop_prefer_global)
+				return SNMP_INTEGER(2);
+			else
+				return SNMP_INTEGER(4);
+		default:
+			return SNMP_INTEGER(1);
+		}
+	case BGP4V2_NLRI_NEXT_HOP_ADDR:
+		switch (path->attr->mp_nexthop_len) {
+		case BGP_ATTR_NHLEN_IPV4:
+			return SNMP_IPADDRESS(path->attr->mp_nexthop_global_in);
+		case BGP_ATTR_NHLEN_IPV6_GLOBAL:
+			return SNMP_IP6ADDRESS(path->attr->mp_nexthop_global);
+		case BGP_ATTR_NHLEN_IPV6_GLOBAL_AND_LL:
+			if (path->attr->mp_nexthop_prefer_global)
+				return SNMP_IP6ADDRESS(
+					path->attr->mp_nexthop_global);
+			else
+				return SNMP_IP6ADDRESS(
+					path->attr->mp_nexthop_local);
+		default:
+			return SNMP_IPADDRESS(path->attr->nexthop);
+		}
+		break;
+	case BGP4V2_NLRI_LINK_LOCAL_NEXT_HOP_ADDR_TYPE:
+	case BGP4V2_NLRI_LINK_LOCAL_NEXT_HOP_ADDR:
+		/* Not properly defined in specification what should be here. */
+		break;
+	case BGP4V2_NLRI_LOCAL_PREF_PRESENT:
+		if (CHECK_FLAG(path->attr->flag,
+			       ATTR_FLAG_BIT(BGP_ATTR_LOCAL_PREF)))
+			return SNMP_INTEGER(1);
+		else
+			return SNMP_INTEGER(0);
+	case BGP4V2_NLRI_LOCAL_PREF:
+		if (CHECK_FLAG(path->attr->flag,
+			       ATTR_FLAG_BIT(BGP_ATTR_LOCAL_PREF)))
+			return SNMP_INTEGER(path->attr->local_pref);
+		else
+			return SNMP_INTEGER(0);
+	case BGP4V2_NLRI_MED_PRESENT:
+		if (CHECK_FLAG(path->attr->flag,
+			       ATTR_FLAG_BIT(BGP_ATTR_MULTI_EXIT_DISC)))
+			return SNMP_INTEGER(1);
+		else
+			return SNMP_INTEGER(0);
+	case BGP4V2_NLRI_MED:
+		if (CHECK_FLAG(path->attr->flag,
+			       ATTR_FLAG_BIT(BGP_ATTR_MULTI_EXIT_DISC)))
+			return SNMP_INTEGER(path->attr->local_pref);
+		else
+			return SNMP_INTEGER(0);
+	case BGP4V2_NLRI_ATOMIC_AGGREGATE:
+		if (CHECK_FLAG(path->attr->flag,
+			       ATTR_FLAG_BIT(BGP_ATTR_ATOMIC_AGGREGATE)))
+			return SNMP_INTEGER(1);
+		else
+			return SNMP_INTEGER(0);
+	case BGP4V2_NLRI_AGGREGATOR_PRESENT:
+		if (CHECK_FLAG(path->attr->flag,
+			       ATTR_FLAG_BIT(BGP_ATTR_AGGREGATOR)))
+			return SNMP_INTEGER(1);
+		else
+			return SNMP_INTEGER(0);
+	case BGP4V2_NLRI_AGGREGATOR_AS:
+		if (CHECK_FLAG(path->attr->flag,
+			       ATTR_FLAG_BIT(BGP_ATTR_AGGREGATOR)))
+			return SNMP_INTEGER(path->attr->aggregator_as);
+		else
+			return SNMP_INTEGER(0);
+	case BGP4V2_NLRI_AGGREGATOR_ADDR:
+		if (CHECK_FLAG(path->attr->flag,
+			       ATTR_FLAG_BIT(BGP_ATTR_AGGREGATOR)))
+			return SNMP_IPADDRESS(path->attr->aggregator_addr);
+		else
+			return SNMP_IPADDRESS(bgp_empty_addr);
+	case BGP4V2_NLRI_AS_PATH_CALC_LENGTH:
+		return SNMP_INTEGER(path->attr->aspath->segments->length);
+	case BGP4V2_NLRI_AS_PATH:
+		return aspath_snmp_pathseg(path->attr->aspath, var_len);
+	case BGP4V2_NLRI_PATH_ATTR_UNKNOWN:
+		*var_len = 0;
+		return NULL;
+	}
+	return NULL;
+}
+
 static struct variable bgpv2_variables[] = {
 	/* bgp4V2PeerEntry */
 	{BGP4V2_PEER_INSTANCE,
@@ -671,6 +1062,332 @@ static struct variable bgpv2_variables[] = {
 	 bgpv2PeerErrorsTable,
 	 6,
 	 {1, 3, 1, BGP4V2_PEER_LAST_ERROR_SENT_DATA, 2, 16}},
+	/* bgp4V2PeerEventTimesEntry */
+	{BGP4V2_PEER_FSM_ESTABLISHED_TIME,
+	 ASN_UNSIGNED,
+	 RONLY,
+	 bgpv2PeerEventTimesTable,
+	 6,
+	 {1, 4, 1, BGP4V2_PEER_FSM_ESTABLISHED_TIME, 1, 4}},
+	{BGP4V2_PEER_FSM_ESTABLISHED_TIME,
+	 ASN_UNSIGNED,
+	 RONLY,
+	 bgpv2PeerEventTimesTable,
+	 6,
+	 {1, 4, 1, BGP4V2_PEER_FSM_ESTABLISHED_TIME, 2, 16}},
+	{BGP4V2_PEER_PEER_IN_UPDATES_ELAPSED_TIME,
+	 ASN_UNSIGNED,
+	 RONLY,
+	 bgpv2PeerEventTimesTable,
+	 6,
+	 {1, 4, 1, BGP4V2_PEER_PEER_IN_UPDATES_ELAPSED_TIME, 1, 4}},
+	{BGP4V2_PEER_PEER_IN_UPDATES_ELAPSED_TIME,
+	 ASN_UNSIGNED,
+	 RONLY,
+	 bgpv2PeerEventTimesTable,
+	 6,
+	 {1, 4, 1, BGP4V2_PEER_PEER_IN_UPDATES_ELAPSED_TIME, 2, 16}},
+	/* bgp4V2NlriTable */
+	{BGP4V2_NLRI_INDEX,
+	 ASN_UNSIGNED,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_INDEX, 1, 4}},
+	{BGP4V2_NLRI_INDEX,
+	 ASN_UNSIGNED,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_INDEX, 2, 16}},
+	{BGP4V2_NLRI_AFI,
+	 ASN_INTEGER,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_AFI, 1, 4}},
+	{BGP4V2_NLRI_AFI,
+	 ASN_INTEGER,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_AFI, 2, 16}},
+	{BGP4V2_NLRI_SAFI,
+	 ASN_INTEGER,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_SAFI, 1, 4}},
+	{BGP4V2_NLRI_SAFI,
+	 ASN_INTEGER,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_SAFI, 2, 16}},
+	{BGP4V2_NLRI_PREFIX_TYPE,
+	 ASN_INTEGER,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_PREFIX_TYPE, 1, 4}},
+	{BGP4V2_NLRI_PREFIX_TYPE,
+	 ASN_INTEGER,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_PREFIX_TYPE, 2, 16}},
+	{BGP4V2_NLRI_PREFIX,
+	 ASN_OCTET_STR,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_PREFIX, 1, 4}},
+	{BGP4V2_NLRI_PREFIX,
+	 ASN_OCTET_STR,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_PREFIX, 2, 16}},
+	{BGP4V2_NLRI_PREFIX_LEN,
+	 ASN_UNSIGNED,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_PREFIX_LEN, 1, 4}},
+	{BGP4V2_NLRI_PREFIX_LEN,
+	 ASN_UNSIGNED,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_PREFIX_LEN, 2, 16}},
+	{BGP4V2_NLRI_BEST,
+	 ASN_INTEGER,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_BEST, 1, 4}},
+	{BGP4V2_NLRI_BEST,
+	 ASN_INTEGER,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_BEST, 2, 16}},
+	{BGP4V2_NLRI_CALC_LOCAL_PREF,
+	 ASN_UNSIGNED,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_CALC_LOCAL_PREF, 1, 4}},
+	{BGP4V2_NLRI_CALC_LOCAL_PREF,
+	 ASN_UNSIGNED,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_CALC_LOCAL_PREF, 2, 16}},
+	{BGP4V2_NLRI_ORIGIN,
+	 ASN_INTEGER,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_ORIGIN, 1, 4}},
+	{BGP4V2_NLRI_ORIGIN,
+	 ASN_INTEGER,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_ORIGIN, 2, 16}},
+	{BGP4V2_NLRI_NEXT_HOP_ADDR_TYPE,
+	 ASN_INTEGER,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_NEXT_HOP_ADDR_TYPE, 1, 4}},
+	{BGP4V2_NLRI_NEXT_HOP_ADDR_TYPE,
+	 ASN_INTEGER,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_NEXT_HOP_ADDR_TYPE, 2, 16}},
+	{BGP4V2_NLRI_NEXT_HOP_ADDR,
+	 ASN_OCTET_STR,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_NEXT_HOP_ADDR, 1, 4}},
+	{BGP4V2_NLRI_NEXT_HOP_ADDR,
+	 ASN_OCTET_STR,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_NEXT_HOP_ADDR, 2, 16}},
+	{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}},
+	{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}},
+	{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}},
+	{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}},
+	{BGP4V2_NLRI_LOCAL_PREF_PRESENT,
+	 ASN_INTEGER,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_LOCAL_PREF_PRESENT, 1, 4}},
+	{BGP4V2_NLRI_LOCAL_PREF_PRESENT,
+	 ASN_INTEGER,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_LOCAL_PREF_PRESENT, 2, 16}},
+	{BGP4V2_NLRI_LOCAL_PREF,
+	 ASN_UNSIGNED,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_LOCAL_PREF, 1, 4}},
+	{BGP4V2_NLRI_LOCAL_PREF,
+	 ASN_UNSIGNED,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_LOCAL_PREF, 2, 16}},
+	{BGP4V2_NLRI_MED_PRESENT,
+	 ASN_INTEGER,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_MED_PRESENT, 1, 4}},
+	{BGP4V2_NLRI_MED_PRESENT,
+	 ASN_INTEGER,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_MED_PRESENT, 2, 16}},
+	{BGP4V2_NLRI_MED,
+	 ASN_UNSIGNED,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_MED, 1, 4}},
+	{BGP4V2_NLRI_MED,
+	 ASN_UNSIGNED,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_MED, 2, 16}},
+	{BGP4V2_NLRI_ATOMIC_AGGREGATE,
+	 ASN_INTEGER,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_ATOMIC_AGGREGATE, 1, 4}},
+	{BGP4V2_NLRI_ATOMIC_AGGREGATE,
+	 ASN_INTEGER,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_ATOMIC_AGGREGATE, 2, 16}},
+	{BGP4V2_NLRI_AGGREGATOR_PRESENT,
+	 ASN_INTEGER,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_AGGREGATOR_PRESENT, 1, 4}},
+	{BGP4V2_NLRI_AGGREGATOR_PRESENT,
+	 ASN_INTEGER,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_AGGREGATOR_PRESENT, 2, 16}},
+	{BGP4V2_NLRI_AGGREGATOR_AS,
+	 ASN_UNSIGNED,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_AGGREGATOR_AS, 1, 4}},
+	{BGP4V2_NLRI_AGGREGATOR_AS,
+	 ASN_UNSIGNED,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_AGGREGATOR_AS, 2, 16}},
+	{BGP4V2_NLRI_AGGREGATOR_ADDR,
+	 ASN_OCTET_STR,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_AGGREGATOR_ADDR, 1, 4}},
+	{BGP4V2_NLRI_AGGREGATOR_ADDR,
+	 ASN_OCTET_STR,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_AGGREGATOR_ADDR, 2, 16}},
+	{BGP4V2_NLRI_AS_PATH_CALC_LENGTH,
+	 ASN_UNSIGNED,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_AS_PATH_CALC_LENGTH, 1, 4}},
+	{BGP4V2_NLRI_AS_PATH_CALC_LENGTH,
+	 ASN_UNSIGNED,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_AS_PATH_CALC_LENGTH, 2, 16}},
+	{BGP4V2_NLRI_AS_PATH_STRING,
+	 ASN_OCTET_STR,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_AS_PATH_STRING, 1, 4}},
+	{BGP4V2_NLRI_AS_PATH_STRING,
+	 ASN_OCTET_STR,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_AS_PATH_STRING, 2, 16}},
+	{BGP4V2_NLRI_AS_PATH,
+	 ASN_OCTET_STR,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_AS_PATH, 1, 4}},
+	{BGP4V2_NLRI_AS_PATH,
+	 ASN_OCTET_STR,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_AS_PATH, 2, 16}},
+	{BGP4V2_NLRI_PATH_ATTR_UNKNOWN,
+	 ASN_OCTET_STR,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_PATH_ATTR_UNKNOWN, 1, 4}},
+	{BGP4V2_NLRI_PATH_ATTR_UNKNOWN,
+	 ASN_OCTET_STR,
+	 RONLY,
+	 bgp4v2PathAttrTable,
+	 6,
+	 {1, 9, 1, BGP4V2_NLRI_PATH_ATTR_UNKNOWN, 2, 16}},
 };
 
 int bgp_snmp_bgp4v2_init(struct thread_master *tm)
diff --git a/bgpd/bgp_snmp_bgp4v2.h b/bgpd/bgp_snmp_bgp4v2.h
index 6980db9f8d..8b474c3887 100644
--- a/bgpd/bgp_snmp_bgp4v2.h
+++ b/bgpd/bgp_snmp_bgp4v2.h
@@ -61,7 +61,10 @@
 #define BGP4V2_PEER_FSM_ESTABLISHED_TIME 1
 #define BGP4V2_PEER_PEER_IN_UPDATES_ELAPSED_TIME 2
 
-/* bgp4V2NlriEntry */
+/* bgp4V2NlriEntry
+ * offset 1.3.6.1.3.5.1.1.9.1.x.(1|2).(4|16) = 13
+ */
+#define BGP4V2_NLRI_ENTRY_OFFSET 13
 #define BGP4V2_NLRI_INDEX 1
 #define BGP4V2_NLRI_AFI 2
 #define BGP4V2_NLRI_SAFI 3