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

This should fix ipsec status for natted tunnel(s).

Browse Source
This commit is contained in:
Ermal 2012-10-05 19:41:12 +00:00
parent 909890c4f0
commit f3c338b3b3
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
etc/inc/ipsec.inc
View File

@ -329,12 +329,17 @@ function ipsec_phase2_status(& $spd,& $sad,& $ph1ent,& $ph2ent) {
$rmt_ip = ipsec_get_phase1_dst($ph1ent);
$loc_id = ipsec_idinfo_to_cidr($ph2ent['localid'],true);
if (!empty($ph2ent['natlocalid']))
$natloc_id = ipsec_idinfo_to_cidr($ph2ent['natlocalid'],true);
$rmt_id = ipsec_idinfo_to_cidr($ph2ent['remoteid'],true);
/* check for established SA in both directions */
if( ipsec_lookup_ipsec_sa($spd,$sad,"out",$loc_ip,$rmt_ip,$loc_id,$rmt_id) &&
ipsec_lookup_ipsec_sa($spd,$sad,"in",$rmt_ip,$loc_ip,$rmt_id,$loc_id))
return true;
if( ipsec_lookup_ipsec_sa($spd,$sad,"out",$loc_ip,$rmt_ip,$loc_id,$rmt_id)) {
if (empty($ph2ent['natlocalid']) && ipsec_lookup_ipsec_sa($spd,$sad,"in",$rmt_ip,$loc_ip,$rmt_id,$loc_id))
return true;
else if (!empty($ph2ent['natlocalid']) && ipsec_lookup_ipsec_sa($spd,$sad,"in",$rmt_ip,$loc_ip,$rmt_id,$natloc_id))
return true;
}
return false;
}