From cf49a530302b3b4874fd7b176045bb94b33922a5 Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Mon, 2 Dec 2019 21:13:42 +0100
Subject: [PATCH] net/frr: add default-metric to RIP (#1601)

* Update pkg-descr

* Update rip.xml

* Update RIP.xml

* Update ripd.conf

* Update ripd.conf

* Update net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/rip.xml

Co-Authored-By: Fabian Franz BSc <fabianfrz@users.noreply.github.com>
---
 net/frr/pkg-descr                                         | 1 +
 .../mvc/app/controllers/OPNsense/Quagga/forms/rip.xml     | 6 ++++++
 .../src/opnsense/mvc/app/models/OPNsense/Quagga/RIP.xml   | 8 ++++++--
 .../opnsense/service/templates/OPNsense/Quagga/ripd.conf  | 3 +++
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/net/frr/pkg-descr b/net/frr/pkg-descr
index 8bc4814a6..4491ec4e2 100644
--- a/net/frr/pkg-descr
+++ b/net/frr/pkg-descr
@@ -14,6 +14,7 @@ Plugin Changelog
 1.13
 
 * Fix wrong match statement for IPv6 route-maps
+* Allow to set default-metric for RIP protocol
 
 1.12
 
diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/rip.xml b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/rip.xml
index 6140168de..3b2ff4494 100644
--- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/rip.xml
+++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/rip.xml
@@ -33,4 +33,10 @@
         <allownew>true</allownew>
         <help>Enter your networks in CIDR notation like 127.0.0.0/8.</help>
     </field>
+    <field>
+        <id>rip.defaultmetric</id>
+        <label>Default Metric</label>
+        <type>text</type>
+        <help>Set the default metric to a value between 1 and 16.</help>
+    </field>
 </form>
diff --git a/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/RIP.xml b/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/RIP.xml
index 8be5be59d..bb315566b 100644
--- a/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/RIP.xml
+++ b/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/RIP.xml
@@ -1,7 +1,7 @@
 <model>
     <mount>//OPNsense/quagga/rip</mount>
     <description>RIP Routing configuration</description>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
     <items>
         <enabled type="BooleanField">
             <default>0</default>
@@ -18,7 +18,6 @@
             <Required>Y</Required>
             <mask>/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\/\d{1,2},)*(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\/\d{1,2})$/</mask>
         </networks>
-
         <passiveinterfaces type="InterfaceField">
                 <Required>N</Required>
                 <multiple>Y</multiple>
@@ -40,5 +39,10 @@
                         <static>Statically configured routes</static>
                 </OptionValues>
         </redistribute>
+        <defaultmetric type="IntegerField">
+            <MinimumValue>1</MinimumValue>
+            <MaximumValue>16</MaximumValue>
+            <Required>N</Required>
+        </defaultmetric>
     </items>
 </model>
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 e032f2f57..6c5756f02 100644
--- a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/ripd.conf
+++ b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/ripd.conf
@@ -28,6 +28,9 @@ router rip
 {% for line in OPNsense.quagga.rip.passiveinterfaces.split(',') %}
  passive-interface {{ physical_interface(line) }}
 {% endfor %}{% endif %}
+{% if helpers.exists('OPNsense.quagga.rip.defaultmetric') and OPNsense.quagga.rip.defaultmetric != '' %}
+ default-metric {{ OPNsense.quagga.rip.defaultmetric }}
+{% endif %}
 !
 line vty
 !