diff options
| author | gnhb <gnoahb@gmail.com> | 2010-09-16 10:49:23 +0700 |
|---|---|---|
| committer | gnhb <gnoahb@gmail.com> | 2010-09-16 10:49:23 +0700 |
| commit | be56e2944ca416ddb23052bb9cb030b48064ab55 (patch) | |
| tree | 1d10ea41c48c6064f0af854eace2d16cc123a7cb /etc/inc/gwlb.inc | |
| parent | 144d0e793de61366340758b28f169c3afeeba922 (diff) | |
| parent | ecb08c6a826c5e3ebeac47f9e1bff20554471816 (diff) | |
| download | pfsense-be56e2944ca416ddb23052bb9cb030b48064ab55.zip pfsense-be56e2944ca416ddb23052bb9cb030b48064ab55.tar.gz | |
Merge branch 'master' of rcs.pfsense.org:pfsense/mainline
Diffstat (limited to 'etc/inc/gwlb.inc')
| -rw-r--r-- | etc/inc/gwlb.inc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/etc/inc/gwlb.inc b/etc/inc/gwlb.inc index eb00826..66014ff 100644 --- a/etc/inc/gwlb.inc +++ b/etc/inc/gwlb.inc @@ -75,7 +75,7 @@ status { file "{$g['tmp_path']}/apinger.status" ## Interval between file updates ## when 0 or not set, file is written only when SIGUSR1 is received - interval 10s + interval 5s } ######################################## @@ -286,7 +286,6 @@ function return_gateways_array($disabled = false) { /* no IP address found, set to dynamic */ if(! is_ipaddr($gateway['gateway'])) $gateway['gateway'] = "dynamic"; - $gateway['dynamic'] = true; } if(empty($gateway['monitor'])) @@ -366,7 +365,7 @@ function return_gateway_groups_array() { $gwname = $itemsplit[0]; /* Do it here rather than reiterating again the group in case no member is up. */ - $backupplan[$tier] = $gwname; + $backupplan[$tier][] = $gwname; /* check if the gateway is available before adding it to the array */ if (!empty($gateway_status[$gwname])) { |
