From 928f8aa75a613398b33cd52a804ee869d4b905b9 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Mon, 10 Aug 2015 18:02:24 +0200 Subject: olsrd code style cleanup - Add missing copyright headers - Fix indentation, nuke useless junk, use consistent version. --- config/olsrd/olsrd.xml | 79 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 57 insertions(+), 22 deletions(-) (limited to 'config') diff --git a/config/olsrd/olsrd.xml b/config/olsrd/olsrd.xml index 3939f357..464f730d 100644 --- a/config/olsrd/olsrd.xml +++ b/config/olsrd/olsrd.xml @@ -1,19 +1,59 @@ + + + + + olsrd - 1.0 + 1.0.3 OLSRD /usr/local/pkg/olsrd.inc - OLSRD
Services
olsrd.xml - OLSRD - /usr/local/sbin/olsrd -f /var/etc/olsr.conf - + OLSRD + /usr/local/sbin/olsrd -f /var/etc/olsr.conf + OLSRD Settings @@ -22,20 +62,15 @@ - /usr/local/pkg/ - 0755 - https://packages.pfsense.org/packages/config/olsrd/olsrd.inc - - + /usr/local/pkg/ + https://packages.pfsense.org/packages/config/olsrd/olsrd.inc + ['installedpackages']['OLSRD']['config'] - Enable OLSR enable - Enables the dynamic mesh linking daemon + Enables the dynamic mesh linking daemon. checkbox @@ -56,18 +91,18 @@ true 3 interfaces_selection - Select the interfaces that OLSR will bind to. You can use the CTRL or COMMAND key to select multiple interfaces. + Select the interfaces that OLSR will bind to. You can use the CTRL or COMMAND key to select multiple interfaces. Enable HTTPInfo Plugin enablehttpinfo - Enables the OLSR stats web server + Enables the OLSR stats web server. checkbox HTTPInfo Port port - Port that HTTPInfo will listen on + Port that HTTPInfo will listen on. input @@ -85,19 +120,19 @@ Enable Dynamic Gateway enabledyngw - Enables the OLSR Dynamic Gateways feature + Enables the OLSR Dynamic Gateways feature. checkbox Announce self as Dynamic Gateway enableannounce - Enables the OLSR Dynamic Gateways Announcing feature + Enables the OLSR Dynamic Gateways Announcing feature. checkbox Announce Dynamic local route announcedynamicroute - Enter the IP/Netmask + Enter the IP/Netmask. textarea 3 50 @@ -105,7 +140,7 @@ Ping ping - Pings this host to ensure connectivity + Pings this host to ensure connectivity. input @@ -117,7 +152,7 @@ Enable Secure Mode enabledsecure - Enables the secure mode + Enables the secure mode. checkbox -- cgit v1.2.3 From be9fdc1aac0bdf09c2188b02601908255de44e09 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Mon, 10 Aug 2015 18:15:53 +0200 Subject: oslrd - code style cleanup - Add missing copyright header - Code style cleanup --- config/olsrd/olsrd.inc | 89 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 60 insertions(+), 29 deletions(-) (limited to 'config') diff --git a/config/olsrd/olsrd.inc b/config/olsrd/olsrd.inc index 9eee0196..f2c77f58 100644 --- a/config/olsrd/olsrd.inc +++ b/config/olsrd/olsrd.inc @@ -1,34 +1,64 @@ "on") { - if (is_process_running("olsrd")) + if (is_process_running("olsrd")) { mwexec("/usr/bin/killall olsrd", true); + } return; } $fd = fopen("{$g['varetc_path']}/olsr.conf", "w"); - if($olsrd['announcedynamicroute'] or $olsrd['enableannounce'] == "on") { + if ($olsrd['announcedynamicroute'] or $olsrd['enableannounce'] == "on") { $enableannounce .= "\nHna4\n"; $enableannounce .= "{\n"; - if($olsrd['announcedynamicroute']) + } + if ($olsrd['announcedynamicroute']) { $enableannounce .= "\t{$olsrd['announcedynamicroute']}\n"; - if($olsrd['enableannounce'] == "on") + } + if ($olsrd['enableannounce'] == "on") { $enableannounce .= "0.0.0.0 0.0.0.0"; $enableannounce .= "\n}\n"; } else { @@ -171,8 +201,8 @@ MprCoverage 3 EODA; -if($olsrd['enablehttpinfo'] == "on") { - $olsr .= << Date: Mon, 10 Aug 2015 18:23:15 +0200 Subject: olsrd - code style fixes More indentation fixes. --- config/olsrd/olsrd.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/olsrd/olsrd.inc b/config/olsrd/olsrd.inc index f2c77f58..cbdb031a 100644 --- a/config/olsrd/olsrd.inc +++ b/config/olsrd/olsrd.inc @@ -257,8 +257,8 @@ EODE; foreach ($config['installedpackages']['olsrd']['config'] as $conf) { $interfaces = explode(',', $conf['iface_array']); foreach ($interfaces as $interface) { - $realinterface = convert_friendly_interface_to_real_interface_name($interface); - $olsr .= << Date: Mon, 10 Aug 2015 18:38:17 +0200 Subject: Fix filename in header. --- config/olsrd/olsrd.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/olsrd/olsrd.inc b/config/olsrd/olsrd.inc index cbdb031a..4e15f9cf 100644 --- a/config/olsrd/olsrd.inc +++ b/config/olsrd/olsrd.inc @@ -1,6 +1,6 @@