AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-26 03:19:52 +03:00
Code Releases Activity

Merge PR #1035: Cedar: add "DisableIPsecAggressiveMode" option

Browse Source
This commit is contained in:
Davide Beatrici 2019-11-18 07:31:27 +01:00 committed by GitHub
commit a676a0a6fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Cedar/Proto_IKE.c
View File

@ -38,7 +38,10 @@ void ProcIKEPacketRecv(IKE_SERVER *ike, UDPPACKET *p)
break; break;
case IKE_EXCHANGE_TYPE_AGGRESSIVE: // Aggressive mode case IKE_EXCHANGE_TYPE_AGGRESSIVE: // Aggressive mode
if (ike->Cedar->Server->DisableIPsecAggressiveMode == false)
{
ProcIkeAggressiveModePacketRecv(ike, p, header); ProcIkeAggressiveModePacketRecv(ike, p, header);
}
break; break;
case IKE_EXCHANGE_TYPE_QUICK: // Quick mode case IKE_EXCHANGE_TYPE_QUICK: // Quick mode

5
src/Cedar/Server.c
View File

@ -5821,6 +5821,9 @@ void SiLoadServerCfg(SERVER *s, FOLDER *f)
// Disable the NAT-traversal feature // Disable the NAT-traversal feature
s->DisableNatTraversal = CfgGetBool(f, "DisableNatTraversal"); s->DisableNatTraversal = CfgGetBool(f, "DisableNatTraversal");
// Disable IPsec's aggressive mode
s->DisableIPsecAggressiveMode = CfgGetBool(f, "DisableIPsecAggressiveMode");
if (s->Cedar->Bridge == false) if (s->Cedar->Bridge == false)
{ {
// Enable the VPN-over-ICMP // Enable the VPN-over-ICMP
@ -6237,6 +6240,8 @@ void SiWriteServerCfg(FOLDER *f, SERVER *s)
} }
} }
CfgAddBool(f, "DisableIPsecAggressiveMode", s->DisableIPsecAggressiveMode);
CfgAddStr(f, "OpenVPNDefaultClientOption", c->OpenVPNDefaultClientOption); CfgAddStr(f, "OpenVPNDefaultClientOption", c->OpenVPNDefaultClientOption);
CfgAddBool(f, "OpenVPNPushDummyIPv4AddressOnL2Mode", c->OpenVPNPushDummyIPv4AddressOnL2Mode); CfgAddBool(f, "OpenVPNPushDummyIPv4AddressOnL2Mode", c->OpenVPNPushDummyIPv4AddressOnL2Mode);

1
src/Cedar/Server.h
View File

@ -193,6 +193,7 @@ struct SERVER
bool NoMoreSave; // Do not save any more bool NoMoreSave; // Do not save any more
bool EnableConditionalAccept; // Apply the Conditional Accept the Listener bool EnableConditionalAccept; // Apply the Conditional Accept the Listener
bool EnableLegacySSL; // Enable Legacy SSL bool EnableLegacySSL; // Enable Legacy SSL
bool DisableIPsecAggressiveMode; // Disable IPsec's aggressive mode
volatile bool Halt; // Halting flag volatile bool Halt; // Halting flag
LOCK *lock; // Lock LOCK *lock; // Lock