aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorJohn Grange <john@sd-networks.net>2012-05-28 19:38:43 -0700
committerJohn Grange <john@sd-networks.net>2012-05-28 19:38:43 -0700
commitfc5bf06ee85e1783eed5a570c4d2c5eb47adc936 (patch)
tree09f90ec3454996e81b4c3a48c42d3a1d1c83d7d6 /config
parent0098b559c1dff219f982690c15b365c814c5d787 (diff)
downloadpfsense-packages-fc5bf06ee85e1783eed5a570c4d2c5eb47adc936.tar.gz
pfsense-packages-fc5bf06ee85e1783eed5a570c4d2c5eb47adc936.tar.bz2
pfsense-packages-fc5bf06ee85e1783eed5a570c4d2c5eb47adc936.zip
Add option to redistribute kernel routing table
Quagga "redistribute static" behaves differently than ospfd redistribute static = only quagga static routes (in zebra) redistribute kernel = outside routes (from pfsense) Signed-off-by: John Grange <john@sd-networks.net>
Diffstat (limited to 'config')
-rw-r--r--config/quagga_ospfd/quagga_ospfd.inc4
-rw-r--r--config/quagga_ospfd/quagga_ospfd.xml9
2 files changed, 12 insertions, 1 deletions
diff --git a/config/quagga_ospfd/quagga_ospfd.inc b/config/quagga_ospfd/quagga_ospfd.inc
index 4b7e007e..ab251825 100644
--- a/config/quagga_ospfd/quagga_ospfd.inc
+++ b/config/quagga_ospfd/quagga_ospfd.inc
@@ -149,6 +149,10 @@ function quagga_ospfd_install_conf() {
if ($ospfd_conf['redistributestatic'])
$conffile .= " redistribute static\n";
+
+ if ($ospfd_conf['redistributekernel'])
+ $conffile .= " redistribute kernel\n";
+
if ($ospfd_conf['redistributedefaultroute'])
$conffile .= " default-information originate\n";
diff --git a/config/quagga_ospfd/quagga_ospfd.xml b/config/quagga_ospfd/quagga_ospfd.xml
index 49c9d86c..7989b855 100644
--- a/config/quagga_ospfd/quagga_ospfd.xml
+++ b/config/quagga_ospfd/quagga_ospfd.xml
@@ -122,10 +122,17 @@
<field>
<fielddescr>Redistribute static</fielddescr>
<fieldname>redistributestatic</fieldname>
- <description>Enables the redistribution of static routes</description>
+ <description>Enables the redistribution of static routes (only works if you are using quagga static routes)</description>
<type>checkbox</type>
</field>
<field>
+ <fielddescr>Redistribute Kernel</fielddescr>
+ <fieldname>redistributekernel</fieldname>
+ <description>Enables the redistribution of kernel routing table (this is required if using pfsense static routes)</description>
+ <type>checkbox</type>
+ </field>
+
+ <field>
<fielddescr>SPF Hold Time</fielddescr>
<fieldname>spfholdtime</fieldname>
<description>Set the SPF holdtime in MILLIseconds. The minimum time between two consecutive shortest path first calculations. The default value is 5 seconds; the valid range is 1-5 seconds.</description>