summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin Young <qlyoung@users.noreply.github.com>2019-09-09 15:12:36 -0400
committerGitHub <noreply@github.com>2019-09-09 15:12:36 -0400
commitc0643af64efd384f2bc864cc496350a00d6e81ae (patch)
tree7f4f4bd8550122368b8328961b5593221fcfc423
parent1ce14168b3a84798f64ad908fd5d225b70d8f952 (diff)
parentdf9e8ae7229ef7a07f57f2d77e0e5c8eb0729702 (diff)
Merge pull request #4952 from mjstapp/fix_bgp_peer_hook
bgpd: fix build breakage after hook re-definition
-rw-r--r--bgpd/bgp_bmp.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/bgpd/bgp_bmp.c b/bgpd/bgp_bmp.c
index 8fca202345..3af373b562 100644
--- a/bgpd/bgp_bmp.c
+++ b/bgpd/bgp_bmp.c
@@ -663,6 +663,11 @@ static int bmp_peer_established(struct peer *peer)
if (!bmpbgp)
return 0;
+ /* Check if this peer just went to Established */
+ if ((peer->last_major_event != OpenConfirm) ||
+ !(peer_established(peer)))
+ return 0;
+
if (peer->doppelganger && (peer->doppelganger->status != Deleted)) {
struct bmp_bgp_peer *bbpeer, *bbdopp;
@@ -2226,7 +2231,7 @@ static int bgp_bmp_module_init(void)
{
hook_register(bgp_packet_dump, bmp_mirror_packet);
hook_register(bgp_packet_send, bmp_outgoing_packet);
- hook_register(peer_established, bmp_peer_established);
+ hook_register(peer_status_changed, bmp_peer_established);
hook_register(peer_backward_transition, bmp_peer_backward);
hook_register(bgp_process, bmp_process);
hook_register(bgp_inst_config_write, bmp_config_write);