Projet

Général

Profil

« Précédent | Suivant » 

Révision b9e9903d

Ajouté par Dmitriy K. il y a presque 10 ans

patchpack1

-Fix #3401 (Added tun option "Disable IPv6"
-Added new options: route-nopull, route-noexec, verb;

Voir les différences:

usr/local/www/vpn_openvpn_server.php
98 98
	$pconfig['local_port'] = openvpn_port_next('UDP');
99 99
	$pconfig['pool_enable'] = "yes";
100 100
	$pconfig['cert_depth'] = 1;
101
	$pconfig['verbosity_level'] = 1; // Default verbosity is 1
101 102
	// OpenVPN Defaults to SHA1
102 103
	$pconfig['digest'] = "SHA1";
103 104
}
......
205 206
		$pconfig['autotls_enable'] = "yes";
206 207

  
207 208
		$pconfig['duplicate_cn'] = isset($a_server[$id]['duplicate_cn']);
209
		
210
		// New features
211
		$pconfig['no_tun_ipv6'] = $a_server[$id]['no_tun_ipv6'];
212
		$pconfig['verbosity_level'] = $a_server[$id]['verbosity_level'];		
208 213
	}
209 214
}
210 215
if ($_POST) {
......
428 433
		$server['netbios_enable'] = $pconfig['netbios_enable'];
429 434
		$server['netbios_ntype'] = $pconfig['netbios_ntype'];
430 435
		$server['netbios_scope'] = $pconfig['netbios_scope'];
436
		 
437
		// New features
438
		$server['no_tun_ipv6'] = $pconfig['no_tun_ipv6'];
439
		$server['verbosity_level'] = $pconfig['verbosity_level'];
431 440

  
432 441
		if ($pconfig['netbios_enable']) {
433 442

  
......
671 680
	value = document.iform.dev_mode.options[index].value;
672 681
	switch(value) {
673 682
		case "tun":
683
			document.getElementById("cbNoTunIPv6").style.display="";
674 684
			document.getElementById("ipv4_tunnel_network").className="vncellreq";
675 685
			document.getElementById("serverbridge_dhcp").style.display="none";
676 686
			document.getElementById("serverbridge_interface").style.display="none";
......
679 689
			document.getElementById("topology_subnet_opt").style.display="";
680 690
			break;
681 691
		case "tap":
692
			document.getElementById("cbNoTunIPv6").style.display="none";
682 693
			document.getElementById("ipv4_tunnel_network").className="vncell";
683 694
			if (!p2p) {
684 695
				document.getElementById("serverbridge_dhcp").style.display="";
......
1340 1351
								<?php endforeach; ?>
1341 1352
							</select>
1342 1353
							<br />
1343
							<?=gettext("Compress tunnel packets using the LZO algorithm. Adaptive compression will dynamically disable compression for a period of time if OpenVPN detects that the data in the packets is not being compressed efficiently."); ?>
1354
							<?=gettext("Compress tunnel packets using the LZO algorithm. Adaptive compression will dynamically disable compression for a period of time if OpenVPN detects that the data in the packets is not being compressed efficiently."); ?>.
1344 1355
						</td>
1345 1356
					</tr>
1346 1357
					<tr>
......
1397 1408
							</table>
1398 1409
						</td>
1399 1410
					</tr>
1411

  
1412
					<tr id="cbNoTunIPv6">
1413
						<td width="22%" valign="top" class="vncell"><?=gettext("Disable IPv6"); ?></td>
1414
						<td width="78%" class="vtable">
1415
							<table border="0" cellpadding="2" cellspacing="0" summary="disable-ipv6-srv">
1416
								<tr>
1417
									<td>
1418
										<?php set_checked($pconfig['no_tun_ipv6'],$chk); ?>
1419
										<input name="no_tun_ipv6" type="checkbox" value="yes" <?=$chk;?> />
1420
									</td>
1421
									<td>
1422
										<span class="vexpl">
1423
											<?=gettext("Do not forward IPv6 traffic"); ?>.
1424
										</span>
1425
									</td>
1426
								</tr>
1427
							</table>
1428
						</td>
1429
					</tr>
1430

  
1400 1431
				</table>
1401 1432

  
1402 1433
				<table width="100%" border="0" cellpadding="6" cellspacing="0" id="client_opts" summary="client settings">
......
1724 1755
							</table>
1725 1756
						</td>
1726 1757
					</tr>
1758

  
1759
					<tr id="comboboxVerbosityLevel">
1760
							<td width="22%" valign="top" class="vncell"><?=gettext("Verbosity level");?></td>
1761
							<td width="78%" class="vtable">
1762
							<select name="verbosity_level" class="formselect">
1763
							<?php
1764
								foreach ($openvpn_verbosity_level as $verb_value => $verb_desc):
1765
									$selected = "";
1766
									if ($pconfig['verbosity_level'] == $verb_value)
1767
										$selected = "selected=\"selected\"";
1768
							?>
1769
								<option value="<?=$verb_value;?>" <?=$selected;?>><?=$verb_desc;?></option>
1770
							<?php endforeach; ?>
1771
							</select>
1772
							<br />
1773
							<?=gettext("Each level shows all info from the previous levels. Level 3 is recommended if you want a good summary of what's happening without being swamped by output"); ?>.<br /> <br />
1774
							<strong>none</strong> -- <?=gettext("No output except fatal errors"); ?>. <br />
1775
							<strong>default</strong>-<strong>4</strong> -- <?=gettext("Normal usage range"); ?>. <br />
1776
							<strong>5</strong> -- <?=gettext("Output R and W characters to the console for each packet read and write, uppercase is used for TCP/UDP packets and lowercase is used for TUN/TAP packets"); ?>. <br />
1777
							<strong>6</strong>-<strong>11</strong> -- <?=gettext("Debug info range"); ?>.
1778
							</td>
1779
					</tr>
1780

  
1727 1781
				</table>
1728 1782

  
1729 1783
				<br />

Formats disponibles : Unified diff