Skip to content

Add OSPF Router ID #299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fichtner merged 3 commits into from
Sep 29, 2017
Merged

Add OSPF Router ID #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
31ebef3
Add OSPF Router ID
Sep 29, 2017
3eb7d4e
fix indent
Sep 29, 2017
09a77db
fix makefile indent; bump version
Sep 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions net/quagga/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PLUGIN_NAME= quagga
PLUGIN_VERSION= 1.4.1
PLUGIN_COMMENT= Quagga Routing Suite
PLUGIN_DEPENDS= quagga ruby
PLUGIN_MAINTAINER= franz.fabian.94@gmail.com
PLUGIN_NAME= quagga
PLUGIN_VERSION= 1.4.2
PLUGIN_COMMENT= Quagga Routing Suite
PLUGIN_DEPENDS= quagga ruby
PLUGIN_MAINTAINER= franz.fabian.94@gmail.com

.include "../../Mk/plugins.mk"
7 changes: 7 additions & 0 deletions net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/ospf.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@
<type>checkbox</type>
<help>This will activate the OSPF service if routing protocols are enabled in "General".</help>
</field>
<field>
<id>ospf.routerid</id>
<label>Router ID</label>
<type>text</type>
<advanced>true</advanced>
<help>If you have a CARP setup, you may want to configure a router id in case of a conflict.</help>
</field>
<field>
<id>ospf.passiveinterfaces</id>
<label>Passive Interfaces</label>
Expand Down
5 changes: 5 additions & 0 deletions net/quagga/src/opnsense/mvc/app/models/OPNsense/Quagga/OSPF.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@
<default>0</default>
<Required>Y</Required>
</enabled>
<routerid type="TextField">
<default></default>
<Required>N</Required>
<mask>/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/</mask>
</routerid>
<originate type="BooleanField">
<default>0</default>
<Required>Y</Required>
Expand Down
3 changes: 3 additions & 0 deletions net/quagga/src/opnsense/service/templates/OPNsense/Quagga/ospfd.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ interface {{ physical_interface(interface.interfacename) }}
{% endif %}
!
router ospf
{% if helpers.exists('OPNsense.quagga.ospf.routerid') and OPNsense.quagga.ospf.routerid != '' %}
ospf router-id {{ OPNsense.quagga.ospf.routerid }}
{% endif %}
{% if helpers.exists('OPNsense.quagga.ospf.redistribute') and OPNsense.quagga.ospf.redistribute != '' %}
{% for line in OPNsense.quagga.ospf.redistribute.split(',') %}
redistribute {{ line }}
Expand Down