Skip to content
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

Jump to bottom

Allow quagga ospf stub, not so stub and totally stub areas (Feature #3303) #233

Merged
merged 7 commits into from
Dec 19, 2016
Merged

Allow quagga ospf stub, not so stub and totally stub areas (Feature #3303) #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2d44084
Allow quagga ospf stub, not so stub and totally stub areas (Feature #…
doktornotor Dec 17, 2016
80ded08
Allow quagga ospf stub, not so stub and totally stub areas (Feature #…
doktornotor Dec 17, 2016
009a005
Bump port version
doktornotor Dec 17, 2016
ddaf710
Reword description, conflicts should be handled by pkg now.
doktornotor Dec 17, 2016
6c07db0
Reword description, conflicts should be handled by pkg now.
doktornotor Dec 17, 2016
ed6fbb7
Remove some copy-paste nonsense, these files are not shipped with the…
doktornotor Dec 17, 2016
a9bf9f1
Fix option value
doktornotor Dec 19, 2016
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
2 changes: 1 addition & 1 deletion net/pfSense-pkg-Quagga_OSPF/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# $FreeBSD$

PORTNAME= pfSense-pkg-Quagga_OSPF
PORTVERSION= 0.6.15
PORTVERSION= 0.6.16
CATEGORIES= net
MASTER_SITES= # empty
DISTFILES= # empty
Expand Down
6 changes: 1 addition & 5 deletions net/pfSense-pkg-Quagga_OSPF/files/etc/inc/priv/quagga_ospfd.priv.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* quagga_ospfd.priv.inc
*
* part of pfSense (https://www.pfsense.org)
* Copyright (c) 2015 Rubicon Communications, LLC (Netgate)
* Copyright (c) 2015-2016 Rubicon Communications, LLC (Netgate)
* All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -29,14 +29,10 @@ $priv_list['page-services-quagga']['match'] = array();
$priv_list['page-services-quagga']['match'][] = "pkg.php?xml=quagga_ospfd.xml*";
$priv_list['page-services-quagga']['match'][] = "pkg.php?xml=quagga_ospfd_interfaces.xml*";
$priv_list['page-services-quagga']['match'][] = "pkg.php?xml=quagga_ospfd_raw.xml*";
$priv_list['page-services-quagga']['match'][] = "pkg.php?xml=bind_views.xml*";
$priv_list['page-services-quagga']['match'][] = "pkg.php?xml=bind_zones.xml*";

$priv_list['page-services-quagga']['match'][] = "pkg_edit.php?xml=quagga_ospfd.xml*";
$priv_list['page-services-quagga']['match'][] = "pkg_edit.php?xml=quagga_ospfd_interfaces.xml*";
$priv_list['page-services-quagga']['match'][] = "pkg_edit.php?xml=quagga_ospfd_raw.xml*";
$priv_list['page-services-quagga']['match'][] = "pkg_edit.php?xml=bind_views.xml*";
$priv_list['page-services-quagga']['match'][] = "pkg_edit.php?xml=bind_zones.xml*";

$priv_list['page-services-quagga']['match'][] = "status_ospfd.php*";

Expand Down
11 changes: 10 additions & 1 deletion net/pfSense-pkg-Quagga_OSPF/files/usr/local/pkg/quagga_ospfd.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,17 @@ function quagga_ospfd_install_conf() {
if ($ospfd_conf['routerid']) {
$conffile .= " ospf router-id {$ospfd_conf['routerid']}\n";
}
if ($ospfd_conf['updatefib']) {
/* In package versions <=0.6.15, this used to a checkbox handling stub areas only
* Leave the first check here
*/
if ($ospfd_conf['updatefib'] == "on" ) {
$conffile .= " area {$ospfd_conf['area']} stub\n";
} elseif ($ospfd_conf['updatefib'] == "stub") {
$conffile .= " area {$ospfd_conf['area']} stub\n";
} elseif ($ospfd_conf['updatefib'] == "nosum") {
$conffile .= " area {$ospfd_conf['area']} stub no-summary\n";
} elseif ($ospfd_conf['updatefib'] == "nssa") {
$conffile .= " area {$ospfd_conf['area']} nssa\n";
}
if ($ospfd_conf['logging'] && $ospfd_conf['adjacencylog']) {
$conffile .= " log-adjacency-changes detail\n";
Expand Down
11 changes: 9 additions & 2 deletions net/pfSense-pkg-Quagga_OSPF/files/usr/local/pkg/quagga_ospfd.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,15 @@
<field>
<fielddescr>Disable FIB updates (Routing table)</fielddescr>
<fieldname>updatefib</fieldname>
<description>Disables the updating of the host routing table(turns into stub router).</description>
<type>checkbox</type>
<description>Disables the updating of the host routing table (turns into stub router).</description>
<type>select</type>
<default_value>none</default_value>
<options>
<option><name>None (FIB updates enabled) (default)</name><value>none</value></option>
<option><name>Stub Area (stub)</name><value>stub</value></option>
<option><name>Totally Stub (no-summary)</name><value>nosum</value></option>
<option><name>Not so Stub Area (nssa)</name><value>nssa</value></option>
</options>
</field>
<field>
<fielddescr>Redistribute connected subnets</fielddescr>
Expand Down
2 changes: 1 addition & 1 deletion net/pfSense-pkg-Quagga_OSPF/files/usr/local/share/pfSense-pkg-Quagga_OSPF/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<name>Quagga OSPF</name>
<internal_name>Quagga_OSPF</internal_name>
<descr><![CDATA[OSPF routing protocol using Quagga.&lt;br /&gt;
&lt;strong&gt;WARNING! Installs files to the same place as OpenBGPD. Installing both will break things.&lt;/strong&gt;]]></descr>
&lt;strong&gt;Conflicts with OpenBGPD; both packages cannot be installed at the same time.&lt;/strong&gt;]]></descr>
<version>%%PKGVERSION%%</version>
<configurationfile>quagga_ospfd.xml</configurationfile>
</package>
Expand Down
5 changes: 2 additions & 3 deletions net/pfSense-pkg-Quagga_OSPF/pkg-descr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
OSPF routing protocol using Quagga.<br />
<strong>WARNING! Installs files to the same place as
OpenBGPD. Installing both will break things.</strong>
OSPF routing protocol using Quagga.
Conflicts with OpenBGPD; both packages cannot be installed at the same time.