diff options
| author | Ermal Luçi <eri@pfsense.org> | 2009-04-22 11:53:04 +0000 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2009-04-22 11:53:37 +0000 |
| commit | afb2de1b82ee940470f387b0151b93aba9f5ec62 (patch) | |
| tree | 75a17c7e19782d56461b545fd46bb7a501aeadfe /etc/inc/ipsec.inc | |
| parent | bd9f5fcabd4092d1a625265e80280b695a7e7ff2 (diff) | |
| download | pfsense-afb2de1b82ee940470f387b0151b93aba9f5ec62.zip pfsense-afb2de1b82ee940470f387b0151b93aba9f5ec62.tar.gz | |
* Make the carp ip fix for ipsec more general so other services that use the same methodology work.
- Basically get_interface_ip() now knows how to handle carp(4).
* Move interface related function from pfsense-utils.inc to interfaces.inc that is their place.
- More will come after the schedules fixes.
Diffstat (limited to 'etc/inc/ipsec.inc')
| -rw-r--r-- | etc/inc/ipsec.inc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/etc/inc/ipsec.inc b/etc/inc/ipsec.inc index 043a886..30a4542 100644 --- a/etc/inc/ipsec.inc +++ b/etc/inc/ipsec.inc @@ -124,10 +124,7 @@ function ipsec_get_phase1_src(& $ph1ent) { else $if = "wan"; - if (preg_match("/^carp/i", $ph1ent['interface'])) - find_interface_ip($if); - else - $interfaceip = get_interface_ip($if); + $interfaceip = get_interface_ip($if); return $interfaceip; } |
