From e77541ecc3012aa461a03337d9efbef8b792891d Mon Sep 17 00:00:00 2001
From: r3m8 <r3m8@tuta.com>
Date: Mon, 8 Jun 2026 15:29:09 +0200
Subject: [PATCH] net/frr: add BFD strict mode for BGP neighbors (#5315)

* net/frr: add BFD strict mode for BGP neighbors

* net/frr: refactor BFD event handler and config generation
---
 .../OPNsense/Quagga/forms/dialogEditBGPNeighbor.xml  | 12 ++++++++++++
 .../opnsense/mvc/app/models/OPNsense/Quagga/BGP.xml  |  3 ++-
 .../opnsense/mvc/app/views/OPNsense/Quagga/bgp.volt  |  8 ++++++++
 .../service/templates/OPNsense/Quagga/bgpd.conf      |  2 +-
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditBGPNeighbor.xml b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditBGPNeighbor.xml
index 5ace4e998..245b6505c 100644
--- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditBGPNeighbor.xml
+++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditBGPNeighbor.xml
@@ -172,6 +172,18 @@
       <visible>false</visible>
     </grid_view>
   </field>
+  <field>
+    <id>neighbor.bfd_strict</id>
+    <label>BFD Strict Mode</label>
+    <type>checkbox</type>
+    <help>Strict mode requires the BFD session to be established before allowing BGP to connect. If BFD goes down, BGP immediately closes the session. This prevents BGP sessions from remaining up when the underlying link is down. Requires BFD to be enabled.</help>
+    <style>bfd_strict_mode</style>
+    <grid_view>
+      <type>boolean</type>
+      <formatter>boolean</formatter>
+      <visible>false</visible>
+    </grid_view>
+  </field>
   <field>
     <id>neighbor.keepalive</id>
     <label>Keepalive</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 986bd202c..4397fd4a1 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
@@ -1,7 +1,7 @@
 <model>
     <mount>//OPNsense/quagga/bgp</mount>
     <description>BGP Routing configuration</description>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
     <items>
         <enabled type="BooleanField">
             <Default>0</Default>
@@ -108,6 +108,7 @@
                 <rrclient type="BooleanField"/>
                 <soft_reconfiguration_inbound type="BooleanField"/>
                 <bfd type="BooleanField"/>
+                <bfd_strict type="BooleanField"/>
                 <keepalive type="IntegerField">
                     <MinimumValue>1</MinimumValue>
                     <MaximumValue>1000</MaximumValue>
diff --git a/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/bgp.volt b/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/bgp.volt
index 5123843fb..9cac76ec2 100644
--- a/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/bgp.volt
+++ b/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/bgp.volt
@@ -30,6 +30,14 @@ POSSIBILITY OF SUCH DAMAGE.
 
 <script>
     $(document).ready(function() {
+        $(document).on('change', '#neighbor\\.bfd', function(){
+            if ($(this).is(':checked')) {
+                $(".bfd_strict_mode").closest('tr').show();
+            } else {
+                $(".bfd_strict_mode").closest('tr').hide();
+            }
+        });
+
         mapDataToFormUI({'frm_bgp_settings':"/api/quagga/bgp/get"}).done(function(data){
             formatTokenizersUI();
             $('.selectpicker').selectpicker('refresh');
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 11613b2a1..807e77e43 100644
--- a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/bgpd.conf
+++ b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/bgpd.conf
@@ -127,7 +127,7 @@ router bgp {{ OPNsense.quagga.bgp.asnumber }}
  neighbor {{ neighbor.address }} description {{ neighbor.description }}
 {%         endif %}
 {%         if neighbor.bfd|default('') == '1' %}
- neighbor {{ neighbor.address }} bfd
+ neighbor {{ neighbor.address }} bfd {% if neighbor.bfd_strict|default('') == '1' %}strict{% endif %}
 {%         endif %}
 {%         if 'password' in neighbor and neighbor.password != '' %}
  neighbor {{ neighbor.address }} password {{ neighbor.password }}