From: Mark Stapp <mjs@voltanet.io>
Date: Mon, 9 Sep 2019 16:03:30 +0000 (-0400)
Subject: bgpd: fix build breakage after hook re-definition
X-Git-Tag: base_7.3~376^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=df9e8ae7229ef7a07f57f2d77e0e5c8eb0729702;p=mirror%2Ffrr.git

bgpd: fix build breakage after hook re-definition

A recent merge re-defined a hook, but one file did not get
the appropriate change.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
---

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);