From 5c3d27cc5162a9c46ed200a78f6e482cb9b08fd5 Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Tue, 4 Jul 2023 11:23:59 +0200
Subject: [PATCH] net/frr: Add checkbox for bgp neighbor changes (#3490)

---
 net/frr/Makefile                                            | 2 +-
 net/frr/pkg-descr                                           | 4 ++++
 .../mvc/app/controllers/OPNsense/Quagga/forms/bgp.xml       | 6 ++++++
 net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/BGP.xml | 4 ++++
 .../opnsense/service/templates/OPNsense/Quagga/bgpd.conf    | 3 +++
 5 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/net/frr/Makefile b/net/frr/Makefile
index 9777e398b..d07fdad5a 100644
--- a/net/frr/Makefile
+++ b/net/frr/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		frr
-PLUGIN_VERSION=		1.33
+PLUGIN_VERSION=		1.34
 PLUGIN_COMMENT=		The FRRouting Protocol Suite
 PLUGIN_DEPENDS=		frr8
 PLUGIN_MAINTAINER=	franz.fabian.94@gmail.com
diff --git a/net/frr/pkg-descr b/net/frr/pkg-descr
index 00f77cfff..f142eaecf 100644
--- a/net/frr/pkg-descr
+++ b/net/frr/pkg-descr
@@ -12,6 +12,10 @@ WWW: https://frrouting.org/
 Plugin Changelog
 ================
 
+1.34
+
+* Add checkbox to log BGP neighbor changes
+
 1.33
 
 * Allow both IPv4 and IPv6 in BGP via setkey (contributed by as8net)
diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/bgp.xml b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/bgp.xml
index d759166c5..37b182e1a 100644
--- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/bgp.xml
+++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/bgp.xml
@@ -40,6 +40,12 @@
         <advanced>true</advanced>
         <help>When enabled (default), BGP only announces networks set at 'Network' if they are present in the routers routing table (alternatively, you can also set a null-route via System -> Routes). If disabled, all configured networks will be announced.</help>
     </field>
+    <field>
+        <id>bgp.logneighborchanges</id>
+        <label>Log Neighbor Changes</label>
+        <type>checkbox</type>
+        <help>This will activate exetended logging of BGP neighbor changes.</help>
+    </field>
     <field>
         <id>bgp.redistribute</id>
         <label>Route Redistribution</label>
diff --git a/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/BGP.xml b/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/BGP.xml
index 626da2339..c84a70943 100644
--- a/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/BGP.xml
+++ b/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/BGP.xml
@@ -25,6 +25,10 @@
             <default>1</default>
             <Required>Y</Required>
         </networkimportcheck>
+        <logneighborchanges type="BooleanField">
+            <default>0</default>
+            <Required>Y</Required>
+        </logneighborchanges>
         <networks type="CSVListField">
             <default></default>
             <Required>N</Required>
diff --git a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/bgpd.conf b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/bgpd.conf
index 041f0b8e5..45ad88f64 100644
--- a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/bgpd.conf
+++ b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/bgpd.conf
@@ -43,6 +43,9 @@ frr defaults {{ OPNsense.quagga.general.profile }}
 !
 {% if helpers.exists('OPNsense.quagga.bgp.asnumber') and OPNsense.quagga.bgp.asnumber != '' %}
 router bgp {{ OPNsense.quagga.bgp.asnumber }}
+{%   if not helpers.empty('OPNsense.quagga.bgp.logneighborchanges') %}
+ bgp log-neighbor-changes
+{%   endif %}
  no bgp default ipv4-unicast
  no bgp ebgp-requires-policy
 {%   if helpers.exists('OPNsense.quagga.bgp.networkimportcheck') and OPNsense.quagga.bgp.networkimportcheck == '1' %}