1
0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-10 03:30:39 +03:00

Merge PR #691: Cedar: replace "Interop_" and "IPsec_" with "Proto_" in the protocol-specific source/header files' names

This commit is contained in:
Davide Beatrici 2018-09-10 00:59:24 +02:00 committed by GitHub
commit bd81c17522
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 189 additions and 211 deletions

View File

@ -1108,7 +1108,7 @@ typedef struct CEDAR
#include <Cedar/Sam.h> #include <Cedar/Sam.h>
// Radius authentication module // Radius authentication module
#include <Cedar/Radius.h> #include <Cedar/Radius.h>
// Protocol // Native protocol
#include <Cedar/Protocol.h> #include <Cedar/Protocol.h>
// Inter-HUB link // Inter-HUB link
#include <Cedar/Link.h> #include <Cedar/Link.h>
@ -1126,19 +1126,18 @@ typedef struct CEDAR
#include <Cedar/Command.h> #include <Cedar/Command.h>
// RPC over HTTP // RPC over HTTP
#include <Cedar/Wpc.h> #include <Cedar/Wpc.h>
// IPsec // Layer-2/Layer-3 converter
#include <Cedar/IPsec.h> #include <Cedar/IPC.h>
#include <Cedar/IPsec_L2TP.h> // Third party protocols
#include <Cedar/IPsec_PPP.h> #include <Cedar/Proto_IPsec.h>
#include <Cedar/IPsec_IPC.h> #include <Cedar/Proto_EtherIP.h>
#include <Cedar/IPsec_IkePacket.h> #include <Cedar/Proto_IkePacket.h>
#include <Cedar/IPsec_IKE.h> #include <Cedar/Proto_IKE.h>
#include <Cedar/IPsec_Win7.h> #include <Cedar/Proto_L2TP.h>
#include <Cedar/IPsec_EtherIP.h> #include <Cedar/Proto_OpenVPN.h>
// SSTP #include <Cedar/Proto_PPP.h>
#include <Cedar/Interop_SSTP.h> #include <Cedar/Proto_SSTP.h>
// OpenVPN #include <Cedar/Proto_Win7.h>
#include <Cedar/Interop_OpenVPN.h>
// UDP Acceleration // UDP Acceleration
#include <Cedar/UdpAccel.h> #include <Cedar/UdpAccel.h>
// DDNS Client // DDNS Client

View File

