diff options
| author | Ermal <eri@pfsense.org> | 2014-11-19 08:54:31 +0100 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2014-11-19 08:54:31 +0100 |
| commit | ddabd9d679cde715f21cb53de06a1292d05a3e01 (patch) | |
| tree | 447c032f75e4a6ad469977c527ae0f2bb965e6fd /etc/inc/vpn.inc | |
| parent | b095e37061cfc472e281cf3fafb137a98ab656c1 (diff) | |
| download | pfsense-ddabd9d679cde715f21cb53de06a1292d05a3e01.zip pfsense-ddabd9d679cde715f21cb53de06a1292d05a3e01.tar.gz | |
Ticket #3987. Strongswan support autodetection of IKE version exchange. Support this by allowing an auto version in the GUI.
Diffstat (limited to 'etc/inc/vpn.inc')
| -rw-r--r-- | etc/inc/vpn.inc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index f5ba146..1afd979 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -534,9 +534,12 @@ EOD; $ikeid = $ph1ent['ikeid']; $keyexchange = "ikev1"; $passive = "route"; - if (!empty($ph1ent['iketype']) && $ph1ent['iketype'] != "ikev1") { - $keyexchange = "ikev2"; - //$passive = "start"; + if (!empty($ph1ent['iketype']) { + if ($ph1ent['iketype'] == "ikev2") { + $keyexchange = "ikev2"; + //$passive = "start"; + } else if ($ph1ent['iketype'] == "auto") + $keyexchange = "ike"; } if (isset($ph1ent['mobile'])) { |
