diff options
| author | Phil Davis <phil.davis@inf.org> | 2017-03-26 13:44:27 +0545 |
|---|---|---|
| committer | Phil Davis <phil.davis@inf.org> | 2017-03-26 14:19:35 +0545 |
| commit | 5b7e3a4c28af60dad4c2217af1a38988b272963d (patch) | |
| tree | dab2c8a2c88c309035fd08e335a8bb65883931d6 /src/usr | |
| parent | 0034bbc15af953ddb460d883be637b0eed708d3f (diff) | |
| download | pfsense-5b7e3a4c28af60dad4c2217af1a38988b272963d.zip pfsense-5b7e3a4c28af60dad4c2217af1a38988b272963d.tar.gz | |
Provide functions for checking port range alias combinations
Diffstat (limited to 'src/usr')
| -rw-r--r-- | src/usr/local/www/firewall_aliases_edit.php | 2 | ||||
| -rw-r--r-- | src/usr/local/www/firewall_aliases_import.php | 2 | ||||
| -rw-r--r-- | src/usr/local/www/firewall_nat_out_edit.php | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/usr/local/www/firewall_aliases_edit.php b/src/usr/local/www/firewall_aliases_edit.php index f62bea0..b370b72 100644 --- a/src/usr/local/www/firewall_aliases_edit.php +++ b/src/usr/local/www/firewall_aliases_edit.php @@ -463,7 +463,7 @@ if ($_POST) { } } } else if ($_POST['type'] == "port") { - if (!is_port($input_address) && !is_portrange($input_address)) { + if (!is_portorrange($input_address)) { $input_errors[] = sprintf(gettext("%s is not a valid port or alias."), $input_address); } } else if ($_POST['type'] == "host" || $_POST['type'] == "network") { diff --git a/src/usr/local/www/firewall_aliases_import.php b/src/usr/local/www/firewall_aliases_import.php index e5695cf..f59db15 100644 --- a/src/usr/local/www/firewall_aliases_import.php +++ b/src/usr/local/www/firewall_aliases_import.php @@ -153,7 +153,7 @@ if ($_POST) { if ($tab == "port") { // Port alias if (!empty($impip)) { - if (is_port($impip) || is_portrange($impip)) { + if (is_portorrange($impip)) { $imported_ips[] = $impip; $imported_descs[] = $impdesc; } else { diff --git a/src/usr/local/www/firewall_nat_out_edit.php b/src/usr/local/www/firewall_nat_out_edit.php index aa23717..7b28e7a 100644 --- a/src/usr/local/www/firewall_nat_out_edit.php +++ b/src/usr/local/www/firewall_nat_out_edit.php @@ -206,15 +206,15 @@ if ($_POST) { $_POST['natport'] = trim($_POST['natport']); } - if ($protocol_uses_ports && $_POST['sourceport'] <> "" && !(is_portoralias($_POST['sourceport']) || is_portrange($_POST['sourceport']))) { + if ($protocol_uses_ports && $_POST['sourceport'] <> "" && !is_portorrangeoralias($_POST['sourceport'])) { $input_errors[] = gettext("A valid port or port alias must be supplied for the source port entry."); } - if ($protocol_uses_ports && $_POST['dstport'] <> "" && !(is_portoralias($_POST['dstport']) || is_portrange($_POST['dstport']))) { + if ($protocol_uses_ports && $_POST['dstport'] <> "" && !is_portorrangeoralias($_POST['dstport'])) { $input_errors[] = gettext("A valid port or port alias must be supplied for the destination port entry."); } - if ($protocol_uses_ports && $_POST['natport'] <> "" && !(is_portoralias($_POST['natport']) || is_portrange($_POST['natport'])) && !isset($_POST['nonat'])) { + if ($protocol_uses_ports && $_POST['natport'] <> "" && !is_portorrangeoralias($_POST['natport']) && !isset($_POST['nonat'])) { $input_errors[] = gettext("A valid port must be supplied for the NAT port entry."); } |
