summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael <mike@vyatta.com>2010-12-30 03:51:46 -0800
committerStephen Hemminger <stephen.hemminger@vyatta.com>2011-01-05 11:50:44 -0800
commit7f19756f2dc78d183cdff49ddcab5817625115e0 (patch)
tree78397cc089ceff1d747edf9817f7f27459601b22
parent02ad13b406847b718f9a1fd5e731572e261a6a44 (diff)
downloadvyatta-wanloadbalance-7f19756f2dc78d183cdff49ddcab5817625115e0.tar.gz
vyatta-wanloadbalance-7f19756f2dc78d183cdff49ddcab5817625115e0.zip
fix for bug 4966.
default to no dns resolution with option for dns resolution on op mode command. (cherry picked from commit 9e9c03edd4d4b2c87f0da68c8b40c216a324495b)
-rwxr-xr-xscripts/vyatta-wlb-status3
-rw-r--r--templates-op/show/wan-load-balance/status/node.def2
-rw-r--r--templates-op/show/wan-load-balance/status/with-dns/node.def7
3 files changed, 10 insertions, 2 deletions
diff --git a/scripts/vyatta-wlb-status b/scripts/vyatta-wlb-status
index 4caadd3..325b3b1 100755
--- a/scripts/vyatta-wlb-status
+++ b/scripts/vyatta-wlb-status
@@ -1,4 +1,5 @@
#!/bin/sh
-iptables -L WANLOADBALANCE_PRE -t mangle -v
+
+iptables $1 -L WANLOADBALANCE_PRE -t mangle -v
diff --git a/templates-op/show/wan-load-balance/status/node.def b/templates-op/show/wan-load-balance/status/node.def
index ff63a2e..aef04ad 100644
--- a/templates-op/show/wan-load-balance/status/node.def
+++ b/templates-op/show/wan-load-balance/status/node.def
@@ -1,6 +1,6 @@
help: Show WAN load-balancing statistics
run: if [ -f /var/load-balance/wlb.out ] ; then
- sudo ${vyatta_bindir}/sudo-users/vyatta-wlb-status
+ sudo ${vyatta_bindir}/sudo-users/vyatta-wlb-status -n
else
echo WAN load balancing is not configured
fi
diff --git a/templates-op/show/wan-load-balance/status/with-dns/node.def b/templates-op/show/wan-load-balance/status/with-dns/node.def
new file mode 100644
index 0000000..35fb316
--- /dev/null
+++ b/templates-op/show/wan-load-balance/status/with-dns/node.def
@@ -0,0 +1,7 @@
+help: Show WAN load-balancing statistics
+run: if [ -f /var/load-balance/wlb.out ] ; then
+ sudo ${vyatta_bindir}/sudo-users/vyatta-wlb-status
+ else
+ echo WAN load balancing is not configured
+ fi
+