From bcda3348297d3f86630b13a463aa30cd77eb5b97 Mon Sep 17 00:00:00 2001
From: Marc Leuser <marcquark@users.noreply.github.com>
Date: Sun, 13 Dec 2020 08:36:04 +0100
Subject: [PATCH] net/frr: Add FRR profile selection (defaults directive)
 (#2131)

---
 net/frr/pkg-descr                                        | 1 +
 .../app/controllers/OPNsense/Quagga/forms/general.xml    | 7 +++++++
 .../opnsense/mvc/app/models/OPNsense/Quagga/General.xml  | 9 +++++++++
 .../opnsense/service/templates/OPNsense/Quagga/bgpd.conf | 3 +++
 .../service/templates/OPNsense/Quagga/ospf6d.conf        | 3 +++
 .../service/templates/OPNsense/Quagga/ospfd.conf         | 3 +++
 .../opnsense/service/templates/OPNsense/Quagga/ripd.conf | 3 +++
 .../service/templates/OPNsense/Quagga/zebra.conf         | 3 +++
 8 files changed, 32 insertions(+)

diff --git a/net/frr/pkg-descr b/net/frr/pkg-descr
index 087fcf136..5b865aa85 100644
--- a/net/frr/pkg-descr
+++ b/net/frr/pkg-descr
@@ -19,6 +19,7 @@ Plugin Changelog
 
 * OSPF influence interface cost via carp
 * Uniform logging
+* Add configuration profile selection
 
 1.18
 
diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/general.xml b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/general.xml
index 2fcfbc2b9..29c3e7bd7 100644
--- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/general.xml
+++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/general.xml
@@ -5,6 +5,13 @@
         <type>checkbox</type>
         <help>This will activate the routing service.</help>
     </field>
+    <field>
+        <id>general.profile</id>
+        <label>Profile</label>
+        <type>dropdown</type>
+        <advanced>true</advanced>
+        <help><![CDATA[Control FRR's default profile. "traditional" is the default, "datacenter" is more aggressive. Please refer to the <a href="http://docs.frrouting.org/en/latest/basic.html#profiles">FRR documentation</a> for more information.]]></help>
+    </field>
     <field>
         <id>general.enablecarp</id>
         <label>Enable CARP Failover</label>
diff --git a/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/General.xml b/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/General.xml
index 80d9576eb..de9a496bd 100644
--- a/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/General.xml
+++ b/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/General.xml
@@ -7,6 +7,15 @@
             <default>0</default>
             <Required>Y</Required>
         </enabled>
+        <profile type="OptionField">
+            <Required>Y</Required>
+            <multiple>N</multiple>
+            <default>traditional</default>
+            <OptionValues>
+                <traditional>Traditional</traditional>
+                <datacenter>Datacenter</datacenter>
+            </OptionValues>
+        </profile>
         <enablecarp type="BooleanField">
             <default>0</default>
             <Required>Y</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 86a75860a..4bd7d7ef6 100644
--- a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/bgpd.conf
+++ b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/bgpd.conf
@@ -8,6 +8,9 @@
 {%   if helpers.exists('OPNsense.quagga.general.enablesyslog') and OPNsense.quagga.general.enablesyslog == '1' %}
 log syslog {{ OPNsense.quagga.general.sysloglevel }}
 {%   endif %}
+{%   if helpers.exists('OPNsense.quagga.general.profile') %}
+frr defaults {{ OPNsense.quagga.general.profile }}
+{%   endif %}
 {% endif %}
 !
 !
diff --git a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/ospf6d.conf b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/ospf6d.conf
index b58d95986..603950f66 100644
--- a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/ospf6d.conf
+++ b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/ospf6d.conf
@@ -11,6 +11,9 @@
 {%   if helpers.exists('OPNsense.quagga.general.enablesyslog') and OPNsense.quagga.general.enablesyslog == '1' %}
 log syslog {{ OPNsense.quagga.general.sysloglevel }}
 {%   endif %}
+{%   if helpers.exists('OPNsense.quagga.general.profile') %}
+frr defaults {{ OPNsense.quagga.general.profile }}
+{%   endif %}
 {% endif %}
 !
 !
diff --git a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/ospfd.conf b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/ospfd.conf
index ff4acea71..dda33b080 100644
--- a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/ospfd.conf
+++ b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/ospfd.conf
@@ -11,6 +11,9 @@
 {%   if helpers.exists('OPNsense.quagga.general.enablesyslog') and OPNsense.quagga.general.enablesyslog == '1' %}
 log syslog {{ OPNsense.quagga.general.sysloglevel }}
 {%   endif %}
+{%   if helpers.exists('OPNsense.quagga.general.profile') %}
+frr defaults {{ OPNsense.quagga.general.profile }}
+{%   endif %}
 {% endif %}
 !
 !
diff --git a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/ripd.conf b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/ripd.conf
index ffb74650e..70532d4f1 100644
--- a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/ripd.conf
+++ b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/ripd.conf
@@ -8,6 +8,9 @@
 {%   if helpers.exists('OPNsense.quagga.general.enablesyslog') and OPNsense.quagga.general.enablesyslog == '1' %}
 log syslog {{ OPNsense.quagga.general.sysloglevel }}
 {%   endif %}
+{%   if helpers.exists('OPNsense.quagga.general.profile') %}
+frr defaults {{ OPNsense.quagga.general.profile }}
+{%   endif %}
 {% endif %}
 !
 router rip
diff --git a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/zebra.conf b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/zebra.conf
index 01a97a6f4..06de1506b 100644
--- a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/zebra.conf
+++ b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/zebra.conf
@@ -3,6 +3,9 @@
 ! Zebra configuration saved from vty
 !   2017/03/03 20:21:04
 !
+{% if helpers.exists('OPNsense.quagga.general.profile') %}
+frr defaults {{ OPNsense.quagga.general.profile }}
+{% endif %}
 {% if helpers.exists('OPNsense.quagga.general.enablesyslog') and OPNsense.quagga.general.enablesyslog == '1' %}
 log syslog {{ OPNsense.quagga.general.sysloglevel }}
 {% endif %}