@ -583,77 +583,9 @@
> >
</File> </File>
<File <File
RelativePath=".\Interop_OpenVPN.c" RelativePath=".\IPC.c"
> >
</File> </File>
<File
RelativePath=".\Interop_SSTP.c"
>
</File>
<File
RelativePath=".\IPsec.c"
>
</File>
<File
RelativePath=".\IPsec_EtherIP.c"
>
</File>
<File
RelativePath=".\IPsec_IKE.c"
>
</File>
<File
RelativePath=".\IPsec_IkePacket.c"
>
</File>
<File
RelativePath=".\IPsec_IPC.c"
>
</File>
<File
RelativePath=".\IPsec_L2TP.c"
>
</File>
<File
RelativePath=".\IPsec_PPP.c"
>
</File>
<File
RelativePath=".\IPsec_Win7.c"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File <File
RelativePath=".\Layer3.c" RelativePath=".\Layer3.c"
> >
@ -718,6 +650,74 @@
RelativePath=".\NullLan.c" RelativePath=".\NullLan.c"
> >
</File> </File>
<File
RelativePath=".\Proto_EtherIP.c"
>
</File>
<File
RelativePath=".\Proto_IKE.c"
>
</File>
<File
RelativePath=".\Proto_IkePacket.c"
>
</File>
<File
RelativePath=".\Proto_IPsec.c"
>
</File>
<File
RelativePath=".\Proto_L2TP.c"
>
</File>
<File
RelativePath=".\Proto_OpenVPN.c"
>
</File>
<File
RelativePath=".\Proto_PPP.c"
>
</File>
<File
RelativePath=".\Proto_SSTP.c"
>
</File>
<File
RelativePath=".\Proto_Win7.c"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File <File
RelativePath=".\Protocol.c" RelativePath=".\Protocol.c"
> >
@ -1241,47 +1241,7 @@
> >
</File> </File>
<File <File
RelativePath=".\Interop_OpenVPN.h" RelativePath=".\IPC.h"
>
</File>
<File
RelativePath=".\Interop_SSTP.h"
>
</File>
<File
RelativePath=".\IPsec.h"
>
</File>
<File
RelativePath=".\IPsec_EtherIP.h"
>
</File>
<File
RelativePath=".\IPsec_IKE.h"
>
</File>
<File
RelativePath=".\IPsec_IkePacket.h"
>
</File>
<File
RelativePath=".\IPsec_IPC.h"
>
</File>
<File
RelativePath=".\IPsec_L2TP.h"
>
</File>
<File
RelativePath=".\IPsec_PPP.h"
>
</File>
<File
RelativePath=".\IPsec_Win7.h"
>
</File>
<File
RelativePath=".\IPsec_Win7Inner.h"
> >
</File> </File>
<File <File
@ -1320,6 +1280,46 @@
RelativePath=".\NullLan.h" RelativePath=".\NullLan.h"
> >
</File> </File>
<File
RelativePath=".\Proto_EtherIP.h"
>
</File>
<File
RelativePath=".\Proto_IKE.h"
>
</File>
<File
RelativePath=".\Proto_IkePacket.h"
>
</File>
<File
RelativePath=".\Proto_IPsec.h"
>
</File>
<File
RelativePath=".\Proto_L2TP.h"
>
</File>
<File
RelativePath=".\Proto_OpenVPN.h"
>
</File>
<File
RelativePath=".\Proto_PPP.h"
>
</File>
<File
RelativePath=".\Proto_SSTP.h"
>
</File>
<File
RelativePath=".\Proto_Win7.h"
>
</File>
<File
RelativePath=".\Proto_Win7Inner.h"
>
</File>
<File <File
RelativePath=".\Protocol.h" RelativePath=".\Protocol.h"
> >

View File

@ -108,7 +108,7 @@
// test has been passed before release this source code. // test has been passed before release this source code.
// IPsec_IPC.c // IPC.c
// In-process VPN client module // In-process VPN client module
#include "CedarPch.h" #include "CedarPch.h"

View File

@ -108,11 +108,11 @@
// test has been passed before release this source code. // test has been passed before release this source code.
// IPsec_IPC.h // IPC.h
// Header of IPsec_IPC.c // Header of IPC.c
#ifndef IPSEC_IPC #ifndef IPC_H
#define IPSEC_IPC #define IPC_H
// Constants // Constants
#define IPC_ARP_LIFETIME (3 * 60 * 1000) #define IPC_ARP_LIFETIME (3 * 60 * 1000)
@ -263,7 +263,4 @@ void FreeIPCAsync(IPC_ASYNC *a);
bool ParseAndExtractMsChapV2InfoFromPassword(IPC_MSCHAP_V2_AUTHINFO *d, char *password); bool ParseAndExtractMsChapV2InfoFromPassword(IPC_MSCHAP_V2_AUTHINFO *d, char *password);
#endif // IPSEC_IPC #endif // IPC_H

View File

@ -108,7 +108,7 @@
// test has been passed before release this source code. // test has been passed before release this source code.
// IPsec_EtherIP.c // Proto_EtherIP.c
// EtherIP protocol stack // EtherIP protocol stack
#include "CedarPch.h" #include "CedarPch.h"

View File

