From d313882e24d510cbc75411dddc071a7c7cade7a9 Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Sun, 22 Sep 2019 15:03:25 +0200
Subject: [PATCH] net/frr: add some OSPFv3 features and fixes (#1508)

* Update pkg-descr

* Update ospf6d.conf

* Update dialogEditOSPF6Interface.xml

* Update OSPF6.xml

* Update ospf6d.conf

* Update Makefile

* Update ospf6d.conf

* Update ospf6d.conf

* Update OSPF6.xml

* Update OSPF6.xml

* Update OSPF6.xml
---
 net/frr/Makefile                                          | 3 +--
 net/frr/pkg-descr                                         | 6 ++++++
 .../OPNsense/Quagga/forms/dialogEditOSPF6Interface.xml    | 5 +++++
 .../src/opnsense/mvc/app/models/OPNsense/Quagga/OSPF6.xml | 8 +++++---
 .../service/templates/OPNsense/Quagga/ospf6d.conf         | 6 ++++++
 5 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/net/frr/Makefile b/net/frr/Makefile
index fdda857f17..84b541f4b8 100644
--- a/net/frr/Makefile
+++ b/net/frr/Makefile
@@ -1,6 +1,5 @@
 PLUGIN_NAME=		frr
-PLUGIN_VERSION=		1.11
-PLUGIN_REVISION=        3
+PLUGIN_VERSION=		1.12
 PLUGIN_COMMENT=		The FRRouting Protocol Suite
 PLUGIN_DEPENDS=		frr6 ruby
 PLUGIN_MAINTAINER=	franz.fabian.94@gmail.com
diff --git a/net/frr/pkg-descr b/net/frr/pkg-descr
index 244bf743d4..8779f99c10 100644
--- a/net/frr/pkg-descr
+++ b/net/frr/pkg-descr
@@ -11,6 +11,12 @@ switching and routing, Internet access routers, and Internet peering.
 Plugin Changelog
 ================
 
+1.12
+
+* Add passive-interface to OSPFv3 (by Michael Muenz)
+* Allow to set area per interface for OSPFv2 (by @twoequaldots)
+* Allow to set ebgp-multihop in BGP (by @bpeavy and Greg Goodrich)
+
 1.11
 
 * Add route-map support to redistribution in OSPF
diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPF6Interface.xml b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPF6Interface.xml
index 491f8a7b30..5455751673 100644
--- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPF6Interface.xml
+++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPF6Interface.xml
@@ -16,6 +16,11 @@
     <type>text</type>
     <help>Area in wildcard mask style like 0.0.0.0 and no decimal 0</help>
   </field>
+  <field>
+    <id>interface.passive</id>
+    <label>Passive Interface</label>
+    <type>checkbox</type>
+  </field>
   <field>
     <id>interface.cost</id>
     <label>Cost</label>
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 8b512d57ed..6670a07892 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
@@ -1,7 +1,7 @@
 <model>
     <mount>//OPNsense/quagga/ospf6</mount>
     <description>OSPFv3 Routing configuration</description>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
     <items>
         <enabled type="BooleanField">
             <default>0</default>
@@ -42,6 +42,10 @@
                                 <Required>Y</Required>
                                 <mask>/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/</mask>
                         </area>
+                        <passive type="BooleanField">
+                                <default>0</default>
+                                <Required>Y</Required>
+                        </passive>
                         <cost type="IntegerField">
                                 <default></default>
                                 <MinimumValue>0</MinimumValue>
@@ -90,8 +94,6 @@
                                 <default></default>
                                 <OptionValues>
                                         <broadcast>Broadcast multi-access network</broadcast>
-                                        <non-broadcast>NBMA network</non-broadcast>
-                                        <point-to-multipoint>Point-to-multipoint network</point-to-multipoint>
                                         <point-to-point>Point-to-point network</point-to-point>
                                 </OptionValues>
                         </networktype>
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 9e6c69505a..ec92113a02 100644
--- a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/ospf6d.conf
+++ b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/ospf6d.conf
@@ -22,6 +22,12 @@ log syslog {{ OPNsense.quagga.general.sysloglevel }}
 {%   for interface in helpers.toList('OPNsense.quagga.ospf6.interfaces.interface') %}
 {%     if interface.enabled == '1' %}
 interface {{ physical_interface(interface.interfacename) }}
+{% if interface.networktype  %}
+  ipv6 ospf6 network {{ interface.networktype }}
+{% endif %}
+{% if interface.passive == '1' %}
+  ipv6 ospf6 passive
+{% endif %}
 {{       cline("cost",interface.cost)
 }}{{       cline("dead-interval",interface.deadinterval)
 }}{{       cline("hello-interval",interface.hellointerval)