Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: pfsense/pfsense
base: d632dd5aa9
...
head fork: pfsense/pfsense
compare: e46adb0913
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 1 file changed
  • 0 commit comments
  • 2 contributors
Commits on Mar 15, 2013
@mdima mdima Fixes IPSec Status for natted tunnels
See http://redmine.pfsense.org/issues/2884 for details.

Thanks, Michele
1bad102
@cbuechler cbuechler Merge pull request #482 from mdima/master
Fixes IPSec Status for natted tunnels
e46adb0
Showing with 1 addition and 1 deletion.
  1. +1 −1  etc/inc/ipsec.inc
View
2  etc/inc/ipsec.inc
@@ -354,7 +354,7 @@ function ipsec_phase2_status(& $spd,& $sad,& $ph1ent,& $ph2ent) {
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,$natloc_id,$rmt_id,$natloc_id))
+ else if (!empty($ph2ent['natlocalid']) && ipsec_lookup_ipsec_sa($spd,$sad,"out",$loc_ip,$rmt_ip,$loc_id,$rmt_id))
return true;
}

No commit comments for this range

Something went wrong with that request. Please try again.