diff options
| -rw-r--r-- | src/etc/inc/openvpn.inc | 12 | ||||
| -rw-r--r-- | src/usr/local/www/vpn_openvpn_server.php | 26 |
2 files changed, 24 insertions, 14 deletions
diff --git a/src/etc/inc/openvpn.inc b/src/etc/inc/openvpn.inc index 5f482ce..bd2ba79 100644 --- a/src/etc/inc/openvpn.inc +++ b/src/etc/inc/openvpn.inc @@ -119,6 +119,13 @@ $openvpn_compression_modes = array( 'adaptive' => gettext("Enabled with Adaptive Compression"), 'yes' => gettext("Enabled without Adaptive Compression")); +global $openvpn_topologies; +$openvpn_topologies = array( + 'subnet' => gettext("Subnet -- One IP address per client in a common subnet"), + 'net30' => gettext("net30 -- Isolated /30 network per client") +// 'p2p => gettext("Peer to Peer -- One IP address per client peer-to-peer style. Does not work on Windows.") +); + function openvpn_build_mode_list() { global $openvpn_server_modes; @@ -1006,9 +1013,10 @@ function openvpn_reconfigure($mode, $settings) { $conf .= "float\n"; } - if ($settings['topology_subnet']) { - $conf .= "topology subnet\n"; + if (empty($settings['topology'])) { + $settings['topology'] = "subnet"; } + $conf .= "topology {$settings['topology']}\n"; // New client features if ($mode == "client") { diff --git a/src/usr/local/www/vpn_openvpn_server.php b/src/usr/local/www/vpn_openvpn_server.php index d0ef97c..023b5a6 100644 --- a/src/usr/local/www/vpn_openvpn_server.php +++ b/src/usr/local/www/vpn_openvpn_server.php @@ -65,6 +65,8 @@ require("guiconfig.inc"); require_once("openvpn.inc"); require_once("pkg-utils.inc"); +global $openvpn_topologies; + if (!is_array($config['openvpn']['openvpn-server'])) { $config['openvpn']['openvpn-server'] = array(); } @@ -201,7 +203,7 @@ if ($_GET['act'] == "edit") { $pconfig['dynamic_ip'] = $a_server[$id]['dynamic_ip']; $pconfig['pool_enable'] = $a_server[$id]['pool_enable']; - $pconfig['topology_subnet'] = $a_server[$id]['topology_subnet']; + $pconfig['topology'] = $a_server[$id]['topology']; $pconfig['serverbridge_dhcp'] = $a_server[$id]['serverbridge_dhcp']; $pconfig['serverbridge_interface'] = $a_server[$id]['serverbridge_interface']; @@ -509,7 +511,7 @@ if ($_POST) { $server['dynamic_ip'] = $pconfig['dynamic_ip']; $server['pool_enable'] = $pconfig['pool_enable']; - $server['topology_subnet'] = $pconfig['topology_subnet']; + $server['topology'] = $pconfig['topology']; $server['serverbridge_dhcp'] = $pconfig['serverbridge_dhcp']; $server['serverbridge_interface'] = $pconfig['serverbridge_interface']; @@ -965,14 +967,14 @@ if($act=="new" || $act=="edit") : $pconfig['pool_enable'] )); - $section->addInput(new Form_Checkbox( - 'topology_subnet', + $section->addInput(new Form_Select( + 'topology', 'Topology', - 'Allocate only one IP per client (topology subnet), rather than an isolated subnet per client (topology net30).', - $pconfig['topology_subnet'] - ))->setHelp('Relevant when supplying a virtual adapter IP address to clients when using tun mode on IPv4.").' . '<br />' . - 'Some clients may require this even for IPv6, such as OpenVPN Connect (iOS/Android). ' . - 'Others may break if it is present, such as older versions of OpenVPN or clients such as Yealink phones.'); + $pconfig['topology'], + $openvpn_topologies + ))->setHelp('Specifies the method used to supply a virtual adapter IP address to clients when using tun mode on IPv4.").' . '<br />' . + 'Some clients may require this be set to "subnet" even for IPv6, such as OpenVPN Connect (iOS/Android). ' . + 'Older versions of OpenVPN (before 2.0.9) or clients such as Yealink phones may require "net30".'); $section->addInput(new Form_Checkbox( 'dns_domain_enable', @@ -1432,7 +1434,7 @@ events.push(function(){ hideInput('serverbridge_interface', true); hideInput('serverbridge_dhcp_start', true); hideInput('serverbridge_dhcp_end', true); - hideInput('topology_subnet', false); + hideInput('topology', false); break; case "tap": @@ -1445,7 +1447,7 @@ events.push(function(){ hideInput('serverbridge_interface', false); hideInput('serverbridge_dhcp_start', false); hideInput('serverbridge_dhcp_end', false); - hideInput('topology_subnet', false); + hideInput('topology', false); if( $('#serverbridge_dhcp').prop('checked')) { disableInput('serverbridge_interface', false); @@ -1457,7 +1459,7 @@ events.push(function(){ disableInput('serverbridge_dhcp_end', true); } } else { - hideInput('topology_subnet', true); + hideInput('topology', true); disableInput('serverbridge_dhcp', true); disableInput('serverbridge_interface', true); disableInput('serverbridge_dhcp_start', true); |
