From 9db25fb9e77499283dc30e853a4ae464824444ee Mon Sep 17 00:00:00 2001
From: ShaRose <ShawnAndrewRose@Gmail.Com>
Date: Mon, 16 Jul 2018 15:41:09 +0000
Subject: [PATCH] net/frr: cleaned up redistribute options (#628)

Added missing options, removed invalid and non-implemented ones (Babel,
PIM, IS-IS).

redistribute ospf requires additional arguments for ospf router, which
current configuration system does not support.
---
 net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/BGP.xml   | 2 --
 net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/OSPF6.xml | 1 +
 net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/RIP.xml   | 3 ---
 3 files changed, 1 insertion(+), 5 deletions(-)

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 1a49667a0..a3e862122 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
@@ -22,10 +22,8 @@
                 <multiple>Y</multiple>
                 <default></default>
                 <OptionValues>
-                        <babel>Babel routing protocol (Babel)</babel>
                         <ospf>Open Shortest Path First (OSPF)</ospf>
                         <connected>Connected routes (directly attached subnet or host)</connected>
-                        <isis>Intermediate System to Intermediate System (IS-IS)</isis>
                         <kernel>Kernel routes (not installed via the zebra RIB)</kernel>
                         <rip>Routing Information Protocol (RIP)</rip>
                         <static>Statically configured routes</static>
diff --git a/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/OSPF6.xml b/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/OSPF6.xml
index b61d5d2f7..28c134d82 100644
--- a/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/OSPF6.xml
+++ b/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/OSPF6.xml
@@ -13,6 +13,7 @@
                 <default></default>
                 <OptionValues>
                         <connected>Connected routes (directly attached subnet or host)</connected>
+                        <kernel>Kernel routes (not installed via the zebra RIB)</kernel>
                         <static>Statically configured routes</static>
                 </OptionValues>
         </redistribute>
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 2f228b63a..af72238fe 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
@@ -32,12 +32,9 @@
                 <multiple>Y</multiple>
                 <default></default>
                 <OptionValues>
-                        <babel>Babel routing protocol (Babel)</babel>
                         <bgp>Border Gateway Protocol (BGP)</bgp>
                         <connected>Connected routes (directly attached subnet or host)</connected>
-                        <isis>Intermediate System to Intermediate System (IS-IS)</isis>
                         <kernel>Kernel routes (not installed via the zebra RIB)</kernel>
-                        <pim>Protocol Independent Multicast (PIM)</pim>
                         <ospf>Open Shortest Path First (OSPF)</ospf>
                         <static>Statically configured routes</static>
                 </OptionValues>