Project

General

Profile

« Previous | Next » 

Revision 74a556a3

Added by Jim Pingle over 13 years ago

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)

View differences:

etc/inc/openvpn.inc
409 409 
				// If the CIDR is less than a /30, OpenVPN will complain if you try to
410 410 
				//  use the server directive. It works for a single client without it.
411 411 
				//  See ticket #1417
412 
				if (($settings['dev_mode'] != "tap") && ($cidr < 30)) {
412 
				if (!empty($ip) && !empty($mask) && ($cidr < 30)) {
413 413 
					$conf .= "server {$ip} {$mask}\n";
414 414 
					$conf .= "client-config-dir {$g['varetc_path']}/openvpn-csc\n";
415 415 
				}
416 416 
			case 'p2p_shared_key':
417 
				if ($settings['dev_mode'] != "tap") {
417 
				if (!empty($ip) && !empty($mask)) {
418 418 
					$baselong = ip2long32($ip) & ip2long($mask);
419 419 
					$ip1 = long2ip32($baselong + 1);
420 420 
					$ip2 = long2ip32($baselong + 2);
......
424 424 
			case 'server_tls':
425 425 
			case 'server_user':
426 426 
			case 'server_tls_user':
427 
				if ($settings['dev_mode'] != "tap") {
427 
				if (!empty($ip) && !empty($mask)) {
428 428 
					$conf .= "server {$ip} {$mask}\n";
429 429 
					if(is_ipaddr($ipv6))
430 430 
						$conf .= "server-ipv6 {$ipv6}/{$prefix}\n";
usr/local/www/vpn_openvpn_server.php
295 295 
		$reqdfields[] = 'tunnel_network';
296 296 
		$reqdfieldsn[] = gettext('Tunnel network');
297 297 
	} else {
298 
		if ($pconfig['serverbridge_dhcp'] && $pconfig['tunnel_network'])
299 
			$input_errors[] = gettext("Using a tunnel network and server bridge settings together is not allowed.");
298 300 
		if (($pconfig['serverbridge_dhcp_start'] && !$pconfig['serverbridge_dhcp_end'])
299 301 
		|| (!$pconfig['serverbridge_dhcp_start'] && $pconfig['serverbridge_dhcp_end']))
300 302 
			$input_errors[] = gettext("Server Bridge DHCP Start and End must both be empty, or defined.");
......
603 605 
	value = document.iform.dev_mode.options[index].value;
604 606 
	switch(value) {
605 607 
		case "tun":
606 
			document.getElementById("ipv4_tunnel_network").style.display="";
607 
			document.getElementById("ipv6_tunnel_network").style.display="";
608 
			document.getElementById("ipv4_tunnel_network").className="vncellreq";
608 609 
			document.getElementById("serverbridge_dhcp").style.display="none";
609 610 
			document.getElementById("serverbridge_interface").style.display="none";
610 611 
			document.getElementById("serverbridge_dhcp_start").style.display="none";
611 612 
			document.getElementById("serverbridge_dhcp_end").style.display="none";
612 613 
			break;
613 614 
		case "tap":
614 
			document.getElementById("ipv4_tunnel_network").style.display="none";
615 
			document.getElementById("ipv6_tunnel_network").style.display="none";
615 
			document.getElementById("ipv4_tunnel_network").className="vncell";
616 616 
			if (!p2p) {
617 617 
				document.getElementById("serverbridge_dhcp").style.display="";
618 618 
				document.getElementById("serverbridge_interface").style.display="";
......
1052 1052 
					<tr>
1053 1053 
						<td colspan="2" valign="top" class="listtopic"><?=gettext("Tunnel Settings"); ?></td>
1054 1054 
					</tr>
1055 
					<tr id="ipv4_tunnel_network">
1056 
						<td width="22%" valign="top" class="vncellreq"><?=gettext("IPv4 Tunnel Network"); ?></td>
1055 
					<tr>
1056 
						<td width="22%" valign="top" class="vncellreq" id="ipv4_tunnel_network"><?=gettext("IPv4 Tunnel Network"); ?></td>
1057 1057 
						<td width="78%" class="vtable">
1058 1058 
							<input name="tunnel_network" type="text" class="formfld unknown" size="20" value="<?=htmlspecialchars($pconfig['tunnel_network']);?>">
1059 1059 
							<br>
......
1066 1066 
							"to connecting clients. (see Address Pool)"); ?>
1067 1067 
						</td>
1068 1068 
					</tr>
1069 
					<tr id="ipv6_tunnel_network">
1070 
						<td width="22%" valign="top" class="vncellreq"><?=gettext("IPv6 Tunnel Network"); ?></td>
1069 
					<tr>
1070 
						<td width="22%" valign="top" class="vncell"><?=gettext("IPv6 Tunnel Network"); ?></td>
1071 1071 
						<td width="78%" class="vtable">
1072 1072 
							<input name="tunnel_networkv6" type="text" class="formfld unknown" size="20" value="<?=htmlspecialchars($pconfig['tunnel_networkv6']);?>">
1073 1073 
							<br>

Also available in: Unified diff