mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct a regression that caused non NAT-T IPsec tunnel communications to

Browse Source 
fail.
This commit is contained in:
Matthew Grooms 2008-08-01 20:52:26 +00:00
parent 0e640f7604
commit 2f69e11c5e
1 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
etc/inc/filter.inc
View File

@ -2501,31 +2501,11 @@ EOD;
if (isset($config['ipsec']['enable']) &&
is_array($config['ipsec']['phase1'])) {
/* Step through all phase2 entries and determine
* which protocols are in use with this peer
*/
$prot_used_esp = false;
$prot_used_ah = false;
if (is_array($config['ipsec']['phase2']))
foreach ($config['ipsec']['phase2'] as $ph2ent) {
/* only evaluate ph2's bound to our ph1 */
if ($ph2ent['ikeid'] != $ph1ent['ikeid'])
continue;
if ($ph2ent['protocol'] == 'esp')
$prot_used_esp = true;
if ($ph2ent['protocol'] == 'ah')
$prot_used_ah = true;
}
/* step through all phase1 entries */
foreach ($config['ipsec']['phase1'] as $ph1ent) {
if (isset ($ph1ent['disabled']))
continue;
if (isset ($ph1ent['disabled']))
continue;
update_filter_reload_status("Creating IPsec phase1 items for {$ph1ent['descr']}...");
@ -2549,6 +2529,30 @@ EOD;
else
$descr = $rgip;
/*
* Step through all phase2 entries and determine
* which protocols are in use with this peer
*/
$prot_used_esp = false;
$prot_used_ah = false;
if (is_array($config['ipsec']['phase2'])) {
foreach ($config['ipsec']['phase2'] as $ph2ent) {
/* only evaluate ph2's bound to our ph1 */
if ($ph2ent['ikeid'] != $ph1ent['ikeid'])
continue;
if ($ph2ent['protocol'] == 'esp')
$prot_used_esp = true;
if ($ph2ent['protocol'] == 'ah')
$prot_used_ah = true;
}
}
foreach ($FilterIflist as $ifr => $ifcfg) {
/* Only process interfaces with gateway */