aboutsummaryrefslogtreecommitdiffstats
path: root/config/openbgpd
diff options
context:
space:
mode:
Diffstat (limited to 'config/openbgpd')
-rw-r--r--config/openbgpd/openbgpd.inc6
-rw-r--r--config/openbgpd/openbgpd_status.php5
2 files changed, 6 insertions, 5 deletions
diff --git a/config/openbgpd/openbgpd.inc b/config/openbgpd/openbgpd.inc
index 35abc398..4ad621e7 100644
--- a/config/openbgpd/openbgpd.inc
+++ b/config/openbgpd/openbgpd.inc
@@ -83,7 +83,7 @@ function openbgpd_install_conf() {
foreach($openbgpd_neighbors as $neighbor) {
if($neighbor['groupname'] == $group['name']) {
$conffile .= " neighbor {$neighbor['neighbor']} {\n";
- $conffile .= " descr \"{$neighbor['descr']}\"\n";
+ $conffile .= " descr \"{$neighbor['descr']}\"\n";
$setkeycf .= "delete {$openbgpd_conf['listenip']} {$neighbor['neighbor']} tcp 0x1000;\n";
if($neighbor['md5sigpass']) {
$setkeycf .= "add {$openbgpd_conf['listenip']} {$neighbor['neighbor']} tcp 0x1000 -A tcp-md5 \"{$neighbor['md5sigpass']}\";\n";
@@ -125,9 +125,9 @@ function openbgpd_install_conf() {
$conffile .= " {$row['paramaters']} {$row['parmvalue']} \n";
}
}
+ if($used_this_item)
+ $conffile .= "}\n";
}
- if($used_this_item)
- $conffile .= "}\n";
}
// OpenBGPD filters
diff --git a/config/openbgpd/openbgpd_status.php b/config/openbgpd/openbgpd_status.php
index 8fb9a43f..cb83c6bf 100644
--- a/config/openbgpd/openbgpd_status.php
+++ b/config/openbgpd/openbgpd_status.php
@@ -140,10 +140,11 @@ function execCmds() {
defCmdT("OpenBGPD Summary","bgpctl show summary");
defCmdT("OpenBGPD Interfaces","bgpctl show interfaces");
defCmdT("OpenBGPD Routing","bgpctl show rib");
-defCmdT("OpenBGPD Routing","bgpctl show fib");
+defCmdT("OpenBGPD Forwarding","bgpctl show fib");
+defCmdT("OpenBGPD Network","bgpctl show network");
defCmdT("OpenBGPD Network","bgpctl show network");
defCmdT("OpenBGPD Nexthops","bgpctl show nexthop");
-defCmdT("OpenBGPD IP","bgpctl show ip");
+defCmdT("OpenBGPD IP","bgpctl show ip bgp");
defCmdT("OpenBGPD Neighbors","bgpctl show neighbor");
?>