From cbcc5530b657e6a065e7f8a7cc13b39c196d4c66 Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Mon, 5 Nov 2007 17:29:57 +0000 Subject: IPSEC keep alive pinger using the wrong source IP address Ticket #1482 --- etc/inc/vpn.inc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'etc/inc/vpn.inc') diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index 0af3aa0..a984c5b 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -212,14 +212,14 @@ function vpn_ipsec_configure($ipchg = false) { /* add entry to host pinger */ if ($tunnel['pinghost']) { $pfd = fopen("/var/db/ipsecpinghosts", "a"); - $iflist = array("lan" => "lan", "wan" => "wan"); - for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++) - $iflist['opt' . $i] = "opt{$i}"; - - foreach ($iflist as $ifent => $ifname) { - if (ip_in_subnet(find_interface_ip($config['interfaces'][$ifname]['if']), $tunnel['local-subnet'])) - $srcip = find_interface_ip($config['interfaces'][$ifname]['if']); - } + $iflist = array("lan" => "lan", "wan" => "wan"); + for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++) + $iflist['opt' . $i] = "opt{$i}"; + foreach ($iflist as $ifent => $ifname) { + $interface_ip = find_interface_ip($config['interfaces'][$ifname]['if']); + if (ip_in_subnet($interface_ip, $sa . "/" . $sn)) + $srcip = find_interface_ip($config['interfaces'][$ifname]['if']); + } $dstip = $tunnel['pinghost']; fwrite($pfd, "$srcip|$dstip|3\n"); fclose($pfd); -- cgit v1.1