aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2010-10-13 19:55:54 +0200
committerChris Buechler <cmb@pfsense.org>2010-10-13 19:55:54 +0200
commitf5a6a2d83dedb20f33711cf00ee7425eb8136bff (patch)
treef9019e04bda464bbb1492afbec19fb1b8dc8b8a0
parentcec11cdde70b28ef9578b4e310728df29ee17597 (diff)
downloadpfsense-packages-f5a6a2d83dedb20f33711cf00ee7425eb8136bff.tar.gz
pfsense-packages-f5a6a2d83dedb20f33711cf00ee7425eb8136bff.tar.bz2
pfsense-packages-f5a6a2d83dedb20f33711cf00ee7425eb8136bff.zip
add set nexthop parameters and fix many typos in openbgpd package
-rw-r--r--config/openbgpd/openbgpd.inc14
-rw-r--r--config/openbgpd/openbgpd_neighbors.xml11
2 files changed, 15 insertions, 10 deletions
diff --git a/config/openbgpd/openbgpd.inc b/config/openbgpd/openbgpd.inc
index 35485d3e..3f9d5ab0 100644
--- a/config/openbgpd/openbgpd.inc
+++ b/config/openbgpd/openbgpd.inc
@@ -35,7 +35,7 @@ function openbgpd_install_conf() {
conf_mount_rw();
if ($config['installedpackages']['openbgpd']['rawconfig'] && $config['installedpackages']['openbgpd']['rawconfig']['item']) {
- // if there is a raw config specifyed in tthe config.xml use that instead of the assisted config
+ // if there is a raw config specified in the config.xml use that instead of the assisted config
$conffile = implode("\n",$config['installedpackages']['openbgpd']['rawconfig']['item']);
//$conffile = $config['installedpackages']['openbgpd']['rawconfig'];
} else {
@@ -97,7 +97,7 @@ function openbgpd_install_conf() {
$conffile .= " tcp md5sig key {$neighbor['md5sigkey']}\n";
}
foreach($neighbor['row'] as $row) {
- $conffile .= " {$row['paramaters']} {$row['parmvalue']} \n";
+ $conffile .= " {$row['parameters']} {$row['parmvalue']} \n";
}
$conffile .= "}\n";
}
@@ -125,7 +125,7 @@ function openbgpd_install_conf() {
}
$used_this_item = true;
foreach($neighbor['row'] as $row) {
- $conffile .= " {$row['paramaters']} {$row['parmvalue']} \n";
+ $conffile .= " {$row['parameters']} {$row['parmvalue']} \n";
}
}
if($used_this_item)
@@ -172,7 +172,7 @@ function openbgpd_install_conf() {
fclose($fd);
exec("setkey -f {$g['tmp_path']}/bgpdsetkey.conf");
- // bgpd process running? if so reload, elsewise start.
+ // bgpd process running? if so reload, else start.
if(is_openbgpd_running() == true) {
exec("bgpctl reload");
} else {
@@ -187,7 +187,7 @@ function openbgpd_get_raw_config() {
return file_get_contents("/usr/local/etc/bgpd.conf");
}
-// serialize the raw openbgpd confi file to config.xml
+// serialize the raw openbgpd config file to config.xml
function openbgpd_put_raw_config($conffile) {
global $config;
if ($conffile == "")
@@ -286,8 +286,8 @@ function grey_out_value_boxes() {
function grey_out_value_boxes() {
var x = 0;
for(x=0; x<99; x++) {
- if( \$('paramaters' + x) ) {
- var fieldvalue = $('paramaters' + x).options[$('paramaters' + x).selectedIndex].text;
+ if( \$('parameters' + x) ) {
+ var fieldvalue = $('parameters' + x).options[$('parameters' + x).selectedIndex].text;
var length = fieldvalue.length;
length = length -2;
var last_two = fieldvalue.substring(length);
diff --git a/config/openbgpd/openbgpd_neighbors.xml b/config/openbgpd/openbgpd_neighbors.xml
index 56708a6c..93076ca8 100644
--- a/config/openbgpd/openbgpd_neighbors.xml
+++ b/config/openbgpd/openbgpd_neighbors.xml
@@ -127,8 +127,8 @@
<type>rowhelper</type>
<rowhelper>
<rowhelperfield>
- <fielddescr>Paramaters</fielddescr>
- <fieldname>paramaters</fieldname>
+ <fielddescr>Parameters</fielddescr>
+ <fieldname>parameters</fieldname>
<description>Neighbor settings.</description>
<type>select</type>
<options>
@@ -147,7 +147,12 @@
<option><name>Softreconfig out yes</name><value>softreconfig out yes</value></option>
<option><name>Softreconfig out no</name><value>softreconfig out no</value></option>
<option><name>Tcp md5sig password X</name><value>tcp md5sig password</value></option>
- <option><name>Local address X</name><value>local-address</value></option>
+ <option><name>Local address X</name><value>local-address</value></option>
+ <option><name>set nexthop X</name><value>set nexthop</value></option>
+ <option><name>set nexthop blackhole</name><value>set nexthop blackhole</value></option>
+ <option><name>set nexthop reject</name><value>set nexthop reject</value></option>
+ <option><name>set nexthop no-modify</name><value>set nexthop no-modify</value></option>
+ <option><name>set nexthop self</name><value>set nexthop self</value></option>
</options>
</rowhelperfield>
<rowhelperfield>