diff --git a/src/www/system_advanced_firewall.php b/src/www/system_advanced_firewall.php index 3f84a6c1d..b16549d8c 100644 --- a/src/www/system_advanced_firewall.php +++ b/src/www/system_advanced_firewall.php @@ -40,9 +40,11 @@ function default_table_entries_size() return $current; } - if ($_SERVER['REQUEST_METHOD'] === 'GET') { $pconfig = array(); + $pconfig['ipv6allow'] = isset($config['system']['ipv6allow']); + $pconfig['ipv6nat_enable'] = isset($config['diag']['ipv6nat']['enable']); + $pconfig['ipv6nat_ipaddr'] = isset($config['diag']['ipv6nat']['ipaddr']) ? $config['diag']['ipv6nat']['ipaddr']:"" ; $pconfig['disablefilter'] = !empty($config['system']['disablefilter']); $pconfig['scrubnodf'] = !empty($config['system']['scrubnodf']); $pconfig['scrubrnid'] = !empty($config['system']['scrubrnid']); @@ -75,6 +77,24 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { $input_errors = array(); /* input validation */ + if (!empty($pconfig['ipv6nat_enable']) && !is_ipaddr($_POST['ipv6nat_ipaddr'])) { + $input_errors[] = gettext("You must specify an IP address to NAT IPv6 packets."); + } + + if (!empty($pconfig['ipv6nat_enable'])) { + $config['diag']['ipv6nat'] = array(); + $config['diag']['ipv6nat']['enable'] = true; + $config['diag']['ipv6nat']['ipaddr'] = $_POST['ipv6nat_ipaddr']; + } elseif (isset($config['diag']['ipv6nat'])) { + unset($config['diag']['ipv6nat']); + } + + if (!empty($pconfig['ipv6allow'])) { + $config['system']['ipv6allow'] = true; + } elseif (isset($config['system']['ipv6allow'])) { + unset($config['system']['ipv6allow']); + } + if ((empty($pconfig['adaptivestart']) && !empty($pconfig['adaptiveend'])) || (!empty($pconfig['adaptivestart']) && empty($pconfig['adaptiveend']))) { $input_errors[] = gettext("The Firewall Adaptive values must be set together."); } @@ -230,6 +250,23 @@ include("head.inc"); + + +
@@ -246,6 +283,39 @@ include("head.inc");
+ + + + + + + + + + + +
+ + +
+ onclick="enable_change(false)" /> + + +
+ onclick="enable_change(false)" /> +
+ +  :  + +
diff --git a/src/www/system_advanced_network.php b/src/www/system_advanced_network.php index be4cbca0e..c2727938e 100644 --- a/src/www/system_advanced_network.php +++ b/src/www/system_advanced_network.php @@ -35,12 +35,8 @@ require_once("filter.inc"); require_once("system.inc"); require_once("pfsense-utils.inc"); - if ($_SERVER['REQUEST_METHOD'] === 'GET') { $pconfig = array(); - $pconfig['ipv6allow'] = isset($config['system']['ipv6allow']); - $pconfig['ipv6nat_enable'] = isset($config['diag']['ipv6nat']['enable']); - $pconfig['ipv6nat_ipaddr'] = isset($config['diag']['ipv6nat']['ipaddr']) ? $config['diag']['ipv6nat']['ipaddr']:"" ; $pconfig['disablechecksumoffloading'] = isset($config['system']['disablechecksumoffloading']); $pconfig['disablesegmentationoffloading'] = isset($config['system']['disablesegmentationoffloading']); $pconfig['disablelargereceiveoffloading'] = isset($config['system']['disablelargereceiveoffloading']); @@ -52,25 +48,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { $pconfig['sharednet'] = isset($config['system']['sharednet']); } elseif ($_SERVER['REQUEST_METHOD'] === 'POST') { $pconfig = $_POST; - $input_errors = array(); - - if (!empty($pconfig['ipv6nat_enable']) && !is_ipaddr($_POST['ipv6nat_ipaddr'])) { - $input_errors[] = gettext("You must specify an IP address to NAT IPv6 packets."); - } - - if (!empty($pconfig['ipv6nat_enable'])) { - $config['diag']['ipv6nat'] = array(); - $config['diag']['ipv6nat']['enable'] = true; - $config['diag']['ipv6nat']['ipaddr'] = $_POST['ipv6nat_ipaddr']; - } elseif (isset($config['diag']['ipv6nat'])) { - unset($config['diag']['ipv6nat']); - } - - if (!empty($pconfig['ipv6allow'])) { - $config['system']['ipv6allow'] = true; - } elseif (isset($config['system']['ipv6allow'])) { - unset($config['system']['ipv6allow']); - } if (!empty($pconfig['sharednet'])) { $config['system']['sharednet'] = true; @@ -102,13 +79,8 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { unset($config['system']['disablevlanhwfilter']); } - if (count($input_errors) == 0) { - write_config(); - system_arp_wrong_if(); - filter_configure(); - header("Location: system_advanced_network.php"); - exit; - } + write_config(); + system_arp_wrong_if(); } legacy_html_escape_form_data($pconfig); @@ -120,31 +92,11 @@ include("head.inc"); - - -
0) { - print_input_errors($input_errors); - } if (isset($savemsg)) { print_info_box($savemsg); } @@ -153,39 +105,6 @@ include("head.inc");
- - - - - - - - - - - -
- - -
- onclick="enable_change(false)" /> - - -
- onclick="enable_change(false)" /> -
- -  :  - -