Add forgotten "ipv6 remote network", clean up a couple bits, make sure local network box is hidden for shared key servers.

1 files changed, 42 insertions, 3 deletions

diff --git a/usr/local/www/vpn_openvpn_client.php b/usr/local/www/vpn_openvpn_client.php
index f37e81b..9a33d05 100644
--- a/usr/local/www/vpn_openvpn_client.php
+++ b/usr/local/www/vpn_openvpn_client.php
@@ -128,7 +128,9 @@ if($_GET['act']=="edit"){
 		$pconfig['engine'] = $a_client[$id]['engine'];
 
 		$pconfig['tunnel_network'] = $a_client[$id]['tunnel_network'];
+		$pconfig['tunnel_networkv6'] = $a_client[$id]['tunnel_networkv6'];
 		$pconfig['remote_network'] = $a_client[$id]['remote_network'];
+		$pconfig['remote_networkv6'] = $a_client[$id]['remote_networkv6'];
 		$pconfig['use_shaper'] = $a_client[$id]['use_shaper'];
 		$pconfig['compression'] = $a_client[$id]['compression'];
 		$pconfig['passtos'] = $a_client[$id]['passtos'];
@@ -262,7 +264,9 @@ if ($_POST) {
 		$client['engine'] = $pconfig['engine'];
 
 		$client['tunnel_network'] = $pconfig['tunnel_network'];
+		$client['tunnel_networkv6'] = $pconfig['tunnel_networkv6'];
 		$client['remote_network'] = $pconfig['remote_network'];
+		$client['remote_networkv6'] = $pconfig['remote_networkv6'];
 		$client['use_shaper'] = $pconfig['use_shaper'];
 		$client['compression'] = $pconfig['compression'];
 		$client['passtos'] = $pconfig['passtos'];
@@ -760,7 +764,7 @@ if ($savemsg)
 						<td colspan="2" valign="top" class="listtopic"><?=gettext("Tunnel Settings"); ?></td>
 					</tr>
 					<tr>
-						<td width="22%" valign="top" class="vncell"><?=gettext("Tunnel Network"); ?></td>
+						<td width="22%" valign="top" class="vncell"><?=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>
@@ -774,7 +778,21 @@ if ($savemsg)
 						</td>
 					</tr>
 					<tr>
-						<td width="22%" valign="top" class="vncell"><?=gettext("Remote Network"); ?></td>
+						<td width="22%" valign="top" class="vncell"><?=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 client and the " .
+							"server expressed using CIDR (eg. fe80::/64). " .
+							"The first network address is assumed to be the " .
+							"server address and the second network address " .
+							"will be assigned to the client virtual " .
+							"interface"); ?>.
+						</td>
+					</tr>
+					<tr>
+						<td width="22%" valign="top" class="vncell"><?=gettext("IPv4 Remote Network"); ?></td>
 						<td width="78%" class="vtable">
 							<input name="remote_network" type="text" class="formfld unknown" size="20" value="<?=htmlspecialchars($pconfig['remote_network']);?>">
 							<br>
@@ -788,6 +806,20 @@ if ($savemsg)
 						</td>
 					</tr>
 					<tr>
+						<td width="22%" valign="top" class="vncell"><?=gettext("IPv6 Remote Network"); ?></td>
+						<td width="78%" class="vtable">
+							<input name="remote_network" type="text" class="formfld unknown" size="20" value="<?=htmlspecialchars($pconfig['remote_network']);?>">
+							<br>
+							<?=gettext("This is an IPv6 network that will be routed through " .
+							"the tunnel, so that a site-to-site VPN can be " .
+							"established without manually changing the " .
+							"routing tables. Expressed as an IP/PREFIX. If " .
+							"this is a site-to-site VPN, enter the " .
+							"remote LAN here. You may leave this blank to " .
+							"only communicate with other clients"); ?>.
+						</td>
+					</tr>
+					<tr>
 						<td width="22%" valign="top" class="vncell"><?=gettext("Limit outgoing bandwidth");?></td>
 						<td width="78%" class="vtable">
 							<input name="use_shaper" type="text" class="formfld unknown" size="5" value="<?=htmlspecialchars($pconfig['use_shaper']);?>"/>
@@ -834,6 +866,9 @@ if ($savemsg)
 							</table>
 						</td>
 					</tr>
+				</table>
+
+				<table width="100%" border="0" cellpadding="6" cellspacing="0" id="client_opts">
 					<tr>
 						<td colspan="2" class="list" height="12"></td>
 					</tr>
@@ -853,7 +888,11 @@ if ($savemsg)
 								</tr>
 							</table>
 						</td>
-					</tr>					
+					</tr>
+				</table>
+
+				<br/>
+				<table width="100%" border="0" cellpadding="6" cellspacing="0">
 					<tr>
 						<td width="22%" valign="top">&nbsp;</td>
 						<td width="78%">