OSPFv2: key id (#943)

* net/frr: OSPF Key ID
* net/frr: version bump

net/frr/Makefile

@@ -1,5 +1,5 @@
 PLUGIN_NAME=		frr
-PLUGIN_VERSION=		1.5
+PLUGIN_VERSION=		1.6
 PLUGIN_COMMENT=		The FRRouting Protocol Suite
 PLUGIN_DEPENDS=		frr5 ruby
 PLUGIN_CONFLICTS=	quagga

net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPFInterface.xml

@@ -20,6 +20,12 @@
     <label>Authentication Key</label>
     <type>text</type>
   </field>
+  <field>
+    <id>interface.authkey_id</id>
+    <label>Authentication Key ID</label>
+    <advanced>true</advanced>
+    <type>text</type>
+  </field>
   <field>
     <id>interface.cost</id>
     <label>Cost</label>

net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/OSPF.xml

@@ -1,7 +1,7 @@
 <model>
     <mount>//OPNsense/quagga/ospf</mount>
     <description>OSPF Routing configuration</description>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
     <items>
         <enabled type="BooleanField">
             <default>0</default>
@@ -118,6 +118,13 @@
                                 <Required>N</Required>
                                 <mask>/^\S+$/</mask>
                         </authkey>
+                        <authkey_id type="IntegerField">
+                                <default>1</default>
+                                <MinimumValue>1</MinimumValue>
+                                <MaximumValue>255</MaximumValue>
+                                <Required>Y</Required>
+                                <ValidationMessage>The authentication key ID must be between 1 and 255.</ValidationMessage>
+                        </authkey_id>
                         <cost type="IntegerField">
                                 <default></default>
                                 <MinimumValue>0</MinimumValue>

net/frr/src/opnsense/service/templates/OPNsense/Quagga/ospfd.conf

@@ -27,7 +27,7 @@ interface {{ physical_interface(interface.interfacename) }}
 }}{% endif %}
 {{       cline("authentication",interface.authtype)
 }}{% if interface.authtype and interface.authtype == 'message-digest'
-%}{{       cline("message-digest-key 1 md5",interface.authkey)
+%}{{       cline("message-digest-key " + interface.authkey_id + " md5",interface.authkey)
 }}{% endif
 %}{{       cline("cost",interface.cost)
 }}{{       cline("dead-interval",interface.deadinterval)