diff options
Diffstat (limited to 'etc/inc/vpn.inc')
| -rw-r--r-- | etc/inc/vpn.inc | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index 51adf1f..e84aefa 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -50,7 +50,7 @@ function vpn_ipsec_configure_loglevels() if (empty($config['ipsec']["ipsec_{$lkey}"])) mwexec("/usr/local/sbin/ipsec stroke loglevel {$lkey} -1", false); else if (is_numeric($config['ipsec']["ipsec_{$lkey}"]) && - intval($config['ipsec']["ipsec_{$lkey}"]) >= 1 && intval($config['ipsec']["ipsec_{$lkey}"]) <= 4) + intval($config['ipsec']["ipsec_{$lkey}"]) >= 1 && intval($config['ipsec']["ipsec_{$lkey}"]) <= 5) mwexec("/usr/local/sbin/ipsec stroke loglevel {$lkey} " . (intval($config['ipsec']["ipsec_{$lkey}"]) - 1) , false); } } @@ -533,9 +533,10 @@ EOD; continue; if (!isset($ph1ent['mobile'])) { - $rgip = $rgmap[$ph1ent['remote-gateway']]; - if (!$rgip) - continue; + $rgip = $ph1ent['remote-gateway']; + //$rgip = $rgmap[$ph1ent['remote-gateway']]; + //if (!$rgip) + // continue; } $myid_type = $ph1ent['myid_type']; @@ -561,7 +562,7 @@ EOD; case "asn1dn"; $myid_data = $ph1ent['myid_data']; if( $myid_data ) - $myid_data = "\"{$myid_data}\""; + $myid_data = "{$myid_data}"; break; } @@ -583,14 +584,10 @@ EOD; case "asn1dn"; $peerid_data = $ph1ent['peerid_data']; if( $peerid_data ) - $peerid_data = "\"{$peerid_data}\""; + $peerid_data = "{$peerid_data}"; break; } - $genp = "no"; - if (!empty($ph1ent['generate_policy']) && $ph1ent['generate_policy'] != "off") - $genp = "yes"; - $passive = "start"; if (isset($ph1ent['mobile'])) { $rgip = "%any"; @@ -698,7 +695,8 @@ EOD; } else { $tunneltype = "type = transport"; - $rgip = $rgmap[$ph1ent['remote-gateway']]; + //$rgip = $rgmap[$ph1ent['remote-gateway']]; + $rgip = $ph1ent['remote-gateway']; if ((($ph1ent['authentication_method'] == "xauth_psk_server") || ($ph1ent['authentication_method'] == "pre_shared_key")) |
