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:

etc/inc/openvpn.inc
55 55
global $openvpn_dev_mode;
56 56
$openvpn_dev_mode = array("tun", "tap");
57 57

  
58
global $openvpn_verbosity_level;
59
$openvpn_verbosity_level = array(
60
	0 =>	"none", 
61
	1 =>	"default", 
62
	2 =>	"2", 
63
	3 =>	"3 (recommended)", 
64
	4 =>	"4",
65
	5 => 	"5",
66
	6 => 	"6",
67
	7 => 	"7",
68
	8 => 	"8",
69
	9 => 	"9",
70
	10 => 	"10",
71
	11 => 	"11"
72
); 
73

  
58 74
/* 
59 75
 * The User Auth mode below is disabled because
60 76
 * OpenVPN erroneously requires that we provide
......
460 476
		}
461 477
	}
462 478

  
463
	$conf  = "dev {$devname}\n";
479
	$conf = "verb {$settings['verbosity_level']}\n";
480
	$conf .= "dev {$devname}\n";
464 481
	$conf .= "dev-type {$settings['dev_mode']}\n";
465 482
	switch($settings['dev_mode']) {
466 483
		case "tun":
467
			$conf .= "tun-ipv6\n";
484
			if (!$settings['no_tun_ipv6']) {
485
				$conf .= "tun-ipv6\n";
486
			} else {
487
			
488
			}
468 489
			break;
469 490
	}
470 491
	$conf .= "dev-node /dev/{$tunname}\n";
......
768 789
		$conf .= "topology subnet\n";
769 790
	}
770 791

  
792
	// New client features
793
	if ($mode == "client") {
794
		// Dont pull routes checkbox
795
		if ($settings['route_no_pull']) {
796
			$conf .= "route-nopull\n";
797
		}
798

  
799
		// Dont add/remove routes checkbox
800
		if ($settings['route_no_exec']) {
801
			$conf .= "route-noexec\n";
802
		}
803
	}
804

  
771 805
	openvpn_add_custom($settings, $conf);
772 806

  
773 807
	openvpn_create_dirs();

Formats disponibles : Unified diff