mirror of
https://github.com/lucaspalomodevelop/core.git
synced 2026-03-18 02:25:05 +00:00
openvpn: remove remnamts of tun-ipv6
PR: https://forum.opnsense.org/index.php?topic=24094.15 See also: https://community.openvpn.net/openvpn/wiki/DeprecatedOptions#Option:--tun-ipv6
This commit is contained in:
Franco Fichtner
parent
60d62437f2
commit
1176f829cb
@ -524,14 +524,6 @@ function openvpn_reconfigure($mode, $settings, $device_only = false)
|
||||
}
|
||||
|
||||
$conf .= "dev-type {$settings['dev_mode']}\n";
|
||||
switch ($settings['dev_mode']) {
|
||||
case "tun":
|
||||
if (!$settings['no_tun_ipv6']) {
|
||||
$conf .= "tun-ipv6\n";
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
$conf .= "dev-node /dev/{$devnode}\n";
|
||||
$conf .= "writepid /var/run/openvpn_{$mode_id}.pid\n";
|
||||
$conf .= "script-security 3\n";
|
||||
|
||||
@ -89,12 +89,10 @@ class PlainOpenVPN extends BaseExporter implements IExportProvider
|
||||
*/
|
||||
protected function openvpnConfParts()
|
||||
{
|
||||
$conf = array();
|
||||
$conf = [];
|
||||
|
||||
$conf[] = "dev " . (!empty($this->config['dev_mode']) ? $this->config['dev_mode'] : 'tun');
|
||||
|
||||
if (!empty($this->config['tunnel_networkv6'])) {
|
||||
$conf[] .= "tun-ipv6";
|
||||
}
|
||||
$conf[] = "persist-tun";
|
||||
$conf[] = "persist-key";
|
||||
if (strncasecmp($this->config['protocol'], "tcp", 3) === 0) {
|
||||
|
||||
@ -63,7 +63,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
|
||||
,proxy_addr,proxy_port,proxy_user,proxy_passwd,proxy_authtype,description
|
||||
,custom_options,ns_cert_type,dev_mode,caref,certref,crypto,digest
|
||||
,tunnel_network,tunnel_networkv6,remote_network,remote_networkv6,use_shaper
|
||||
,compression,passtos,no_tun_ipv6,route_no_pull,route_no_exec,verbosity_level";
|
||||
,compression,passtos,route_no_pull,route_no_exec,verbosity_level";
|
||||
|
||||
foreach (explode(",", $copy_fields) as $fieldname) {
|
||||
$fieldname = trim($fieldname);
|
||||
@ -104,7 +104,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
|
||||
,proxy_addr,proxy_port,proxy_user,proxy_passwd,proxy_authtype,description
|
||||
,custom_options,ns_cert_type,dev_mode,caref,certref,crypto,digest
|
||||
,tunnel_network,tunnel_networkv6,remote_network,remote_networkv6,use_shaper
|
||||
,compression,passtos,no_tun_ipv6,route_no_pull,route_no_exec,verbosity_level";
|
||||
,compression,passtos,route_no_pull,route_no_exec,verbosity_level";
|
||||
|
||||
foreach (explode(",", $init_fields) as $fieldname) {
|
||||
$fieldname = trim($fieldname);
|
||||
@ -306,7 +306,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
|
||||
,server_addr,server_port,resolve_retry,proxy_addr,proxy_port,remote_random
|
||||
,proxy_authtype,proxy_user,proxy_passwd,description,mode,crypto,digest
|
||||
,tunnel_network,tunnel_networkv6,remote_network,remote_networkv6
|
||||
,use_shaper,compression,passtos,no_tun_ipv6,route_no_pull,route_no_exec
|
||||
,use_shaper,compression,passtos,route_no_pull,route_no_exec
|
||||
,verbosity_level,interface";
|
||||
|
||||
foreach (explode(",", $copy_fields) as $fieldname) {
|
||||
@ -469,17 +469,6 @@ $( document ).ready(function() {
|
||||
}
|
||||
});
|
||||
$("#mode").change();
|
||||
$("#dev_mode").change(function(){
|
||||
switch($(this).val()) {
|
||||
case "tun":
|
||||
$(".chkboxNoTunIPv6").show();
|
||||
break;
|
||||
case "tap":
|
||||
$(".chkboxNoTunIPv6").hide();
|
||||
break;
|
||||
}
|
||||
});
|
||||
$("#dev_mode").change();
|
||||
|
||||
$("#autokey_enable").change(function(){
|
||||
if ($("#autokey_enable:checked").val() != undefined) {
|
||||
@ -1038,15 +1027,6 @@ $( document ).ready(function() {
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr class="chkboxNoTunIPv6">
|
||||
<td><a id="help_for_no_tun_ipv6" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Disable IPv6"); ?></td>
|
||||
<td>
|
||||
<input name="no_tun_ipv6" type="checkbox" value="yes" <?=!empty($pconfig['no_tun_ipv6']) ? "checked=\"checked\"" : "" ;?> />
|
||||
<div class="hidden" data-for="help_for_no_tun_ipv6">
|
||||
<?=gettext("Don't forward IPv6 traffic"); ?>.
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr id="chkboxRouteNoPull">
|
||||
<td><a id="help_for_route_no_pull" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Don't pull routes"); ?></td>
|
||||
<td>
|
||||
|
||||
@ -66,7 +66,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
|
||||
,serverbridge_interface,serverbridge_dhcp_start,serverbridge_dhcp_end
|
||||
,dns_server1,dns_server2,dns_server3,dns_server4,ntp_server1
|
||||
,ntp_server2,netbios_enable,netbios_ntype,netbios_scope,wins_server1
|
||||
,wins_server2,no_tun_ipv6,push_register_dns,push_block_outside_dns,dns_domain,local_group
|
||||
,wins_server2,push_register_dns,push_block_outside_dns,dns_domain,local_group
|
||||
,client_mgmt_port,verbosity_level,caref,crlref,certref,dh_length
|
||||
,cert_depth,strictusercn,digest,disable,duplicate_cn,vpnid,reneg-sec,use-common-name,cso_login_matching";
|
||||
|
||||
@ -114,7 +114,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
|
||||
,serverbridge_interface,serverbridge_dhcp_start,serverbridge_dhcp_end
|
||||
,dns_server1,dns_server2,dns_server3,dns_server4,ntp_server1
|
||||
,ntp_server2,netbios_enable,netbios_ntype,netbios_scope,wins_server1
|
||||
,wins_server2,no_tun_ipv6,push_register_dns,push_block_outside_dns,dns_domain
|
||||
,wins_server2,push_register_dns,push_block_outside_dns,dns_domain
|
||||
,client_mgmt_port,verbosity_level,caref,crlref,certref,dh_length
|
||||
,cert_depth,strictusercn,digest,disable,duplicate_cn,vpnid,shared_key,tls,reneg-sec,use-common-name
|
||||
,cso_login_matching";
|
||||
@ -369,7 +369,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
|
||||
,serverbridge_dhcp,serverbridge_interface,serverbridge_dhcp_start
|
||||
,serverbridge_dhcp_end,dns_domain,dns_server1,dns_server2,dns_server3
|
||||
,dns_server4,push_register_dns,push_block_outside_dns,ntp_server1,ntp_server2,netbios_enable
|
||||
,netbios_ntype,netbios_scope,no_tun_ipv6,verbosity_level,wins_server1
|
||||
,netbios_ntype,netbios_scope,verbosity_level,wins_server1
|
||||
,wins_server2,client_mgmt_port,strictusercn,reneg-sec,use-common-name,cso_login_matching";
|
||||
|
||||
foreach (explode(",", $copy_fields) as $fieldname) {
|
||||
@ -1289,17 +1289,6 @@ endif; ?>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr class="dev_mode dev_mode_tun">
|
||||
<td style="width:22%"><a id="help_for_no_tun_ipv6" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Disable IPv6"); ?></td>
|
||||
<td>
|
||||
<input name="no_tun_ipv6" type="checkbox" value="yes" <?=!empty($pconfig['no_tun_ipv6']) ? "checked=\"checked\"" : "" ;?> />
|
||||
<div class="hidden" data-for="help_for_no_tun_ipv6">
|
||||
<span>
|
||||
<?=gettext("Don't forward IPv6 traffic"); ?>.
|
||||
</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user