summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2020-03-19 21:06:48 -0400
committerGitHub <noreply@github.com>2020-03-19 21:06:48 -0400
commit0d41ab62b33e575b4a038c26a3cdb6d43db74adf (patch)
tree4bcebde3de3dec1fc9713b429cf00b2081ef4dc5
parent9c23deece23e7684f3bd6cd556b4d4ba4a4d2047 (diff)
parentfd2e2db68040223c2851394e3791c433ece7ca16 (diff)
Merge pull request #6052 from pureport/PE-2051_fix_snmp_trap
bgpd: Fixed snmp and bmp 'just Established' test.
-rw-r--r--bgpd/bgp_bmp.c3
-rw-r--r--bgpd/bgp_snmp.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/bgpd/bgp_bmp.c b/bgpd/bgp_bmp.c
index 24a9cab5d1..32865da376 100644
--- a/bgpd/bgp_bmp.c
+++ b/bgpd/bgp_bmp.c
@@ -664,8 +664,7 @@ static int bmp_peer_established(struct peer *peer)
return 0;
/* Check if this peer just went to Established */
- if ((peer->last_major_event != OpenConfirm) ||
- !(peer_established(peer)))
+ if ((peer->ostatus != OpenConfirm) || !(peer_established(peer)))
return 0;
if (peer->doppelganger && (peer->doppelganger->status != Deleted)) {
diff --git a/bgpd/bgp_snmp.c b/bgpd/bgp_snmp.c
index d507161052..5cf0b73984 100644
--- a/bgpd/bgp_snmp.c
+++ b/bgpd/bgp_snmp.c
@@ -858,7 +858,7 @@ static int bgpTrapEstablished(struct peer *peer)
oid index[sizeof(oid) * IN_ADDR_SIZE];
/* Check if this peer just went to Established */
- if ((peer->last_major_event != OpenConfirm) || !(peer_established(peer)))
+ if ((peer->ostatus != OpenConfirm) || !(peer_established(peer)))
return 0;
ret = inet_aton(peer->host, &addr);