From 1e6b99e3fe2164c24bfe02634bf89f68a298b9bc Mon Sep 17 00:00:00 2001 From: Davide Beatrici Date: Mon, 10 Sep 2018 00:46:29 +0200 Subject: [PATCH] Cedar: replace "Interop_" and "IPsec_" with "Proto_" in the protocol-specific source/header files' names "IPsec_IPC" has been renamed to "IPC" because it's not related to third-party protocols. --- src/Cedar/Cedar.h | 27 ++- src/Cedar/Cedar.vcproj | 220 +++++++++--------- src/Cedar/{IPsec_IPC.c => IPC.c} | 2 +- src/Cedar/{IPsec_IPC.h => IPC.h} | 13 +- .../{IPsec_EtherIP.c => Proto_EtherIP.c} | 2 +- .../{IPsec_EtherIP.h => Proto_EtherIP.h} | 12 +- src/Cedar/{IPsec_IKE.c => Proto_IKE.c} | 2 +- src/Cedar/{IPsec_IKE.h => Proto_IKE.h} | 10 +- src/Cedar/{IPsec.c => Proto_IPsec.c} | 2 +- src/Cedar/{IPsec.h => Proto_IPsec.h} | 10 +- .../{IPsec_IkePacket.c => Proto_IkePacket.c} | 2 +- .../{IPsec_IkePacket.h => Proto_IkePacket.h} | 12 +- src/Cedar/{IPsec_L2TP.c => Proto_L2TP.c} | 2 +- src/Cedar/{IPsec_L2TP.h => Proto_L2TP.h} | 12 +- .../{Interop_OpenVPN.c => Proto_OpenVPN.c} | 2 +- .../{Interop_OpenVPN.h => Proto_OpenVPN.h} | 12 +- src/Cedar/{IPsec_PPP.c => Proto_PPP.c} | 2 +- src/Cedar/{IPsec_PPP.h => Proto_PPP.h} | 12 +- src/Cedar/{Interop_SSTP.c => Proto_SSTP.c} | 2 +- src/Cedar/{Interop_SSTP.h => Proto_SSTP.h} | 12 +- src/Cedar/{IPsec_Win7.c => Proto_Win7.c} | 4 +- src/Cedar/{IPsec_Win7.h => Proto_Win7.h} | 13 +- .../{IPsec_Win7Inner.h => Proto_Win7Inner.h} | 13 +- 23 files changed, 189 insertions(+), 211 deletions(-) rename src/Cedar/{IPsec_IPC.c => IPC.c} (95%) rename src/Cedar/{IPsec_IPC.h => IPC.h} (96%) rename src/Cedar/{IPsec_EtherIP.c => Proto_EtherIP.c} (95%) rename src/Cedar/{IPsec_EtherIP.h => Proto_EtherIP.h} (96%) rename src/Cedar/{IPsec_IKE.c => Proto_IKE.c} (96%) rename src/Cedar/{IPsec_IKE.h => Proto_IKE.h} (97%) rename src/Cedar/{IPsec.c => Proto_IPsec.c} (95%) rename src/Cedar/{IPsec.h => Proto_IPsec.h} (96%) rename src/Cedar/{IPsec_IkePacket.c => Proto_IkePacket.c} (95%) rename src/Cedar/{IPsec_IkePacket.h => Proto_IkePacket.h} (96%) rename src/Cedar/{IPsec_L2TP.c => Proto_L2TP.c} (95%) rename src/Cedar/{IPsec_L2TP.h => Proto_L2TP.h} (97%) rename src/Cedar/{Interop_OpenVPN.c => Proto_OpenVPN.c} (95%) rename src/Cedar/{Interop_OpenVPN.h => Proto_OpenVPN.h} (96%) rename src/Cedar/{IPsec_PPP.c => Proto_PPP.c} (95%) rename src/Cedar/{IPsec_PPP.h => Proto_PPP.h} (97%) rename src/Cedar/{Interop_SSTP.c => Proto_SSTP.c} (95%) rename src/Cedar/{Interop_SSTP.h => Proto_SSTP.h} (96%) rename src/Cedar/{IPsec_Win7.c => Proto_Win7.c} (96%) rename src/Cedar/{IPsec_Win7.h => Proto_Win7.h} (96%) rename src/Cedar/{IPsec_Win7Inner.h => Proto_Win7Inner.h} (95%) diff --git a/src/Cedar/Cedar.h b/src/Cedar/Cedar.h index 70be1be3..afd2882c 100644 --- a/src/Cedar/Cedar.h +++ b/src/Cedar/Cedar.h @@ -1108,7 +1108,7 @@ typedef struct CEDAR #include // Radius authentication module #include -// Protocol +// Native protocol #include // Inter-HUB link #include @@ -1126,19 +1126,18 @@ typedef struct CEDAR #include // RPC over HTTP #include -// IPsec -#include -#include -#include -#include -#include -#include -#include -#include -// SSTP -#include -// OpenVPN -#include +// Layer-2/Layer-3 converter +#include +// Third party protocols +#include +#include +#include +#include +#include +#include +#include +#include +#include // UDP Acceleration #include // DDNS Client diff --git a/src/Cedar/Cedar.vcproj b/src/Cedar/Cedar.vcproj index 6a306a99..1fa2ed21 100644 --- a/src/Cedar/Cedar.vcproj +++ b/src/Cedar/Cedar.vcproj @@ -583,77 +583,9 @@ > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -718,6 +650,74 @@ RelativePath=".\NullLan.c" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1241,47 +1241,7 @@ > - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/src/Cedar/IPsec_IPC.c b/src/Cedar/IPC.c similarity index 95% rename from src/Cedar/IPsec_IPC.c rename to src/Cedar/IPC.c index e855181d..384dbe12 100644 --- a/src/Cedar/IPsec_IPC.c +++ b/src/Cedar/IPC.c @@ -108,7 +108,7 @@ // test has been passed before release this source code. -// IPsec_IPC.c +// IPC.c // In-process VPN client module #include "CedarPch.h" diff --git a/src/Cedar/IPsec_IPC.h b/src/Cedar/IPC.h similarity index 96% rename from src/Cedar/IPsec_IPC.h rename to src/Cedar/IPC.h index 84dcface..4bbf5f57 100644 --- a/src/Cedar/IPsec_IPC.h +++ b/src/Cedar/IPC.h @@ -108,11 +108,11 @@ // test has been passed before release this source code. -// IPsec_IPC.h -// Header of IPsec_IPC.c +// IPC.h +// Header of IPC.c -#ifndef IPSEC_IPC -#define IPSEC_IPC +#ifndef IPC_H +#define IPC_H // Constants #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); -#endif // IPSEC_IPC - - - +#endif // IPC_H diff --git a/src/Cedar/IPsec_EtherIP.c b/src/Cedar/Proto_EtherIP.c similarity index 95% rename from src/Cedar/IPsec_EtherIP.c rename to src/Cedar/Proto_EtherIP.c index e91bd15d..6d7b1a50 100644 --- a/src/Cedar/IPsec_EtherIP.c +++ b/src/Cedar/Proto_EtherIP.c @@ -108,7 +108,7 @@ // test has been passed before release this source code. -// IPsec_EtherIP.c +// Proto_EtherIP.c // EtherIP protocol stack #include "CedarPch.h" diff --git a/src/Cedar/IPsec_EtherIP.h b/src/Cedar/Proto_EtherIP.h similarity index 96% rename from src/Cedar/IPsec_EtherIP.h rename to src/Cedar/Proto_EtherIP.h index 3b94104a..8bdc00b6 100644 --- a/src/Cedar/IPsec_EtherIP.h +++ b/src/Cedar/Proto_EtherIP.h @@ -108,11 +108,11 @@ // test has been passed before release this source code. -// IPsec_EtherIP.h -// Header of IPsec_EtherIP.c +// Proto_EtherIP.h +// Header of Proto_EtherIP.c -#ifndef IPSEC_ETHERIP_H -#define IPSEC_ETHERIP_H +#ifndef PROTO_ETHERIP_H +#define PROTO_ETHERIP_H //// Macro @@ -171,6 +171,4 @@ void EtherIPIpcConnectThread(THREAD *t, void *p); UINT CalcEtherIPTcpMss(ETHERIP_SERVER *s); -#endif // IPSEC_ETHERIP_H - - +#endif // PROTO_ETHERIP_H diff --git a/src/Cedar/IPsec_IKE.c b/src/Cedar/Proto_IKE.c similarity index 96% rename from src/Cedar/IPsec_IKE.c rename to src/Cedar/Proto_IKE.c index a35d8467..82f3dce7 100644 --- a/src/Cedar/IPsec_IKE.c +++ b/src/Cedar/Proto_IKE.c @@ -108,7 +108,7 @@ // test has been passed before release this source code. -// IPsec_IKE.c +// Proto_IKE.c // IKE (ISAKMP) and ESP protocol stack #include "CedarPch.h" diff --git a/src/Cedar/IPsec_IKE.h b/src/Cedar/Proto_IKE.h similarity index 97% rename from src/Cedar/IPsec_IKE.h rename to src/Cedar/Proto_IKE.h index b3ec80c7..072d6767 100644 --- a/src/Cedar/IPsec_IKE.h +++ b/src/Cedar/Proto_IKE.h @@ -108,11 +108,11 @@ // test has been passed before release this source code. -// IPsec_IKE.h -// Header of IPsec_IKE.c +// Proto_IKE.h +// Header of Proto_IKE.c -#ifndef IPSEC_IKE_H -#define IPSEC_IKE_H +#ifndef PROTO_IKE_H +#define PROTO_IKE_H //// 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); -#endif // IPSEC_IKE_H +#endif // PROTO_IKE_H diff --git a/src/Cedar/IPsec.c b/src/Cedar/Proto_IPsec.c similarity index 95% rename from src/Cedar/IPsec.c rename to src/Cedar/Proto_IPsec.c index b9530a48..0672ff2a 100644 --- a/src/Cedar/IPsec.c +++ b/src/Cedar/Proto_IPsec.c @@ -108,7 +108,7 @@ // test has been passed before release this source code. -// IPsec.c +// Proto_IPsec.c // IPsec module #include "CedarPch.h" diff --git a/src/Cedar/IPsec.h b/src/Cedar/Proto_IPsec.h similarity index 96% rename from src/Cedar/IPsec.h rename to src/Cedar/Proto_IPsec.h index 29fde830..20b484ce 100644 --- a/src/Cedar/IPsec.h +++ b/src/Cedar/Proto_IPsec.h @@ -108,11 +108,11 @@ // test has been passed before release this source code. -// IPsec.h -// Header of IPsec.c +// Proto_IPsec.h +// Header of Proto_IPsec.c -#ifndef IPSEC_H -#define IPSEC_H +#ifndef PROTO_IPSEC_H +#define PROTO_IPSEC_H //// Constants @@ -201,5 +201,5 @@ bool IPsecCheckOsService(IPSEC_SERVER *s); void IPSecSetDisable(bool b); -#endif // IPSEC_H +#endif // PROTO_IPSEC_H diff --git a/src/Cedar/IPsec_IkePacket.c b/src/Cedar/Proto_IkePacket.c similarity index 95% rename from src/Cedar/IPsec_IkePacket.c rename to src/Cedar/Proto_IkePacket.c index c9897847..e53cf7e5 100644 --- a/src/Cedar/IPsec_IkePacket.c +++ b/src/Cedar/Proto_IkePacket.c @@ -108,7 +108,7 @@ // test has been passed before release this source code. -// IPsec_IkePacket.c +// Proto_IkePacket.c // IKE (ISAKMP) packet processing #include "CedarPch.h" diff --git a/src/Cedar/IPsec_IkePacket.h b/src/Cedar/Proto_IkePacket.h similarity index 96% rename from src/Cedar/IPsec_IkePacket.h rename to src/Cedar/Proto_IkePacket.h index ba0bb686..4292e535 100644 --- a/src/Cedar/IPsec_IkePacket.h +++ b/src/Cedar/Proto_IkePacket.h @@ -108,11 +108,11 @@ // test has been passed before release this source code. -// IPsec_IkePacket.h -// Header of IPsec_IkePacket.c +// Proto_IkePacket.h +// Header of Proto_IkePacket.c -#ifndef IPSEC_PACKET_H -#define IPSEC_PACKET_H +#ifndef PROTO_IKEPACKET_H +#define PROTO_IKEPACKET_H // Constants #ifdef OS_WIN32 @@ -768,6 +768,4 @@ DH_CTX *IkeDhNewCtx(IKE_DH *d); void IkeDhFreeCtx(DH_CTX *dh); -#endif // IPSEC_PACKET_H - - +#endif // PROTO_IKEPACKET_H diff --git a/src/Cedar/IPsec_L2TP.c b/src/Cedar/Proto_L2TP.c similarity index 95% rename from src/Cedar/IPsec_L2TP.c rename to src/Cedar/Proto_L2TP.c index b33471ef..2a6911a7 100644 --- a/src/Cedar/IPsec_L2TP.c +++ b/src/Cedar/Proto_L2TP.c @@ -108,7 +108,7 @@ // test has been passed before release this source code. -// IPsec_L2TP.c +// Proto_L2TP.c // L2TP protocol stack #include "CedarPch.h" diff --git a/src/Cedar/IPsec_L2TP.h b/src/Cedar/Proto_L2TP.h similarity index 97% rename from src/Cedar/IPsec_L2TP.h rename to src/Cedar/Proto_L2TP.h index ae5d20b5..c6842d10 100644 --- a/src/Cedar/IPsec_L2TP.h +++ b/src/Cedar/Proto_L2TP.h @@ -108,11 +108,11 @@ // test has been passed before release this source code. -// IPsec_L2TP.h -// Header of IPsec_L2TP.c +// Proto_L2TP.h +// Header of Proto_L2TP.c -#ifndef IPSEC_L2TP_H -#define IPSEC_L2TP_H +#ifndef PROTO_L2TP_H +#define PROTO_L2TP_H //// Macro @@ -378,6 +378,4 @@ UINT GenerateNewSessionIdForL2TPv3(L2TP_SERVER *l2tp); L2TP_SESSION *SearchL2TPSessionById(L2TP_SERVER *l2tp, bool is_v3, UINT id); void L2TPSessionManageEtherIPServer(L2TP_SERVER *l2tp, L2TP_SESSION *s); -#endif // IPSEC_L2TP_H - - +#endif // PROTO_L2TP_H diff --git a/src/Cedar/Interop_OpenVPN.c b/src/Cedar/Proto_OpenVPN.c similarity index 95% rename from src/Cedar/Interop_OpenVPN.c rename to src/Cedar/Proto_OpenVPN.c index 9343d9d1..34f4c2c2 100644 --- a/src/Cedar/Interop_OpenVPN.c +++ b/src/Cedar/Proto_OpenVPN.c @@ -108,7 +108,7 @@ // test has been passed before release this source code. -// Interop_OpenVPN.c +// Proto_OpenVPN.c // OpenVPN protocol stack #include "CedarPch.h" diff --git a/src/Cedar/Interop_OpenVPN.h b/src/Cedar/Proto_OpenVPN.h similarity index 96% rename from src/Cedar/Interop_OpenVPN.h rename to src/Cedar/Proto_OpenVPN.h index 9899c0a0..811d0cf7 100644 --- a/src/Cedar/Interop_OpenVPN.h +++ b/src/Cedar/Proto_OpenVPN.h @@ -108,11 +108,11 @@ // test has been passed before release this source code. -// Interop_OpenVPN.h -// Header of Interop_OpenVPN.c +// Proto_OpenVPN.h +// Header of Proto_OpenVPN.c -#ifndef INTEROP_OPENVPN_H -#define INTEROP_OPENVPN_H +#ifndef PROTO_OPENVPN_H +#define PROTO_OPENVPN_H //// Constants @@ -380,6 +380,4 @@ void OpenVpnServerUdpSetDhParam(OPENVPN_SERVER_UDP *u, DH_CTX *dh); -#endif // INTEROP_OPENVPN_H - - +#endif // PROTO_OPENVPN_H diff --git a/src/Cedar/IPsec_PPP.c b/src/Cedar/Proto_PPP.c similarity index 95% rename from src/Cedar/IPsec_PPP.c rename to src/Cedar/Proto_PPP.c index eebda7eb..9e7f0211 100644 --- a/src/Cedar/IPsec_PPP.c +++ b/src/Cedar/Proto_PPP.c @@ -108,7 +108,7 @@ // test has been passed before release this source code. -// IPsec_PPP.c +// Proto_PPP.c // PPP protocol stack #include "CedarPch.h" diff --git a/src/Cedar/IPsec_PPP.h b/src/Cedar/Proto_PPP.h similarity index 97% rename from src/Cedar/IPsec_PPP.h rename to src/Cedar/Proto_PPP.h index 66571313..578205ad 100644 --- a/src/Cedar/IPsec_PPP.h +++ b/src/Cedar/Proto_PPP.h @@ -108,11 +108,11 @@ // test has been passed before release this source code. -// IPsec_PPP.h -// Header of IPsec_PPP.c +// Proto_PPP.h +// Header of Proto_PPP.c -#ifndef IPSEC_PPP_H -#define IPSEC_PPP_H +#ifndef PROTO_PPP_H +#define PROTO_PPP_H //// Macro @@ -336,6 +336,4 @@ bool MsChapV2VerityPassword(IPC_MSCHAP_V2_AUTHINFO *d, char *password); char *MsChapV2DoBruteForce(IPC_MSCHAP_V2_AUTHINFO *d, LIST *password_list); void PPPFreeEapClient(PPP_SESSION *p); -#endif // IPSEC_PPP_H - - +#endif // PROTO_PPP_H diff --git a/src/Cedar/Interop_SSTP.c b/src/Cedar/Proto_SSTP.c similarity index 95% rename from src/Cedar/Interop_SSTP.c rename to src/Cedar/Proto_SSTP.c index 597d234d..cbdda0df 100644 --- a/src/Cedar/Interop_SSTP.c +++ b/src/Cedar/Proto_SSTP.c @@ -108,7 +108,7 @@ // test has been passed before release this source code. -// Interop_SSTP.c +// Proto_SSTP.c // SSTP (Microsoft Secure Socket Tunneling Protocol) protocol stack #include "CedarPch.h" diff --git a/src/Cedar/Interop_SSTP.h b/src/Cedar/Proto_SSTP.h similarity index 96% rename from src/Cedar/Interop_SSTP.h rename to src/Cedar/Proto_SSTP.h index 65ee2d6e..da6b7392 100644 --- a/src/Cedar/Interop_SSTP.h +++ b/src/Cedar/Proto_SSTP.h @@ -108,11 +108,11 @@ // test has been passed before release this source code. -// Interop_SSTP.h -// Header of Interop_SSTP.c +// Proto_SSTP.h +// Header of Proto_SSTP.c -#ifndef INTEROP_SSTP_H -#define INTEROP_SSTP_H +#ifndef PROTO_SSTP_H +#define PROTO_SSTP_H //// Constants #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(); void SetNoSstp(bool b); -#endif // INTEROP_SSTP_H - - +#endif // PROTO_SSTP_H diff --git a/src/Cedar/IPsec_Win7.c b/src/Cedar/Proto_Win7.c similarity index 96% rename from src/Cedar/IPsec_Win7.c rename to src/Cedar/Proto_Win7.c index 6c749edf..fd1e76ce 100644 --- a/src/Cedar/IPsec_Win7.c +++ b/src/Cedar/Proto_Win7.c @@ -108,7 +108,7 @@ // 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 #include @@ -137,7 +137,7 @@ #include #include #include -#include "IPsec_Win7Inner.h" +#include "Proto_Win7Inner.h" #include static IPSEC_WIN7_FUNCTIONS *api = NULL; diff --git a/src/Cedar/IPsec_Win7.h b/src/Cedar/Proto_Win7.h similarity index 96% rename from src/Cedar/IPsec_Win7.h rename to src/Cedar/Proto_Win7.h index bd489e70..fc9dbd90 100644 --- a/src/Cedar/IPsec_Win7.h +++ b/src/Cedar/Proto_Win7.h @@ -108,11 +108,11 @@ // test has been passed before release this source code. -// IPsec_Win7.h -// Header of IPsec_Win7.c +// Proto_Win7.h +// Header of Proto_Win7.c -#ifndef IPSEC_WIN7_H -#define IPSEC_WIN7_H +#ifndef PROTO_WIN7_H +#define PROTO_WIN7_H // Constants #define IPSEC_WIN7_SRC_SYS_X86 "|pxwfp_x86.sys" @@ -142,7 +142,4 @@ void SetCurrentIPsecWin7DriverBuild(); bool IPsecWin7InitApi(); -#endif // IPSEC_WIN7_H - - - +#endif // PROTO_WIN7_H diff --git a/src/Cedar/IPsec_Win7Inner.h b/src/Cedar/Proto_Win7Inner.h similarity index 95% rename from src/Cedar/IPsec_Win7Inner.h rename to src/Cedar/Proto_Win7Inner.h index 2036aeca..3b544f95 100644 --- a/src/Cedar/IPsec_Win7Inner.h +++ b/src/Cedar/Proto_Win7Inner.h @@ -108,11 +108,11 @@ // test has been passed before release this source code. -// IPsec_Win7.h -// Internal header of IPsec_Win7.c +// Proto_Win7Inner.h +// Internal header of Proto_Win7.c -#ifndef IPSEC_WIN7_INNER_H -#define IPSEC_WIN7_INNER_H +#ifndef PROTO_WIN7_INNER_H +#define PROTO_WIN7_INNER_H // API function typedef struct IPSEC_WIN7_FUNCTIONS @@ -180,7 +180,4 @@ struct IPSEC_WIN7 }; -#endif // IPSEC_WIN7_INNER_H - - - +#endif // PROTO_WIN7_INNER_H