mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove references to unused "Address Pool" setting. The address behavior is now determined by the mode, and has been for years. Fixes #7567

Browse Source
This commit is contained in:
jim-p 2017-05-22 12:24:15 -04:00
parent d44942d347
commit bc3669e4e8
3 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/usr/local/www/vpn_openvpn_server.php
View File

@ -105,7 +105,6 @@ if ($act == "new") {
$pconfig['dev_mode'] = "tun";
$pconfig['interface'] = "wan";
$pconfig['local_port'] = openvpn_port_next('UDP');
$pconfig['pool_enable'] = "yes";
$pconfig['cert_depth'] = 1;
$pconfig['verbosity_level'] = 1; // Default verbosity is 1
// OpenVPN Defaults to SHA1
@ -183,7 +182,6 @@ if ($act == "edit") {
$pconfig['client2client'] = $a_server[$id]['client2client'];
$pconfig['dynamic_ip'] = $a_server[$id]['dynamic_ip'];
$pconfig['pool_enable'] = $a_server[$id]['pool_enable'];
$pconfig['topology'] = $a_server[$id]['topology'];
$pconfig['serverbridge_dhcp'] = $a_server[$id]['serverbridge_dhcp'];
@ -547,7 +545,6 @@ if ($_POST['save']) {
$server['client2client'] = $pconfig['client2client'];
$server['dynamic_ip'] = $pconfig['dynamic_ip'];
$server['pool_enable'] = $pconfig['pool_enable'];
$server['topology'] = $pconfig['topology'];
$server['serverbridge_dhcp'] = $pconfig['serverbridge_dhcp'];
@ -982,8 +979,8 @@ if ($act=="new" || $act=="edit"):
$pconfig['tunnel_network']
))->setHelp('This is the IPv4 virtual network used for private communications between this server and client ' .
'hosts expressed using CIDR (e.g. 10.0.8.0/24). The first network address will be assigned to ' .
'the server virtual interface. The remaining network addresses can optionally be assigned ' .
'to connecting clients (see Address Pool).');
'the server virtual interface. The remaining network addresses will be assigned ' .
'to connecting clients.');
$section->addInput(new Form_Input(
'tunnel_networkv6',
@ -993,7 +990,7 @@ if ($act=="new" || $act=="edit"):
))->setHelp('This is the IPv6 virtual network used for private ' .
'communications between this server and client hosts expressed using CIDR (e.g. fe80::/64). ' .
'The first network address will be assigned to the server virtual interface. The remaining ' .
'network addresses can optionally be assigned to connecting clients (see Address Pool).');
'network addresses will be assigned to connecting clients.');
$section->addInput(new Form_Checkbox(
'serverbridge_dhcp',
@ -1127,13 +1124,6 @@ if ($act=="new" || $act=="edit"):
$pconfig['dynamic_ip']
));
$section->addInput(new Form_Checkbox(
'pool_enable',
'Address Pool',
'Provide a virtual adapter IP address to clients (see Tunnel Network).',
$pconfig['pool_enable']
));
$section->addInput(new Form_Select(
'topology',
'Topology',

2
src/usr/local/www/wizards/openvpn_wizard.inc
View File

@ -597,8 +597,6 @@ function step12_submitphpaction() {
$server['duplicate_cn'] = $pconfig['step10']['duplicate_cn'];
if (isset($pconfig['step10']['dynip']))
$server['dynamic_ip'] = $pconfig['step10']['dynip'];
if (isset($pconfig['step10']['addrpool']))
$server['pool_enable'] = $pconfig['step10']['addrpool'];
if (isset($pconfig['step10']['defaultdomain']))
$server['dns_domain'] = $pconfig['step10']['defaultdomain'];
if (isset($pconfig['step10']['dns1']))

10
src/usr/local/www/wizards/openvpn_wizard.xml
View File

@ -782,7 +782,7 @@
<type>input</type>
<size>20</size>
<bindstofield>ovpnserver->step10->tunnelnet</bindstofield>
<description>This is the virtual network used for private communications between this server and client hosts expressed using CIDR notation (eg. 10.0.8.0/24). The first network address will be assigned to the server virtual interface. The remaining network addresses can optionally be assigned to connecting clients. (see Address Pool)</description>
<description>This is the virtual network used for private communications between this server and client hosts expressed using CIDR notation (eg. 10.0.8.0/24). The first network address will be assigned to the server virtual interface. The remaining network addresses will be assigned to connecting clients.</description>
</field>
<field>
<displayname>Redirect Gateway</displayname>
@ -853,14 +853,6 @@
<description>Allow connected clients to retain their connections if their IP address changes.</description>
<bindstofield>ovpnserver->step10->dynip</bindstofield>
</field>
<field>
<displayname>Address Pool</displayname>
<name>addrpool</name>
<type>checkbox</type>
<value>on</value>
<description>Provide a virtual adapter IP address to clients (see Tunnel Network).</description>
<bindstofield>ovpnserver->step10->addrpool</bindstofield>
</field>
<field>
<displayname>Topology</displayname>
<name>topology</name>