diff options
| author | jim-p <jimp@pfsense.org> | 2011-11-09 12:48:38 -0500 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2011-11-09 12:48:38 -0500 |
| commit | 74a556a3caa67adb0adac055ffb9321e264e1b71 (patch) | |
| tree | 8bf1a9a39e7c117d4209a58f8a136136b35d7efe /usr | |
| parent | 1ab6bdb5ffcf052241f58af87efef9fe077b38c7 (diff) | |
| download | pfsense-74a556a3caa67adb0adac055ffb9321e264e1b71.zip pfsense-74a556a3caa67adb0adac055ffb9321e264e1b71.tar.gz | |
Rework this a little since using tap+tunnel network is valid, but using tap+tunnel network+bridging is not (will not do what the user expects/wants)
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/local/www/vpn_openvpn_server.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/usr/local/www/vpn_openvpn_server.php b/usr/local/www/vpn_openvpn_server.php index be1255c..ebf0bab 100644 --- a/usr/local/www/vpn_openvpn_server.php +++ b/usr/local/www/vpn_openvpn_server.php @@ -295,6 +295,8 @@ if ($_POST) { $reqdfields[] = 'tunnel_network'; $reqdfieldsn[] = gettext('Tunnel network'); } else { + if ($pconfig['serverbridge_dhcp'] && $pconfig['tunnel_network']) + $input_errors[] = gettext("Using a tunnel network and server bridge settings together is not allowed."); if (($pconfig['serverbridge_dhcp_start'] && !$pconfig['serverbridge_dhcp_end']) || (!$pconfig['serverbridge_dhcp_start'] && $pconfig['serverbridge_dhcp_end'])) $input_errors[] = gettext("Server Bridge DHCP Start and End must both be empty, or defined."); @@ -603,16 +605,14 @@ function tuntap_change() { value = document.iform.dev_mode.options[index].value; switch(value) { case "tun": - document.getElementById("ipv4_tunnel_network").style.display=""; - document.getElementById("ipv6_tunnel_network").style.display=""; + document.getElementById("ipv4_tunnel_network").className="vncellreq"; document.getElementById("serverbridge_dhcp").style.display="none"; document.getElementById("serverbridge_interface").style.display="none"; document.getElementById("serverbridge_dhcp_start").style.display="none"; document.getElementById("serverbridge_dhcp_end").style.display="none"; break; case "tap": - document.getElementById("ipv4_tunnel_network").style.display="none"; - document.getElementById("ipv6_tunnel_network").style.display="none"; + document.getElementById("ipv4_tunnel_network").className="vncell"; if (!p2p) { document.getElementById("serverbridge_dhcp").style.display=""; document.getElementById("serverbridge_interface").style.display=""; @@ -1052,8 +1052,8 @@ if ($savemsg) <tr> <td colspan="2" valign="top" class="listtopic"><?=gettext("Tunnel Settings"); ?></td> </tr> - <tr id="ipv4_tunnel_network"> - <td width="22%" valign="top" class="vncellreq"><?=gettext("IPv4 Tunnel Network"); ?></td> + <tr> + <td width="22%" valign="top" class="vncellreq" id="ipv4_tunnel_network"><?=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> @@ -1066,8 +1066,8 @@ if ($savemsg) "to connecting clients. (see Address Pool)"); ?> </td> </tr> - <tr id="ipv6_tunnel_network"> - <td width="22%" valign="top" class="vncellreq"><?=gettext("IPv6 Tunnel Network"); ?></td> + <tr> + <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> |
