summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/inc/pfsense-utils.inc14
-rw-r--r--etc/inc/vslb.inc8
2 files changed, 8 insertions, 14 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index 30ae302..28d4de3 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -1030,16 +1030,10 @@ function setup_polling() {
foreach ($iflist as $ifent => $ifname) {
$real_interface = convert_friendly_interface_to_real_interface_name($ifname);
- $supported = false;
- foreach($supported_ints as $supported_int) {
- if(stristr($real_interface, $supported_int)) {
- $supported = true;
- }
- }
- if (stristr($real_interface, "vlan")) {
- $supported = false;
- }
- if ($supported == true) {
+ if(!in_array($real_interface, $supported_ints)) {
+ continue;
+ }
+ if(isset($config['system']['polling'])) {
mwexec("/sbin/ifconfig {$real_interface} polling");
} else {
mwexec("/sbin/ifconfig {$real_interface} -polling");
diff --git a/etc/inc/vslb.inc b/etc/inc/vslb.inc
index 5dc2d81..2968432 100644
--- a/etc/inc/vslb.inc
+++ b/etc/inc/vslb.inc
@@ -131,11 +131,11 @@ function slbd_configure() {
* there is a chance the monitor ip gateway will go out the link
* that is up.
*/
- mwexec("/sbin/route delete -host {$lbsvr_split[1]} 2>&1");
- mwexec("/sbin/route add -host {$lbsvr_split[1]} 127.0.0.1 2>&1");
+ mwexec("/sbin/route delete -host {$lbsvr_split[1]} 2>&1", true);
+ mwexec("/sbin/route add -host {$lbsvr_split[1]} 127.0.0.1 2>&1", true);
} else {
- mwexec("/sbin/route delete -host {$lbsvr_split[1]} 2>&1");
- mwexec("/sbin/route add -host {$lbsvr_split[1]} {$gateway} 2>&1");
+ mwexec("/sbin/route delete -host {$lbsvr_split[1]} 2>&1", true);
+ mwexec("/sbin/route add -host {$lbsvr_split[1]} {$gateway} 2>&1", true);
}
}
$slbdconf .= "\t:service-port=666:\\\n";
OpenPOWER on IntegriCloud