diff options
| author | Ermal LUÇI <eri@pfsense.org> | 2015-01-13 16:38:12 +0100 |
|---|---|---|
| committer | Ermal LUÇI <eri@pfsense.org> | 2015-01-13 19:57:28 +0100 |
| commit | b40137258e69f31a94366eff7ee32722a4f344b1 (patch) | |
| tree | 09bfd29212e204999895a5711a73bb8fe9b044fb /usr/local | |
| parent | 6db7ee23db8582d1ee06c7fff83c19a014415838 (diff) | |
| download | pfsense-b40137258e69f31a94366eff7ee32722a4f344b1.zip pfsense-b40137258e69f31a94366eff7ee32722a4f344b1.tar.gz | |
To avoid issues with clashing SAIDs go back to specifying the reqid in strongswan config.
To be able to manage this first upgrade the config to assign each phase2 an reqid
Second use that during config generation
Ticket #4208
Diffstat (limited to 'usr/local')
| -rw-r--r-- | usr/local/www/vpn_ipsec_phase2.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/usr/local/www/vpn_ipsec_phase2.php b/usr/local/www/vpn_ipsec_phase2.php index 6f07408..160b264 100644 --- a/usr/local/www/vpn_ipsec_phase2.php +++ b/usr/local/www/vpn_ipsec_phase2.php @@ -93,6 +93,7 @@ if ($ph2found === true) $pconfig['pfsgroup'] = $ph2['pfsgroup']; $pconfig['lifetime'] = $ph2['lifetime']; $pconfig['pinghost'] = $ph2['pinghost']; + $pconfig['reqid'] = $ph2['reqid']; if (isset($ph2['mobile'])) $pconfig['mobile'] = true; @@ -320,6 +321,10 @@ if ($_POST) { $ph2ent['uniqid'] = $pconfig['uniqid']; $ph2ent['mode'] = $pconfig['mode']; $ph2ent['disabled'] = $pconfig['disabled'] ? true : false; + if (!isset($pconfig['reqid'])) + $ph2ent['reqid'] = ipsec_new_reqid(); + else + $ph2ent['reqid'] = $pconfig['reqid']; if(($ph2ent['mode'] == "tunnel") || ($ph2ent['mode'] == "tunnel6")){ if (!empty($pconfig['natlocalid_address'])) @@ -832,6 +837,9 @@ function change_protocol() { <?php endif; ?> <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" /> <input name="ikeid" type="hidden" value="<?=htmlspecialchars($pconfig['ikeid']);?>" /> + <?php if (!empty($pconfig['reqid'])): ?> + <input name="reqid" type="hidden" value="<?=htmlspecialchars($pconfig['reqid']);?>" /> + <?php endif; ?> <input name="uniqid" type="hidden" value="<?=htmlspecialchars($pconfig['uniqid']);?>" /> </td> </tr> |
