diff options
| author | jim-p <jimp@pfsense.org> | 2017-05-22 13:25:01 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2017-05-22 13:25:01 -0400 |
| commit | 473f7ec48f7510a60ade574ef32b09f4abaa6b9a (patch) | |
| tree | a21fc69cf297bc94cb5a7b137a039c9057ea978a /src | |
| parent | 85d564f0fd278d27f1a2ff89214bf297676bfd0c (diff) | |
| download | pfsense-473f7ec48f7510a60ade574ef32b09f4abaa6b9a.zip pfsense-473f7ec48f7510a60ade574ef32b09f4abaa6b9a.tar.gz | |
Clarify address assignment behavior in the Tunnel Network fields for openvpn clients and servers. Fixes #7573
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr/local/www/vpn_openvpn_client.php | 9 | ||||
| -rw-r--r-- | src/usr/local/www/vpn_openvpn_server.php | 10 |
2 files changed, 10 insertions, 9 deletions
diff --git a/src/usr/local/www/vpn_openvpn_client.php b/src/usr/local/www/vpn_openvpn_client.php index 9e16805..d543ece 100644 --- a/src/usr/local/www/vpn_openvpn_client.php +++ b/src/usr/local/www/vpn_openvpn_client.php @@ -805,8 +805,8 @@ if ($act=="new" || $act=="edit"): 'text', $pconfig['tunnel_network'] ))->setHelp('This is the IPv4 virtual network used for private communications between this client and the server ' . - 'expressed using CIDR (e.g. 10.0.8.0/24). The second network address will be assigned to ' . - 'the client virtual interface.'); + 'expressed using CIDR notation (e.g. 10.0.8.0/24). The second usable address in the network will be assigned to ' . + 'the client virtual interface. Leave blank if the server is capable of providing addresses to clients.'); $section->addInput(new Form_Input( 'tunnel_networkv6', @@ -814,8 +814,9 @@ if ($act=="new" || $act=="edit"): 'text', $pconfig['tunnel_networkv6'] ))->setHelp('This is the IPv6 virtual network used for private ' . - 'communications between this client and the server expressed using CIDR (e.g. fe80::/64). ' . - 'The second network address will be assigned to the client virtual interface.'); + 'communications between this client and the server expressed using CIDR notation (e.g. fe80::/64). ' . + 'When set static using this field, the ::2 address in the network will be assigned to the client virtual interface. ' . + 'Leave blank if the server is capable of providing addresses to clients.'); $section->addInput(new Form_Input( 'remote_network', diff --git a/src/usr/local/www/vpn_openvpn_server.php b/src/usr/local/www/vpn_openvpn_server.php index 5416b70..d2a4a57 100644 --- a/src/usr/local/www/vpn_openvpn_server.php +++ b/src/usr/local/www/vpn_openvpn_server.php @@ -978,8 +978,8 @@ if ($act=="new" || $act=="edit"): 'text', $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 will be assigned ' . + 'hosts expressed using CIDR notation (e.g. 10.0.8.0/24). The first usable address in the network will be assigned to ' . + 'the server virtual interface. The remaining usable addresses will be assigned ' . 'to connecting clients.'); $section->addInput(new Form_Input( @@ -988,9 +988,9 @@ if ($act=="new" || $act=="edit"): 'text', $pconfig['tunnel_networkv6'] ))->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 will be assigned to connecting clients.'); + 'communications between this server and client hosts expressed using CIDR notation (e.g. fe80::/64). ' . + 'The ::1 address in the network will be assigned to the server virtual interface. The remaining ' . + 'addresses will be assigned to connecting clients.'); $section->addInput(new Form_Checkbox( 'serverbridge_dhcp', |
