Projet

Général

Profil

« Précédent | Suivant » 

Révision 00311d6a

Ajouté par Chris Buechler il y a plus de 9 ans

Fix assignment of tunnel IPs to mobile clients.

Voir les différences:

etc/inc/vpn.inc
613 613
				$left_spec = $ep;
614 614

  
615 615
				$ipseclifetime = 0;
616
				$rightsourceip = NULL;
616 617
				$rightsubnet_spec = array();
617 618
				$leftsubnet_spec = array();
618 619
				$ealgoAHsp2arr = array();
......
664 665

  
665 666
						if (!isset($ph2ent['mobile'])) {
666 667
							$rightsubnet_spec[] = ipsec_idinfo_to_cidr($ph2ent['remoteid'], false, $ph2ent['mode']);
667
						} else if (!empty($a_client['pool_address']))
668
						} else if (!empty($a_client['pool_address'])) {
668 669
							$rightsubnet_spec[] = "{$a_client['pool_address']}/{$a_client['pool_netbits']}";
670
							$rightsourceip = "\trightsourceip={$a_client['pool_address']}/{$a_client['pool_netbits']}\n";
671
						}
669 672
					} else {
670 673
						$tunneltype = "type = transport";
671 674

  
......
765 768
					$ipsecconf .= "\t{$ikelifeline}\n";
766 769
				if ($ipseclifetime > 0)
767 770
					$ipsecconf .= "\tlifetime = {$ipseclifetime}s\n";
771
				if (!empty($rightsourceip))
772
					$ipsecconf .= "{$rightsourceip}";
768 773
				if (!empty($rightsubnet_spec))
769 774
					$ipsecconf .= "\trightsubnet = " . join(",", $rightsubnet_spec) . "\n";
770 775
				if (!empty($leftsubnet_spec))

Formats disponibles : Unified diff