@ -108,11 +108,11 @@
// test has been passed before release this source code. // test has been passed before release this source code.
// IPsec_EtherIP.h // Proto_EtherIP.h
// Header of IPsec_EtherIP.c // Header of Proto_EtherIP.c
#ifndef IPSEC_ETHERIP_H #ifndef PROTO_ETHERIP_H
#define IPSEC_ETHERIP_H #define PROTO_ETHERIP_H
//// Macro //// Macro
@ -171,6 +171,4 @@ void EtherIPIpcConnectThread(THREAD *t, void *p);
UINT CalcEtherIPTcpMss(ETHERIP_SERVER *s); UINT CalcEtherIPTcpMss(ETHERIP_SERVER *s);
#endif // IPSEC_ETHERIP_H #endif // PROTO_ETHERIP_H

View File

@ -108,7 +108,7 @@
// test has been passed before release this source code. // test has been passed before release this source code.
// IPsec_IKE.c // Proto_IKE.c
// IKE (ISAKMP) and ESP protocol stack // IKE (ISAKMP) and ESP protocol stack
#include "CedarPch.h" #include "CedarPch.h"

View File

@ -108,11 +108,11 @@
// test has been passed before release this source code. // test has been passed before release this source code.
// IPsec_IKE.h // Proto_IKE.h
// Header of IPsec_IKE.c // Header of Proto_IKE.c
#ifndef IPSEC_IKE_H #ifndef PROTO_IKE_H
#define IPSEC_IKE_H #define PROTO_IKE_H
//// Macro //// Macro
@ -472,5 +472,5 @@ void ProcL2TPv3PacketRecv(IKE_SERVER *ike, IKE_CLIENT *c, UCHAR *data, UINT data
IKE_SA *SearchIkeSaByCookie(IKE_SERVER *ike, UINT64 init_cookie, UINT64 resp_cookie); IKE_SA *SearchIkeSaByCookie(IKE_SERVER *ike, UINT64 init_cookie, UINT64 resp_cookie);
#endif // IPSEC_IKE_H #endif // PROTO_IKE_H

View File

@ -108,7 +108,7 @@
// test has been passed before release this source code. // test has been passed before release this source code.
// IPsec.c // Proto_IPsec.c
// IPsec module // IPsec module
#include "CedarPch.h" #include "CedarPch.h"

View File

@ -108,11 +108,11 @@
// test has been passed before release this source code. // test has been passed before release this source code.
// IPsec.h // Proto_IPsec.h
// Header of IPsec.c // Header of Proto_IPsec.c
#ifndef IPSEC_H #ifndef PROTO_IPSEC_H
#define IPSEC_H #define PROTO_IPSEC_H
//// Constants //// Constants
@ -201,5 +201,5 @@ bool IPsecCheckOsService(IPSEC_SERVER *s);
void IPSecSetDisable(bool b); void IPSecSetDisable(bool b);
#endif // IPSEC_H #endif // PROTO_IPSEC_H

View File

@ -108,7 +108,7 @@
// test has been passed before release this source code. // test has been passed before release this source code.
// IPsec_IkePacket.c // Proto_IkePacket.c
// IKE (ISAKMP) packet processing // IKE (ISAKMP) packet processing
#include "CedarPch.h" #include "CedarPch.h"

View File

@ -108,11 +108,11 @@
// test has been passed before release this source code. // test has been passed before release this source code.
// IPsec_IkePacket.h // Proto_IkePacket.h
// Header of IPsec_IkePacket.c // Header of Proto_IkePacket.c
#ifndef IPSEC_PACKET_H #ifndef PROTO_IKEPACKET_H
#define IPSEC_PACKET_H #define PROTO_IKEPACKET_H
// Constants // Constants
#ifdef OS_WIN32 #ifdef OS_WIN32
@ -768,6 +768,4 @@ DH_CTX *IkeDhNewCtx(IKE_DH *d);
void IkeDhFreeCtx(DH_CTX *dh); void IkeDhFreeCtx(DH_CTX *dh);
#endif // IPSEC_PACKET_H #endif // PROTO_IKEPACKET_H

View File

@ -108,7 +108,7 @@
// test has been passed before release this source code. // test has been passed before release this source code.
// IPsec_L2TP.c // Proto_L2TP.c
// L2TP protocol stack // L2TP protocol stack
#include "CedarPch.h" #include "CedarPch.h"

View File

@ -108,11 +108,11 @@
// test has been passed before release this source code. // test has been passed before release this source code.
// IPsec_L2TP.h // Proto_L2TP.h
// Header of IPsec_L2TP.c // Header of Proto_L2TP.c
#ifndef IPSEC_L2TP_H #ifndef PROTO_L2TP_H
#define IPSEC_L2TP_H #define PROTO_L2TP_H
//// Macro //// Macro
@ -378,6 +378,4 @@ UINT GenerateNewSessionIdForL2TPv3(L2TP_SERVER *l2tp);
L2TP_SESSION *SearchL2TPSessionById(L2TP_SERVER *l2tp, bool is_v3, UINT id); L2TP_SESSION *SearchL2TPSessionById(L2TP_SERVER *l2tp, bool is_v3, UINT id);
void L2TPSessionManageEtherIPServer(L2TP_SERVER *l2tp, L2TP_SESSION *s); void L2TPSessionManageEtherIPServer(L2TP_SERVER *l2tp, L2TP_SESSION *s);
#endif // IPSEC_L2TP_H #endif // PROTO_L2TP_H

View File

@ -108,7 +108,7 @@
// test has been passed before release this source code. // test has been passed before release this source code.
// Interop_OpenVPN.c // Proto_OpenVPN.c
// OpenVPN protocol stack // OpenVPN protocol stack
#include "CedarPch.h" #include "CedarPch.h"

View File

@ -108,11 +108,11 @@
// test has been passed before release this source code. // test has been passed before release this source code.
// Interop_OpenVPN.h // Proto_OpenVPN.h
// Header of Interop_OpenVPN.c // Header of Proto_OpenVPN.c
#ifndef INTEROP_OPENVPN_H #ifndef PROTO_OPENVPN_H
#define INTEROP_OPENVPN_H #define PROTO_OPENVPN_H
//// Constants //// Constants
@ -380,6 +380,4 @@ void OpenVpnServerUdpSetDhParam(OPENVPN_SERVER_UDP *u, DH_CTX *dh);
#endif // INTEROP_OPENVPN_H #endif // PROTO_OPENVPN_H

View File

@ -108,7 +108,7 @@
// test has been passed before release this source code. // test has been passed before release this source code.
// IPsec_PPP.c // Proto_PPP.c
// PPP protocol stack // PPP protocol stack
#include "CedarPch.h" #include "CedarPch.h"

View File

@ -108,11 +108,11 @@
// test has been passed before release this source code. // test has been passed before release this source code.
// IPsec_PPP.h // Proto_PPP.h
// Header of IPsec_PPP.c // Header of Proto_PPP.c
#ifndef IPSEC_PPP_H #ifndef PROTO_PPP_H
#define IPSEC_PPP_H #define PROTO_PPP_H
//// Macro //// Macro
@ -336,6 +336,4 @@ bool MsChapV2VerityPassword(IPC_MSCHAP_V2_AUTHINFO *d, char *password);
char *MsChapV2DoBruteForce(IPC_MSCHAP_V2_AUTHINFO *d, LIST *password_list); char *MsChapV2DoBruteForce(IPC_MSCHAP_V2_AUTHINFO *d, LIST *password_list);
void PPPFreeEapClient(PPP_SESSION *p); void PPPFreeEapClient(PPP_SESSION *p);
#endif // IPSEC_PPP_H #endif // PROTO_PPP_H

View File

@ -108,7 +108,7 @@
// test has been passed before release this source code. // test has been passed before release this source code.
// Interop_SSTP.c // Proto_SSTP.c
// SSTP (Microsoft Secure Socket Tunneling Protocol) protocol stack // SSTP (Microsoft Secure Socket Tunneling Protocol) protocol stack
#include "CedarPch.h" #include "CedarPch.h"

View File

@ -108,11 +108,11 @@
// test has been passed before release this source code. // test has been passed before release this source code.
// Interop_SSTP.h // Proto_SSTP.h
// Header of Interop_SSTP.c // Header of Proto_SSTP.c
#ifndef INTEROP_SSTP_H #ifndef PROTO_SSTP_H
#define INTEROP_SSTP_H #define PROTO_SSTP_H
//// Constants //// Constants
#define SSTP_URI "/sra_{BA195980-CD49-458b-9E23-C84EE0ADCD75}/" // SSTP HTTPS URI #define SSTP_URI "/sra_{BA195980-CD49-458b-9E23-C84EE0ADCD75}/" // SSTP HTTPS URI
@ -259,6 +259,4 @@ void SstpSendPacket(SSTP_SERVER *s, SSTP_PACKET *p);
bool GetNoSstp(); bool GetNoSstp();
void SetNoSstp(bool b); void SetNoSstp(bool b);
#endif // INTEROP_SSTP_H #endif // PROTO_SSTP_H

View File

@ -108,7 +108,7 @@
// test has been passed before release this source code. // test has been passed before release this source code.
// IPsec_Win7.c // Proto_Win7.c
// Initialize the helper module for Windows 7 / Windows 8 / Windows Vista / Windows Server 2008 / Windows Server 2008 R2 / Windows Server 2012 / Windows 10 // Initialize the helper module for Windows 7 / Windows 8 / Windows Vista / Windows Server 2008 / Windows Server 2008 R2 / Windows Server 2012 / Windows 10
#include <GlobalConst.h> #include <GlobalConst.h>
@ -137,7 +137,7 @@
#include <errno.h> #include <errno.h>
#include <Mayaqua/Mayaqua.h> #include <Mayaqua/Mayaqua.h>
#include <Cedar/Cedar.h> #include <Cedar/Cedar.h>
#include "IPsec_Win7Inner.h" #include "Proto_Win7Inner.h"
#include <Wfp/Wfp.h> #include <Wfp/Wfp.h>
static IPSEC_WIN7_FUNCTIONS *api = NULL; static IPSEC_WIN7_FUNCTIONS *api = NULL;

View File

@ -108,11 +108,11 @@
// test has been passed before release this source code. // test has been passed before release this source code.
// IPsec_Win7.h // Proto_Win7.h
// Header of IPsec_Win7.c // Header of Proto_Win7.c
#ifndef IPSEC_WIN7_H #ifndef PROTO_WIN7_H
#define IPSEC_WIN7_H #define PROTO_WIN7_H
// Constants // Constants
#define IPSEC_WIN7_SRC_SYS_X86 "|pxwfp_x86.sys" #define IPSEC_WIN7_SRC_SYS_X86 "|pxwfp_x86.sys"
@ -142,7 +142,4 @@ void SetCurrentIPsecWin7DriverBuild();
bool IPsecWin7InitApi(); bool IPsecWin7InitApi();
#endif // IPSEC_WIN7_H #endif // PROTO_WIN7_H

View File

@ -108,11 +108,11 @@
// test has been passed before release this source code. // test has been passed before release this source code.
// IPsec_Win7.h // Proto_Win7Inner.h
// Internal header of IPsec_Win7.c // Internal header of Proto_Win7.c
#ifndef IPSEC_WIN7_INNER_H #ifndef PROTO_WIN7_INNER_H
#define IPSEC_WIN7_INNER_H #define PROTO_WIN7_INNER_H
// API function // API function
typedef struct IPSEC_WIN7_FUNCTIONS typedef struct IPSEC_WIN7_FUNCTIONS
@ -180,7 +180,4 @@ struct IPSEC_WIN7
}; };
#endif // IPSEC_WIN7_INNER_H #endif // PROTO_WIN7_INNER_H