From: Maria Matejka <mq@ucw.cz>
Date: Thu, 12 Oct 2023 08:57:55 +0000 (+0200)
Subject: BGP/BMP: fixed build with no bmp at all
X-Git-Tag: v3.0.0~396^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2f08c382a2adbbbd94c5cd7d996ce9175e0fb9c;p=thirdparty%2Fbird.git

BGP/BMP: fixed build with no bmp at all
---

diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index a6e9cf839..7ae688f50 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -125,7 +125,9 @@
 #include "lib/string.h"
 
 #include "bgp.h"
+#ifdef CONFIG_BMP
 #include "proto/bmp/bmp.h"
+#endif
 
 
 static list STATIC_LIST_INIT(bgp_sockets);		/* Global list of listening sockets */
@@ -692,8 +694,11 @@ bgp_conn_enter_established_state(struct bgp_conn *conn)
 
   bgp_conn_set_state(conn, BS_ESTABLISHED);
   proto_notify_state(&p->p, PS_UP);
+
+#ifdef CONFIG_BMP
   bmp_peer_up(p, conn->local_open_msg, conn->local_open_length,
 	      conn->remote_open_msg, conn->remote_open_length);
+#endif
 }
 
 static void
@@ -706,9 +711,11 @@ bgp_conn_leave_established_state(struct bgp_conn *conn, struct bgp_proto *p)
   if (p->p.proto_state == PS_UP)
     bgp_stop(p, 0, NULL, 0);
 
+#ifdef CONFIG_BMP
   bmp_peer_down(p, p->last_error_class,
 		conn->notify_code, conn->notify_subcode,
 		conn->notify_data, conn->notify_size);
+#endif
 }
 
 void
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index 6b11eaf7e..ff51e309f 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -26,7 +26,9 @@
 #include "nest/cli.h"
 
 #include "bgp.h"
+#ifdef CONFIG_BMP
 #include "proto/bmp/bmp.h"
+#endif
 
 
 #define BGP_RR_REQUEST		0