From d06cf1bbf6199fde020f77b829a8f4f2689c65e3 Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Fri, 14 Dec 2018 17:13:39 +0100
Subject: [PATCH] net/frr: Route-Map match Prefix-List (#1002)

---
 .../OPNsense/Quagga/Api/BgpController.php          |  2 +-
 .../Quagga/forms/dialogEditBGPRouteMaps.xml        | 12 ++++++++++--
 .../mvc/app/models/OPNsense/Quagga/BGP.xml         | 14 +++++++++++++-
 .../mvc/app/views/OPNsense/Quagga/bgp.volt         |  1 +
 .../service/templates/OPNsense/Quagga/bgpd.conf    | 11 +++++++++++
 5 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/BgpController.php b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/BgpController.php
index 3d7e0567e..554f61bab 100644
--- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/BgpController.php
+++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/BgpController.php
@@ -137,7 +137,7 @@ class BgpController extends ApiMutableModelControllerBase
     {
         return $this->searchBase(
             'routemaps.routemap',
-            array("enabled", "name", "action", "id", "match", "set")
+            array("enabled", "name", "action", "id", "match", "match2", "set")
         );
     }
 
diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditBGPRouteMaps.xml b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditBGPRouteMaps.xml
index 22b8eac93..bd4e8380f 100644
--- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditBGPRouteMaps.xml
+++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditBGPRouteMaps.xml
@@ -29,12 +29,20 @@
     <type>select_multiple</type>
     <style>tokenize</style>
     <allownew>true</allownew>
-    <help>Select the AS-Path list</help>
+    <help>Select the AS-Path List.</help>
+  </field>
+  <field>
+    <id>routemap.match2</id>
+    <label>Prefix List</label>
+    <type>select_multiple</type>
+    <style>tokenize</style>
+    <allownew>true</allownew>
+    <help>Select the Prefix List.</help>
   </field>
     <field>
     <id>routemap.set</id>
     <label>Set</label>
     <type>text</type>
-    <help>Free text field for your set, please be careful! You can set e.g. "local-prefernce 300" or "community 1:1" (http://www.nongnu.org/quagga/docs/docs-multi/Route-Map-Set-Command.html#Route-Map-Set-Command)</help>
+    <help>Free text field for your set, please be careful! You can set e.g. "local-preference 300" or "community 1:1" (http://www.nongnu.org/quagga/docs/docs-multi/Route-Map-Set-Command.html#Route-Map-Set-Command)</help>
   </field>
 </form>
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 3f7b30962..cb361fa7d 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.0.1</version>
+    <version>1.0.2</version>
     <items>
         <enabled type="BooleanField">
             <default>0</default>
@@ -219,6 +219,18 @@
                                 <Multiple>Y</Multiple>
                                 <Required>N</Required>
                         </match>
+                        <match2 type="ModelRelationField">
+                                <Model>
+                                        <template>
+                                                <source>OPNsense.quagga.bgp</source>
+                                                <items>prefixlists.prefixlist</items>
+                                                <display>name</display>
+                                        </template>
+                                </Model>
+                                <ValidationMessage>Related item not found</ValidationMessage>
+                                <Multiple>N</Multiple>
+                                <Required>N</Required>
+                        </match2>
                         <set type="TextField">
                                 <default></default>
                                 <Required>Y</Required>
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 e5818125a..0661e48ae 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
@@ -139,6 +139,7 @@ POSSIBILITY OF SUCH DAMAGE.
                     <th data-column-id="action" data-type="string" data-visible="true">{{ lang._('Action') }}</th>
                     <th data-column-id="id" data-type="string" data-visible="true">{{ lang._('ID') }}</th>
                     <th data-column-id="match" data-type="string" data-visible="true">{{ lang._('AS Path List') }}</th>
+                    <th data-column-id="match2" data-type="string" data-visible="true">{{ lang._('Prefix List') }}</th>
                     <th data-column-id="set" data-type="string" data-visible="true">{{ lang._('Set') }}</th>
                     <th data-column-id="uuid" data-type="string" data-identifier="true" data-visible="false">{{ lang._('ID') }}</th>
                     <th data-column-id="commands" data-formatter="commands" data-sortable="false">{{ lang._('Commands') }}</th>
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 e971062be..45d9e4fdd 100644
--- a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/bgpd.conf
+++ b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/bgpd.conf
@@ -191,6 +191,17 @@ route-map {{ routemap.name }} {{ routemap.action }} {{ routemap.id }}
 {%         if routemap.set != '' %}
  set {{ routemap.set }}
 {%         endif %}
+{%         if routemap.match2|default("") != "" %}
+{%           for prefixlist in routemap.match2.split(",") %}
+{%             set prefixlist_data = helpers.getUUID(prefixlist) %}
+{%             if 'match2' in routemap and routemap.match2 != '' %}
+ match ip address prefix-list {{ prefixlist_data.name }}
+{%             endif %}
+{%           endfor %}
+{%         endif %}
+{%         if routemap.set != '' %}
+ set {{ routemap.set }}
+{%         endif %}
 {%       endif %}
 {%     endfor %}
 {%   endif %}