From eacc857cdceb7bc898c62eac7fc16d5354126fdd Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Wed, 28 Apr 2021 22:08:51 +0200
Subject: [PATCH] net/frr: finalize BFD for BGP (#2364)

---
 net/frr/Makefile                                            | 1 +
 .../OPNsense/Quagga/forms/dialogEditBGPNeighbor.xml         | 6 ++++++
 net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/BGP.xml | 4 ++++
 .../opnsense/service/templates/OPNsense/Quagga/bgpd.conf    | 5 ++++-
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/net/frr/Makefile b/net/frr/Makefile
index 7aa041dd2..2b73a8a55 100644
--- a/net/frr/Makefile
+++ b/net/frr/Makefile
@@ -1,5 +1,6 @@
 PLUGIN_NAME=		frr
 PLUGIN_VERSION=		1.22
+PLUGIN_REVISION=    1
 PLUGIN_COMMENT=		The FRRouting Protocol Suite
 PLUGIN_DEPENDS=		frr7
 PLUGIN_MAINTAINER=	franz.fabian.94@gmail.com
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 146dff7db..649062d39 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
@@ -38,6 +38,12 @@
     <label>Multi-Hop</label>
     <type>checkbox</type>
   </field>
+  <field>
+    <id>neighbor.bfd</id>
+    <label>BFD</label>
+    <type>checkbox</type>
+    <help>You can enable BFD support for this neighbor.</help>
+  </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 e1106e13e..b657eba87 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
@@ -74,6 +74,10 @@
                                 <default>0</default>
                                 <Required>N</Required>
                         </multihop>
+                        <bfd type="BooleanField">
+                                <default>0</default>
+                                <Required>N</Required>
+                        </bfd>
                         <keepalive type="IntegerField">
                                 <Required>N</Required>
                                 <MinimumValue>1</MinimumValue>
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 bd2d0e3b3..c78857453 100644
--- a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/bgpd.conf
+++ b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/bgpd.conf
@@ -28,7 +28,10 @@ router bgp {{ OPNsense.quagga.bgp.asnumber }}
 {%     for neighbor in helpers.toList('OPNsense.quagga.bgp.neighbors.neighbor') %}
 {%       if neighbor.enabled == '1' %}
  neighbor {{ neighbor.address }} remote-as {{ neighbor.remoteas }}
-{%         if 'updatesource' in neighbor and neighbor.updatesource != '' %}
+{%         if 'bfd' in neighbor and neighbor.bfd == '1' %}
+ neighbor {{ neighbor.address }} bfd
+{%         endif %}
+ {%        if 'updatesource' in neighbor and neighbor.updatesource != '' %}
  neighbor {{ neighbor.address }} update-source {{ physical_interface(neighbor.updatesource) }}
 {%         endif %}
 {%         if 'multihop' in neighbor and neighbor.multihop == '1' %}