diff options
author | Seth Mos <seth.mos@dds.nl> | 2011-04-25 19:16:16 +0200 |
---|---|---|
committer | Seth Mos <seth.mos@dds.nl> | 2011-04-25 19:17:30 +0200 |
commit | b1ba04cf4a27f52d5c43eb23eeb7d3d359e69515 (patch) | |
tree | 3fbec98f9f0efe7c0ac3db0b9c0bc0883e658d15 /usr/local/www/vpn_openvpn_server.php | |
parent | 81b44848d3e36902d10e1f9f7ad6eaf9e476cc92 (diff) | |
download | pfsense-b1ba04cf4a27f52d5c43eb23eeb7d3d359e69515.zip pfsense-b1ba04cf4a27f52d5c43eb23eeb7d3d359e69515.tar.gz |
Add ipv6 tunnel remote subnets
Diffstat (limited to 'usr/local/www/vpn_openvpn_server.php')
-rw-r--r-- | usr/local/www/vpn_openvpn_server.php | 40 |
1 files changed, 36 insertions, 4 deletions
diff --git a/usr/local/www/vpn_openvpn_server.php b/usr/local/www/vpn_openvpn_server.php index 204cb62..ad58f36 100644 --- a/usr/local/www/vpn_openvpn_server.php +++ b/usr/local/www/vpn_openvpn_server.php @@ -131,9 +131,11 @@ if($_GET['act']=="edit"){ $pconfig['engine'] = $a_server[$id]['engine']; $pconfig['tunnel_network'] = $a_server[$id]['tunnel_network']; + $pconfig['tunnel_networkv6'] = $a_server[$id]['tunnel_networkv6']; $pconfig['remote_network'] = $a_server[$id]['remote_network']; $pconfig['gwredir'] = $a_server[$id]['gwredir']; $pconfig['local_network'] = $a_server[$id]['local_network']; + $pconfig['local_networkv6'] = $a_server[$id]['local_networkv6']; $pconfig['maxclients'] = $a_server[$id]['maxclients']; $pconfig['compression'] = $a_server[$id]['compression']; $pconfig['passtos'] = $a_server[$id]['passtos']; @@ -331,9 +333,11 @@ if ($_POST) { $server['engine'] = $pconfig['engine']; $server['tunnel_network'] = $pconfig['tunnel_network']; + $server['tunnel_networkv6'] = $pconfig['tunnel_networkv6']; $server['remote_network'] = $pconfig['remote_network']; $server['gwredir'] = $pconfig['gwredir']; $server['local_network'] = $pconfig['local_network']; + $server['local_networkv6'] = $pconfig['local_networkv6']; $server['maxclients'] = $pconfig['maxclients']; $server['compression'] = $pconfig['compression']; $server['passtos'] = $pconfig['passtos']; @@ -938,11 +942,11 @@ if ($savemsg) <td colspan="2" valign="top" class="listtopic"><?=gettext("Tunnel Settings"); ?></td> </tr> <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Tunnel Network"); ?></td> + <td width="22%" valign="top" class="vncellreq"><?=gettext("IPv4 Tunnel Network"); ?></td> <td width="78%" class="vtable"> <input name="tunnel_network" type="text" class="formfld unknown" size="20" value="<?=htmlspecialchars($pconfig['tunnel_network']);?>"> <br> - <?=gettext("This is the virtual network used for private " . + <?=gettext("This is the IPv4 virtual network used for private " . "communications between this server and client " . "hosts expressed using CIDR (eg. 10.0.8.0/24). " . "The first network address will be assigned to " . @@ -951,6 +955,20 @@ if ($savemsg) "to connecting clients. (see Address Pool)"); ?> </td> </tr> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("IPv6 Tunnel Network"); ?></td> + <td width="78%" class="vtable"> + <input name="tunnel_networkv6" type="text" class="formfld unknown" size="20" value="<?=htmlspecialchars($pconfig['tunnel_networkv6']);?>"> + <br> + <?=gettext("This is the IPv6 virtual network used for private " . + "communications between this server and client " . + "hosts expressed using CIDR (eg. 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)"); ?> + </td> + </tr> <tr id="gwredir_opts"> <td width="22%" valign="top" class="vncell"><?=gettext("Redirect Gateway"); ?></td> <td width="78%" class="vtable"> @@ -970,7 +988,7 @@ if ($savemsg) </td> </tr> <tr id="local_opts"> - <td width="22%" valign="top" class="vncell"><?=gettext("Local Network"); ?></td> + <td width="22%" valign="top" class="vncell"><?=gettext("IPv4 Local Network"); ?></td> <td width="78%" class="vtable"> <input name="local_network" type="text" class="formfld unknown" size="20" value="<?=htmlspecialchars($pconfig['local_network']);?>"> <br> @@ -982,6 +1000,19 @@ if ($savemsg) "This is generally set to your LAN network"); ?>. </td> </tr> + <tr id="local_opts"> + <td width="22%" valign="top" class="vncell"><?=gettext("IPv6 Local Network"); ?></td> + <td width="78%" class="vtable"> + <input name="local_networkv6" type="text" class="formfld unknown" size="20" value="<?=htmlspecialchars($pconfig['local_networkv6']);?>"> + <br> + <?=gettext("This is the IPv6 network that will be accessible " . + "from the remote endpoint. Expressed as a CIDR " . + "range. You may leave this blank if you don't " . + "want to add a route to the local network " . + "through this tunnel on the remote machine. " . + "This is generally set to your LAN network"); ?>. + </td> + </tr> <tr id="remote_opts"> <td width="22%" valign="top" class="vncell"><?=gettext("Remote Network"); ?></td> <td width="78%" class="vtable"> @@ -1399,7 +1430,8 @@ if ($savemsg) <?=htmlspecialchars($server['protocol']);?> / <?=htmlspecialchars($server['local_port']);?> </td> <td class="listr" ondblclick="document.location='vpn_openvpn_server.php?act=edit&id=<?=$i;?>'"> - <?=htmlspecialchars($server['tunnel_network']);?> + <?=htmlspecialchars($server['tunnel_network']);?><br/> + <?=htmlspecialchars($server['tunnel_networkv6']);?><br/> </td> <td class="listbg" ondblclick="document.location='vpn_openvpn_server.php?act=edit&id=<?=$i;?>'"> <?=htmlspecialchars($server['description']);?> |