From 52de9c3412613819f2e143f035de452aba637ada Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Fri, 17 Nov 2023 09:23:34 +0100
Subject: [PATCH] net/frr: Add Adjacency logging (#3675)

---
 net/frr/Makefile                                             | 3 +--
 net/frr/pkg-descr                                            | 4 ++++
 .../mvc/app/controllers/OPNsense/Quagga/forms/ospf.xml       | 5 +++++
 net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/OSPF.xml | 5 +++++
 .../opnsense/service/templates/OPNsense/Quagga/ospfd.conf    | 3 +++
 5 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/net/frr/Makefile b/net/frr/Makefile
index 8cdba41d5..6edb0abf9 100644
--- a/net/frr/Makefile
+++ b/net/frr/Makefile
@@ -1,6 +1,5 @@
 PLUGIN_NAME=		frr
-PLUGIN_VERSION=		1.36
-PLUGIN_REVISION=	1
+PLUGIN_VERSION=		1.37
 PLUGIN_COMMENT=		The FRRouting Protocol Suite
 PLUGIN_DEPENDS=		frr8
 PLUGIN_MAINTAINER=	franz.fabian.94@gmail.com
diff --git a/net/frr/pkg-descr b/net/frr/pkg-descr
index ba4c22076..71f40d515 100644
--- a/net/frr/pkg-descr
+++ b/net/frr/pkg-descr
@@ -12,6 +12,10 @@ WWW: https://frrouting.org/
 Plugin Changelog
 ================
 
+1.37
+
+* Add Adjacency Logging to OSPF
+
 1.36
 
 * Added default-information originate option for OSPFv3
diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/ospf.xml b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/ospf.xml
index ba766ee93..7a1fb79db 100644
--- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/ospf.xml
+++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/ospf.xml
@@ -49,6 +49,11 @@
         <type>dropdown</type>
         <help>Route Map to set for Redistribution.</help>
     </field>
+    <field>
+        <id>ospf.logadjacencychanges</id>
+        <label>Log Adjacency Changes</label>
+        <type>checkbox</type>
+    </field>
     <field>
         <id>ospf.originate</id>
         <label>Advertise Default Gateway</label>
diff --git a/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/OSPF.xml b/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/OSPF.xml
index 22f3cecc4..cc19aa602 100644
--- a/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/OSPF.xml
+++ b/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/OSPF.xml
@@ -22,10 +22,15 @@
             <MaximumValue>4294967</MaximumValue>
             <ValidationMessage>Must be a number between 1 and 4294967.</ValidationMessage>
         </costreference>
+	<logadjacencychanges type="BooleanField">
+            <default>0</default>
+            <Required>Y</Required>
+        </logadjacencychanges>
         <originate type="BooleanField">
             <default>0</default>
             <Required>Y</Required>
         </originate>
+	    
         <originatealways type="BooleanField">
             <default>0</default>
             <Required>Y</Required>
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 017749645..91c282218 100644
--- a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/ospfd.conf
+++ b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/ospfd.conf
@@ -47,6 +47,9 @@ interface {{ physical_interface(interface.interfacename) }}
 {% endif %}
 !
 router ospf
+{% if helpers.exists('OPNsense.quagga.ospf.logadjacencychanges') and OPNsense.quagga.ospf.logadjacencychanges == '1' %}
+ log-adjacency-changes
+{% endif %}
 {% if helpers.exists('OPNsense.quagga.ospf.costreference') and OPNsense.quagga.ospf.costreference != '' %}
  auto-cost reference-bandwidth {{ OPNsense.quagga.ospf.costreference }}
 {% endif %}