diff options
| author | Chris Buechler <cmb@pfsense.org> | 2016-01-25 17:46:12 -0600 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2016-01-25 17:46:12 -0600 |
| commit | 3756fd860385c98a890e3b8315bf50448095c3bb (patch) | |
| tree | 6745f01839e199c59b55000b858355207b6418b7 /src/etc/inc | |
| parent | a85fcfdb3eae56aa096b514ed7fc415a21bc6beb (diff) | |
| download | pfsense-3756fd860385c98a890e3b8315bf50448095c3bb.zip pfsense-3756fd860385c98a890e3b8315bf50448095c3bb.tar.gz | |
Fix up config setting for killing states on gateway failure. Enable this option where gw_down_kill_states is set. Flip setting accordingly during config upgrade to not use confusing 'kill_states' tag to not kill states. Ticket #5815
Diffstat (limited to 'src/etc/inc')
| -rw-r--r-- | src/etc/inc/filter.inc | 2 | ||||
| -rw-r--r-- | src/etc/inc/globals.inc | 2 | ||||
| -rw-r--r-- | src/etc/inc/upgrade_config.inc | 17 |
3 files changed, 16 insertions, 5 deletions
diff --git a/src/etc/inc/filter.inc b/src/etc/inc/filter.inc index 9eb7c88..ab314ee 100644 --- a/src/etc/inc/filter.inc +++ b/src/etc/inc/filter.inc @@ -212,7 +212,7 @@ function filter_configure() { function filter_delete_states_for_down_gateways() { global $config, $GatewaysList; - if (isset($config['system']['kill_states'])) { + if (!isset($config['system']['gw_down_kill_states'])) { return; } diff --git a/src/etc/inc/globals.inc b/src/etc/inc/globals.inc index 2fde4b6..91fc0ee 100644 --- a/src/etc/inc/globals.inc +++ b/src/etc/inc/globals.inc @@ -99,7 +99,7 @@ $g = array( "disablecrashreporter" => false, "crashreporterurl" => "https://crashreporter.pfsense.org/crash_reporter.php", "debug" => false, - "latest_config" => "13.8", + "latest_config" => "13.9", "nopkg_platforms" => array("cdrom"), "minimum_ram_warning" => "101", "minimum_ram_warning_text" => "128 MB", diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc index 8c2b837..5a5425d 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -3330,9 +3330,8 @@ function upgrade_096_to_097() { } function upgrade_097_to_098() { - global $config, $g; - /* Disable kill_states by default */ - $config['system']['kill_states'] = true; + // no longer used (used to set kill_states) + return; } function upgrade_098_to_099() { @@ -4326,4 +4325,16 @@ function upgrade_137_to_138() { } } +function upgrade_138_to_139() { + global $config; + + // clean up state killing on gateway failure. having kill_states set used to mean it was disabled + // now set gw_down_kill_states if enabled. + if (!isset($config['system']['kill_states'])) { + $config['system']['gw_down_kill_states'] = true; + } else { + unset($config['system']['kill_states']); + } +} + ?> |
