diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2013-01-29 15:30:35 -0200 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2013-01-29 15:30:35 -0200 |
| commit | 49b76122af0846474f65eaf73e0e879e24fb554c (patch) | |
| tree | fbbe81e53b550d12c485d1071a99e87f54aa1dac /usr | |
| parent | d12ae2414c7e3bfd239699309ff571c716d070c9 (diff) | |
| download | pfsense-49b76122af0846474f65eaf73e0e879e24fb554c.zip pfsense-49b76122af0846474f65eaf73e0e879e24fb554c.tar.gz | |
Permit openvpn to use same port on different interfaces. It should fix #814
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/local/www/vpn_openvpn_client.php | 2 | ||||
| -rw-r--r-- | usr/local/www/vpn_openvpn_server.php | 2 | ||||
| -rw-r--r-- | usr/local/www/wizards/openvpn_wizard.inc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/usr/local/www/vpn_openvpn_client.php b/usr/local/www/vpn_openvpn_client.php index 916b9fb..6452895 100644 --- a/usr/local/www/vpn_openvpn_client.php +++ b/usr/local/www/vpn_openvpn_client.php @@ -177,7 +177,7 @@ if ($_POST) { if ($result = openvpn_validate_port($pconfig['local_port'], 'Local port')) $input_errors[] = $result; - $portused = openvpn_port_used($pconfig['protocol'], $pconfig['local_port']); + $portused = openvpn_port_used($pconfig['protocol'], $pconfig['interface'], $pconfig['local_port'], $vpnid); if (($portused != $vpnid) && ($portused != 0)) $input_errors[] = gettext("The specified 'Local port' is in use. Please select another value"); } diff --git a/usr/local/www/vpn_openvpn_server.php b/usr/local/www/vpn_openvpn_server.php index 6946270..10d6511 100644 --- a/usr/local/www/vpn_openvpn_server.php +++ b/usr/local/www/vpn_openvpn_server.php @@ -249,7 +249,7 @@ if ($_POST) { if ($result = openvpn_validate_cidr($pconfig['local_networkv6'], 'IPv6 Local Network', true, "ipv6")) $input_errors[] = $result; - $portused = openvpn_port_used($pconfig['protocol'], $pconfig['local_port']); + $portused = openvpn_port_used($pconfig['protocol'], $pconfig['interface'], $pconfig['local_port'], $vpnid); if (($portused != $vpnid) && ($portused != 0)) $input_errors[] = gettext("The specified 'Local port' is in use. Please select another value"); diff --git a/usr/local/www/wizards/openvpn_wizard.inc b/usr/local/www/wizards/openvpn_wizard.inc index 006ee32..86dec52 100644 --- a/usr/local/www/wizards/openvpn_wizard.inc +++ b/usr/local/www/wizards/openvpn_wizard.inc @@ -366,7 +366,7 @@ function step10_submitphpaction() { if ($result = openvpn_validate_cidr($_POST['localnet'], 'Local Network', true, "ipv4")) $input_errors[] = $result; - $portused = openvpn_port_used($_POST['protocol'], $_POST['localport']); + $portused = openvpn_port_used($_POST['protocol'], $_POST['interface'], $_POST['localport']); if ($portused != 0) $input_errors[] = "The specified 'Local port' is in use. Please select another value"; |
