diff options
| author | Ermal <eri@pfsense.org> | 2014-11-04 21:21:47 +0100 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2014-11-04 21:21:47 +0100 |
| commit | 0810a719e903cef1d48fc94821ee6aa8ac8073fd (patch) | |
| tree | 2b511e00f90f29c83613d1499bf0407c035c2811 | |
| parent | 1db2634e32a588932e55bf972d3cf57063af0571 (diff) | |
| download | pfsense-0810a719e903cef1d48fc94821ee6aa8ac8073fd.zip pfsense-0810a719e903cef1d48fc94821ee6aa8ac8073fd.tar.gz | |
Restore 3 values back on NAT-T settings Just Enable now its Auto as per strongswan default. and off disabled mobike. Ticket #3979
| -rw-r--r-- | etc/inc/vpn.inc | 8 | ||||
| -rw-r--r-- | usr/local/www/vpn_ipsec_phase1.php | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index 1e181c1..12589f7 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -628,10 +628,12 @@ EOD; else $rekey = "rekey = yes"; - if ($ph1ent['nat_traversal'] != 'off') - $forceencaps = "forceencaps = yes"; + if ($ph1ent['nat_traversal'] == 'off') + $forceencaps = 'forceencaps = no\n\tmobike = no'; + else if ($ph1ent['nat_traversal'] == 'force') + $forceencaps = 'forceencaps = yes'; else - $forceencaps = "forceencaps = no"; + $forceencaps = 'forceencaps = no'; $ipseclifetime = 0; $rightsubnet_spec = array(); diff --git a/usr/local/www/vpn_ipsec_phase1.php b/usr/local/www/vpn_ipsec_phase1.php index 38db671..044bf10 100644 --- a/usr/local/www/vpn_ipsec_phase1.php +++ b/usr/local/www/vpn_ipsec_phase1.php @@ -866,8 +866,9 @@ function dpdchkbox_change() { <td width="22%" valign="top" class="vncell"><?=gettext("NAT Traversal"); ?></td> <td width="78%" class="vtable"> <select name="nat_traversal" class="formselect"> - <option value="off" <?php if ($pconfig['nat_traversal'] == 'off') echo "selected=\"selected\""; ?>><?=gettext("Auto"); ?></option> - <option value="on" <?php if ($pconfig['nat_traversal'] != 'off') echo "selected=\"selected\""; ?>><?=gettext("Force"); ?></option> + <option value="off" <?php if ($pconfig['nat_traversal'] == 'off') echo "selected=\"selected\""; ?>><?=gettext("Disable"); ?></option> + <option value="on" <?php if ($pconfig['nat_traversal'] != 'on') echo "selected=\"selected\""; ?>><?=gettext("Auto"); ?></option> + <option value="force" <?php if ($pconfig['nat_traversal'] == 'force') echo "selected=\"selected\""; ?>><?=gettext("Force"); ?></option> </select> <br /> <span class="vexpl"> |
