diff options
author | Renato Botelho <renato@netgate.com> | 2016-12-30 12:17:22 -0200 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2016-12-30 12:17:37 -0200 |
commit | 56110c7249b5dbd9ea4e0b4c4009794c69a58143 (patch) | |
tree | 0bf32369907a5674095069a453cf1893d2615121 /src/usr/local | |
parent | e10a9781b83aa59ee86164d76b3d5d274e902c4b (diff) | |
download | pfsense-56110c7249b5dbd9ea4e0b4c4009794c69a58143.zip pfsense-56110c7249b5dbd9ea4e0b4c4009794c69a58143.tar.gz |
Ticket #7054: Remove tun-ipv6 option, deprecated on OpenVPN 2.4.0 and related GUI knobs
Diffstat (limited to 'src/usr/local')
-rw-r--r-- | src/usr/local/www/vpn_openvpn_client.php | 10 | ||||
-rw-r--r-- | src/usr/local/www/vpn_openvpn_server.php | 11 |
2 files changed, 0 insertions, 21 deletions
diff --git a/src/usr/local/www/vpn_openvpn_client.php b/src/usr/local/www/vpn_openvpn_client.php index b6e8970..399d099 100644 --- a/src/usr/local/www/vpn_openvpn_client.php +++ b/src/usr/local/www/vpn_openvpn_client.php @@ -159,7 +159,6 @@ if ($_GET['act'] == "edit") { $pconfig['autokey_enable'] = "yes"; $pconfig['autotls_enable'] = "yes"; - $pconfig['no_tun_ipv6'] = $a_client[$id]['no_tun_ipv6']; $pconfig['route_no_pull'] = $a_client[$id]['route_no_pull']; $pconfig['route_no_exec'] = $a_client[$id]['route_no_exec']; if (isset($a_client[$id]['verbosity_level'])) { @@ -378,7 +377,6 @@ if ($_POST) { $client['compression'] = $pconfig['compression']; $client['passtos'] = $pconfig['passtos']; - $client['no_tun_ipv6'] = $pconfig['no_tun_ipv6']; $client['route_no_pull'] = $pconfig['route_no_pull']; $client['route_no_exec'] = $pconfig['route_no_exec']; $client['verbosity_level'] = $pconfig['verbosity_level']; @@ -728,13 +726,6 @@ if ($act=="new" || $act=="edit"): )); $section->addInput(new Form_Checkbox( - 'no_tun_ipv6', - 'Disable IPv6', - 'Don\'t forward IPv6 traffic. ', - $pconfig['no_tun_ipv6'] - )); - - $section->addInput(new Form_Checkbox( 'route_no_pull', 'Don\'t pull routes', 'Bars the server from adding routes to the client\'s routing table', @@ -883,7 +874,6 @@ events.push(function() { } function dev_mode_change() { - hideCheckbox('no_tun_ipv6', ($('#dev_mode').val() == 'tap')); hideInput('topology', ($('#dev_mode').val() == 'tap') || $('#mode').val() == "p2p_shared_key"); } diff --git a/src/usr/local/www/vpn_openvpn_server.php b/src/usr/local/www/vpn_openvpn_server.php index daa85c0..ef4bd02 100644 --- a/src/usr/local/www/vpn_openvpn_server.php +++ b/src/usr/local/www/vpn_openvpn_server.php @@ -229,7 +229,6 @@ if ($_GET['act'] == "edit") { $pconfig['duplicate_cn'] = isset($a_server[$id]['duplicate_cn']); - $pconfig['no_tun_ipv6'] = $a_server[$id]['no_tun_ipv6']; if (isset($a_server[$id]['verbosity_level'])) { $pconfig['verbosity_level'] = $a_server[$id]['verbosity_level']; } else { @@ -527,7 +526,6 @@ if ($_POST) { $server['netbios_ntype'] = $pconfig['netbios_ntype']; $server['netbios_scope'] = $pconfig['netbios_scope']; - $server['no_tun_ipv6'] = $pconfig['no_tun_ipv6']; $server['verbosity_level'] = $pconfig['verbosity_level']; if ($pconfig['netbios_enable']) { @@ -956,13 +954,6 @@ if ($act=="new" || $act=="edit"): $pconfig['duplicate_cn'] ))->setHelp('(This is not generally recommended, but may be needed for some scenarios.)'); - $section->addInput(new Form_Checkbox( - 'no_tun_ipv6', - 'Disable IPv6', - 'Don\'t forward IPv6 traffic. ', - $pconfig['no_tun_ipv6'] - )); - $form->add($section); $section = new Form_Section('Client Settings'); @@ -1476,7 +1467,6 @@ events.push(function() { switch (value) { case "tun": - hideCheckbox('no_tun_ipv6', false); hideInput('tunnel_network', false); hideCheckbox('serverbridge_dhcp', true); hideInput('serverbridge_interface', true); @@ -1496,7 +1486,6 @@ events.push(function() { break; case "tap": - hideCheckbox('no_tun_ipv6', true); hideInput('tunnel_network', false); if (!p2p) { |