diff options
| author | Michael Larson <slioch@eng-140.vyatta.com> | 2008-01-30 11:50:05 -0800 |
|---|---|---|
| committer | Michael Larson <slioch@eng-140.vyatta.com> | 2008-01-30 11:50:05 -0800 |
| commit | ad4a7086e81292e0aa76b98739356a02ff9873ed (patch) | |
| tree | 04f9999cc3535d3a7416063cf1b0728ea99994ea | |
| parent | 62b85bda5f9eb966c12f2a5351d18ab9d2a6baa6 (diff) | |
| download | vyatta-wanloadbalance-ad4a7086e81292e0aa76b98739356a02ff9873ed.tar.gz vyatta-wanloadbalance-ad4a7086e81292e0aa76b98739356a02ff9873ed.zip | |
additional changes to go with last push
33 files changed, 41 insertions, 27 deletions
diff --git a/Makefile.am b/Makefile.am index 9341432..34f5ebf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,6 +7,7 @@ AM_CPPFLAGS = -I src -Wall -DDEBUG CLEANFILES = src/main.o src/lbdata.o src/lbdatafactory.o src/loadbalance.o src/rl_str_proc.o src/lbpathtest.o src/lboutput.o sbin_SCRIPTS = scripts/wlb.init +sbin_SCRIPTS += scripts/vyatta-wanloadbalance.pl src_wan_lb_SOURCES = src/main.cc src_wan_lb_SOURCES += src/lbdata.cc diff --git a/debian/vyatta-wanloadbalance.postinst b/debian/vyatta-wanloadbalance.postinst index c1f08d6..df7abe7 100644 --- a/debian/vyatta-wanloadbalance.postinst +++ b/debian/vyatta-wanloadbalance.postinst @@ -1,6 +1,11 @@ #!/bin/bash +LOADBALANCE_DIR=/var/load-balance + prefix=/opt/vyatta sysconfdir=${prefix}/etc +mkdir -p $LOADBALANCE_DIR +chmod 0755 $LOADBALANCE_DIR + #nothing diff --git a/debian/vyatta-wanloadbalance.postinst.in b/debian/vyatta-wanloadbalance.postinst.in index 21218c2..dea57dc 100644 --- a/debian/vyatta-wanloadbalance.postinst.in +++ b/debian/vyatta-wanloadbalance.postinst.in @@ -1,6 +1,12 @@ #!/bin/bash +LOADBALANCE_DIR=/var/load-balance + + prefix=@prefix@ sysconfdir=@sysconfdir@ +mkdir -p $LOADBALANCE_DIR +chmod 0755 $LOADBALANCE_DIR + #nothing diff --git a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.def b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.def index bdef076..254fc98 100644 --- a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.def +++ b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.def @@ -1,3 +1,4 @@ tag: type: txt -help: "Interface name"
\ No newline at end of file +help: "Interface name" + diff --git a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.tag/failure-count/node.def b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.tag/failure-count/node.def index 19a7eec..288180f 100644 --- a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.tag/failure-count/node.def +++ b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.tag/failure-count/node.def @@ -1,2 +1,2 @@ type: u32 -help: "failure count"
\ No newline at end of file +help: "failure count" diff --git a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.tag/ping/node.def b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.tag/ping/node.def index a96486b..3240cb2 100644 --- a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.tag/ping/node.def +++ b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.tag/ping/node.def @@ -1,2 +1,2 @@ type: txt -help: "health test destination"
\ No newline at end of file +help: "health test destination" diff --git a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.tag/resp-time/node.def b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.tag/resp-time/node.def index cda8120..730481f 100644 --- a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.tag/resp-time/node.def +++ b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.tag/resp-time/node.def @@ -1,2 +1,2 @@ type: u32 -help: "response time envelope"
\ No newline at end of file +help: "response time envelope" diff --git a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.tag/success-count/node.def b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.tag/success-count/node.def index 72b7a9d..721c1eb 100644 --- a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.tag/success-count/node.def +++ b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.tag/success-count/node.def @@ -1,2 +1,2 @@ type: u32 -help: "success count"
\ No newline at end of file +help: "success count" diff --git a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.def b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.def index 6febf24..f61b10c 100644 --- a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.def +++ b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.def @@ -1,3 +1,3 @@ tag: type: txt -help: "Rule number"
\ No newline at end of file +help: "Rule number" diff --git a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/address/node.def b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/address/node.def index d1f1e4e..21c2670 100644 --- a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/address/node.def +++ b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/address/node.def @@ -1,2 +1,2 @@ type: ipv4 -help: "IPv4 address"
\ No newline at end of file +help: "IPv4 address" diff --git a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/network/node.def b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/network/node.def index 56643c8..dd0c650 100644 --- a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/network/node.def +++ b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/network/node.def @@ -1,2 +1,2 @@ type: ipv4net -help: "IPv4 Network address"
\ No newline at end of file +help: "IPv4 Network address" diff --git a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/port-name/node.def b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/port-name/node.def index eb723b7..71558ec 100644 --- a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/port-name/node.def +++ b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/port-name/node.def @@ -1,3 +1,3 @@ tag: type: txt -help: "Port name"
\ No newline at end of file +help: "Port name" diff --git a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/port-number/node.def b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/port-number/node.def index 330f130..9a3680c 100644 --- a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/port-number/node.def +++ b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/port-number/node.def @@ -1,3 +1,3 @@ tag: type: u32 -help: "Port number"
\ No newline at end of file +help: "Port number" diff --git a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/address/node.def b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/address/node.def index d1f1e4e..21c2670 100644 --- a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/address/node.def +++ b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/address/node.def @@ -1,2 +1,2 @@ type: ipv4 -help: "IPv4 address"
\ No newline at end of file +help: "IPv4 address" diff --git a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/network/node.def b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/network/node.def index f92f4ff..8d1a64d 100644 --- a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/network/node.def +++ b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/network/node.def @@ -1,2 +1,2 @@ type: ipv4net -help: "IPv4 network address"
\ No newline at end of file +help: "IPv4 network address" diff --git a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/port-name/node.def b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/port-name/node.def index 2b10887..862c5a0 100644 --- a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/port-name/node.def +++ b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/port-name/node.def @@ -1,3 +1,3 @@ tag: type: txt -help: "port name"
\ No newline at end of file +help: "port name" diff --git a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/port-number/node.def b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/port-number/node.def index 29bf9d0..48908b1 100644 --- a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/port-number/node.def +++ b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/port-number/node.def @@ -1,3 +1,3 @@ tag: type: u32 -help: "port number"
\ No newline at end of file +help: "port number" diff --git a/debian/vyatta-wanloadbalance/usr/share/doc/vyatta-wanloadbalance/NEWS.gz b/debian/vyatta-wanloadbalance/usr/share/doc/vyatta-wanloadbalance/NEWS.gz Binary files differindex fa02106..4572a4f 100644 --- a/debian/vyatta-wanloadbalance/usr/share/doc/vyatta-wanloadbalance/NEWS.gz +++ b/debian/vyatta-wanloadbalance/usr/share/doc/vyatta-wanloadbalance/NEWS.gz diff --git a/debian/vyatta-wanloadbalance/usr/share/doc/vyatta-wanloadbalance/changelog.Debian.gz b/debian/vyatta-wanloadbalance/usr/share/doc/vyatta-wanloadbalance/changelog.Debian.gz Binary files differindex fddbb9d..5153a3f 100644 --- a/debian/vyatta-wanloadbalance/usr/share/doc/vyatta-wanloadbalance/changelog.Debian.gz +++ b/debian/vyatta-wanloadbalance/usr/share/doc/vyatta-wanloadbalance/changelog.Debian.gz diff --git a/debian/vyatta-wanloadbalance/usr/share/doc/vyatta-wanloadbalance/changelog.gz b/debian/vyatta-wanloadbalance/usr/share/doc/vyatta-wanloadbalance/changelog.gz Binary files differindex aa35fe3..6442577 100644 --- a/debian/vyatta-wanloadbalance/usr/share/doc/vyatta-wanloadbalance/changelog.gz +++ b/debian/vyatta-wanloadbalance/usr/share/doc/vyatta-wanloadbalance/changelog.gz diff --git a/templates/load-balancing/wan/interface-health/node.def b/templates/load-balancing/wan/interface-health/node.def index bdef076..254fc98 100644 --- a/templates/load-balancing/wan/interface-health/node.def +++ b/templates/load-balancing/wan/interface-health/node.def @@ -1,3 +1,4 @@ tag: type: txt -help: "Interface name"
\ No newline at end of file +help: "Interface name" + diff --git a/templates/load-balancing/wan/interface-health/node.tag/failure-count/node.def b/templates/load-balancing/wan/interface-health/node.tag/failure-count/node.def index 19a7eec..288180f 100644 --- a/templates/load-balancing/wan/interface-health/node.tag/failure-count/node.def +++ b/templates/load-balancing/wan/interface-health/node.tag/failure-count/node.def @@ -1,2 +1,2 @@ type: u32 -help: "failure count"
\ No newline at end of file +help: "failure count" diff --git a/templates/load-balancing/wan/interface-health/node.tag/ping/node.def b/templates/load-balancing/wan/interface-health/node.tag/ping/node.def index a96486b..3240cb2 100644 --- a/templates/load-balancing/wan/interface-health/node.tag/ping/node.def +++ b/templates/load-balancing/wan/interface-health/node.tag/ping/node.def @@ -1,2 +1,2 @@ type: txt -help: "health test destination"
\ No newline at end of file +help: "health test destination" diff --git a/templates/load-balancing/wan/interface-health/node.tag/resp-time/node.def b/templates/load-balancing/wan/interface-health/node.tag/resp-time/node.def index cda8120..730481f 100644 --- a/templates/load-balancing/wan/interface-health/node.tag/resp-time/node.def +++ b/templates/load-balancing/wan/interface-health/node.tag/resp-time/node.def @@ -1,2 +1,2 @@ type: u32 -help: "response time envelope"
\ No newline at end of file +help: "response time envelope" diff --git a/templates/load-balancing/wan/interface-health/node.tag/success-count/node.def b/templates/load-balancing/wan/interface-health/node.tag/success-count/node.def index 72b7a9d..721c1eb 100644 --- a/templates/load-balancing/wan/interface-health/node.tag/success-count/node.def +++ b/templates/load-balancing/wan/interface-health/node.tag/success-count/node.def @@ -1,2 +1,2 @@ type: u32 -help: "success count"
\ No newline at end of file +help: "success count" diff --git a/templates/load-balancing/wan/rule/node.tag/destination/address/node.def b/templates/load-balancing/wan/rule/node.tag/destination/address/node.def index d1f1e4e..21c2670 100644 --- a/templates/load-balancing/wan/rule/node.tag/destination/address/node.def +++ b/templates/load-balancing/wan/rule/node.tag/destination/address/node.def @@ -1,2 +1,2 @@ type: ipv4 -help: "IPv4 address"
\ No newline at end of file +help: "IPv4 address" diff --git a/templates/load-balancing/wan/rule/node.tag/destination/network/node.def b/templates/load-balancing/wan/rule/node.tag/destination/network/node.def index 56643c8..dd0c650 100644 --- a/templates/load-balancing/wan/rule/node.tag/destination/network/node.def +++ b/templates/load-balancing/wan/rule/node.tag/destination/network/node.def @@ -1,2 +1,2 @@ type: ipv4net -help: "IPv4 Network address"
\ No newline at end of file +help: "IPv4 Network address" diff --git a/templates/load-balancing/wan/rule/node.tag/destination/port-name/node.def b/templates/load-balancing/wan/rule/node.tag/destination/port-name/node.def index eb723b7..71558ec 100644 --- a/templates/load-balancing/wan/rule/node.tag/destination/port-name/node.def +++ b/templates/load-balancing/wan/rule/node.tag/destination/port-name/node.def @@ -1,3 +1,3 @@ tag: type: txt -help: "Port name"
\ No newline at end of file +help: "Port name" diff --git a/templates/load-balancing/wan/rule/node.tag/destination/port-number/node.def b/templates/load-balancing/wan/rule/node.tag/destination/port-number/node.def index 330f130..9a3680c 100644 --- a/templates/load-balancing/wan/rule/node.tag/destination/port-number/node.def +++ b/templates/load-balancing/wan/rule/node.tag/destination/port-number/node.def @@ -1,3 +1,3 @@ tag: type: u32 -help: "Port number"
\ No newline at end of file +help: "Port number" diff --git a/templates/load-balancing/wan/rule/node.tag/source/address/node.def b/templates/load-balancing/wan/rule/node.tag/source/address/node.def index d1f1e4e..21c2670 100644 --- a/templates/load-balancing/wan/rule/node.tag/source/address/node.def +++ b/templates/load-balancing/wan/rule/node.tag/source/address/node.def @@ -1,2 +1,2 @@ type: ipv4 -help: "IPv4 address"
\ No newline at end of file +help: "IPv4 address" diff --git a/templates/load-balancing/wan/rule/node.tag/source/network/node.def b/templates/load-balancing/wan/rule/node.tag/source/network/node.def index f92f4ff..8d1a64d 100644 --- a/templates/load-balancing/wan/rule/node.tag/source/network/node.def +++ b/templates/load-balancing/wan/rule/node.tag/source/network/node.def @@ -1,2 +1,2 @@ type: ipv4net -help: "IPv4 network address"
\ No newline at end of file +help: "IPv4 network address" diff --git a/templates/load-balancing/wan/rule/node.tag/source/port-name/node.def b/templates/load-balancing/wan/rule/node.tag/source/port-name/node.def index 2b10887..862c5a0 100644 --- a/templates/load-balancing/wan/rule/node.tag/source/port-name/node.def +++ b/templates/load-balancing/wan/rule/node.tag/source/port-name/node.def @@ -1,3 +1,3 @@ tag: type: txt -help: "port name"
\ No newline at end of file +help: "port name" diff --git a/templates/load-balancing/wan/rule/node.tag/source/port-number/node.def b/templates/load-balancing/wan/rule/node.tag/source/port-number/node.def index 29bf9d0..48908b1 100644 --- a/templates/load-balancing/wan/rule/node.tag/source/port-number/node.def +++ b/templates/load-balancing/wan/rule/node.tag/source/port-number/node.def @@ -1,3 +1,3 @@ tag: type: u32 -help: "port number"
\ No newline at end of file +help: "port number" |