20160524

dut3062796s · May 24, 2016 · 846d0e5 · 846d0e5
1 parent 595cfdb
commit 846d0e5
Show file tree

Hide file tree

Showing 747 changed files with 73,923 additions and 1,227 deletions.
diff --git a/Doc/HP-Socket Class Diagram - v3.5.jpg b/Doc/HP-Socket Class Diagram - v3.5.jpg
diff --git a/Doc/HP-Socket Class Diagram - v3.5.uml b/Doc/HP-Socket Class Diagram - v3.5.uml
diff --git a/Doc/HP-Socket SSL Class Diagram - v3.5.jpg b/Doc/HP-Socket SSL Class Diagram - v3.5.jpg
diff --git a/Doc/HP-Socket TCP & UDP 通信框架开发指南 (v3.5-20160501).pdf b/Doc/HP-Socket TCP & UDP 通信框架开发指南 (v3.5-20160501).pdf
diff --git a/HP-Socket/Bin/HPSocket/x64/HPSocket-SSL.dll b/HP-Socket/Bin/HPSocket/x64/HPSocket-SSL.dll
diff --git a/HP-Socket/Bin/HPSocket/x64/HPSocket-SSL.lib b/HP-Socket/Bin/HPSocket/x64/HPSocket-SSL.lib
diff --git a/HP-Socket/Bin/HPSocket/x64/HPSocket-SSL_D.dll b/HP-Socket/Bin/HPSocket/x64/HPSocket-SSL_D.dll
diff --git a/HP-Socket/Bin/HPSocket/x64/HPSocket-SSL_D.lib b/HP-Socket/Bin/HPSocket/x64/HPSocket-SSL_D.lib
diff --git a/HP-Socket/Bin/HPSocket/x64/HPSocket-SSL_U.dll b/HP-Socket/Bin/HPSocket/x64/HPSocket-SSL_U.dll
diff --git a/HP-Socket/Bin/HPSocket/x64/HPSocket-SSL_U.lib b/HP-Socket/Bin/HPSocket/x64/HPSocket-SSL_U.lib
diff --git a/HP-Socket/Bin/HPSocket/x64/HPSocket-SSL_UD.dll b/HP-Socket/Bin/HPSocket/x64/HPSocket-SSL_UD.dll
diff --git a/HP-Socket/Bin/HPSocket/x64/HPSocket-SSL_UD.lib b/HP-Socket/Bin/HPSocket/x64/HPSocket-SSL_UD.lib
diff --git a/HP-Socket/Bin/HPSocket/x64/HPSocket.dll b/HP-Socket/Bin/HPSocket/x64/HPSocket.dll
diff --git a/HP-Socket/Bin/HPSocket/x64/HPSocket.lib b/HP-Socket/Bin/HPSocket/x64/HPSocket.lib
diff --git a/HP-Socket/Bin/HPSocket/x64/HPSocket_D.dll b/HP-Socket/Bin/HPSocket/x64/HPSocket_D.dll
diff --git a/HP-Socket/Bin/HPSocket/x64/HPSocket_D.lib b/HP-Socket/Bin/HPSocket/x64/HPSocket_D.lib
diff --git a/HP-Socket/Bin/HPSocket/x64/HPSocket_U.dll b/HP-Socket/Bin/HPSocket/x64/HPSocket_U.dll
diff --git a/HP-Socket/Bin/HPSocket/x64/HPSocket_U.lib b/HP-Socket/Bin/HPSocket/x64/HPSocket_U.lib
diff --git a/HP-Socket/Bin/HPSocket/x64/HPSocket_UD.dll b/HP-Socket/Bin/HPSocket/x64/HPSocket_UD.dll
diff --git a/HP-Socket/Bin/HPSocket/x64/HPSocket_UD.lib b/HP-Socket/Bin/HPSocket/x64/HPSocket_UD.lib
diff --git a/HP-Socket/Bin/HPSocket/x86/HPSocket-SSL.dll b/HP-Socket/Bin/HPSocket/x86/HPSocket-SSL.dll
diff --git a/HP-Socket/Bin/HPSocket/x86/HPSocket-SSL.lib b/HP-Socket/Bin/HPSocket/x86/HPSocket-SSL.lib
diff --git a/HP-Socket/Bin/HPSocket/x86/HPSocket-SSL_D.dll b/HP-Socket/Bin/HPSocket/x86/HPSocket-SSL_D.dll
diff --git a/HP-Socket/Bin/HPSocket/x86/HPSocket-SSL_D.lib b/HP-Socket/Bin/HPSocket/x86/HPSocket-SSL_D.lib
diff --git a/HP-Socket/Bin/HPSocket/x86/HPSocket-SSL_U.dll b/HP-Socket/Bin/HPSocket/x86/HPSocket-SSL_U.dll
diff --git a/HP-Socket/Bin/HPSocket/x86/HPSocket-SSL_U.lib b/HP-Socket/Bin/HPSocket/x86/HPSocket-SSL_U.lib
diff --git a/HP-Socket/Bin/HPSocket/x86/HPSocket-SSL_UD.dll b/HP-Socket/Bin/HPSocket/x86/HPSocket-SSL_UD.dll
diff --git a/HP-Socket/Bin/HPSocket/x86/HPSocket-SSL_UD.lib b/HP-Socket/Bin/HPSocket/x86/HPSocket-SSL_UD.lib
diff --git a/HP-Socket/Bin/HPSocket/x86/HPSocket.dll b/HP-Socket/Bin/HPSocket/x86/HPSocket.dll
diff --git a/HP-Socket/Bin/HPSocket/x86/HPSocket.lib b/HP-Socket/Bin/HPSocket/x86/HPSocket.lib
diff --git a/HP-Socket/Bin/HPSocket/x86/HPSocket_D.dll b/HP-Socket/Bin/HPSocket/x86/HPSocket_D.dll
diff --git a/HP-Socket/Bin/HPSocket/x86/HPSocket_D.lib b/HP-Socket/Bin/HPSocket/x86/HPSocket_D.lib
diff --git a/HP-Socket/Bin/HPSocket/x86/HPSocket_U.dll b/HP-Socket/Bin/HPSocket/x86/HPSocket_U.dll
diff --git a/HP-Socket/Bin/HPSocket/x86/HPSocket_U.lib b/HP-Socket/Bin/HPSocket/x86/HPSocket_U.lib
diff --git a/HP-Socket/Bin/HPSocket/x86/HPSocket_UD.dll b/HP-Socket/Bin/HPSocket/x86/HPSocket_UD.dll
diff --git a/HP-Socket/Bin/HPSocket/x86/HPSocket_UD.lib b/HP-Socket/Bin/HPSocket/x86/HPSocket_UD.lib
diff --git a/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C-SSL.dll b/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C-SSL.dll
diff --git a/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C-SSL.lib b/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C-SSL.lib
diff --git a/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C-SSL_D.dll b/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C-SSL_D.dll
diff --git a/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C-SSL_D.lib b/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C-SSL_D.lib
diff --git a/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C-SSL_U.dll b/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C-SSL_U.dll
diff --git a/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C-SSL_U.lib b/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C-SSL_U.lib
diff --git a/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C-SSL_UD.dll b/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C-SSL_UD.dll
diff --git a/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C-SSL_UD.lib b/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C-SSL_UD.lib
diff --git a/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C.dll b/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C.dll
diff --git a/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C.lib b/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C.lib
diff --git a/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C_D.dll b/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C_D.dll
diff --git a/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C_D.lib b/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C_D.lib
diff --git a/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C_U.dll b/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C_U.dll
diff --git a/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C_U.lib b/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C_U.lib
diff --git a/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C_UD.dll b/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C_UD.dll
diff --git a/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C_UD.lib b/HP-Socket/Bin/HPSocket4C/x64/HPSocket4C_UD.lib
diff --git a/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C-SSL.dll b/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C-SSL.dll
diff --git a/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C-SSL.lib b/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C-SSL.lib
diff --git a/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C-SSL_D.dll b/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C-SSL_D.dll
diff --git a/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C-SSL_D.lib b/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C-SSL_D.lib
diff --git a/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C-SSL_U.dll b/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C-SSL_U.dll
diff --git a/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C-SSL_U.lib b/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C-SSL_U.lib
diff --git a/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C-SSL_UD.dll b/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C-SSL_UD.dll
diff --git a/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C-SSL_UD.lib b/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C-SSL_UD.lib
diff --git a/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C.dll b/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C.dll
diff --git a/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C.lib b/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C.lib
diff --git a/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C_D.dll b/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C_D.dll
diff --git a/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C_D.lib b/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C_D.lib
diff --git a/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C_U.dll b/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C_U.dll
diff --git a/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C_U.lib b/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C_U.lib
diff --git a/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C_UD.dll b/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C_UD.dll
diff --git a/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C_UD.lib b/HP-Socket/Bin/HPSocket4C/x86/HPSocket4C_UD.lib
diff --git a/HP-Socket/Bin/HPSocket4CS/x64/HPSocket4C-SSL_U.dll b/HP-Socket/Bin/HPSocket4CS/x64/HPSocket4C-SSL_U.dll
diff --git a/HP-Socket/Bin/HPSocket4CS/x64/HPSocket4C_U.dll b/HP-Socket/Bin/HPSocket4CS/x64/HPSocket4C_U.dll
diff --git a/HP-Socket/Bin/HPSocket4CS/x64/HPSocketCS.dll b/HP-Socket/Bin/HPSocket4CS/x64/HPSocketCS.dll
diff --git a/HP-Socket/Bin/HPSocket4CS/x86/HPSocket4C-SSL_U.dll b/HP-Socket/Bin/HPSocket4CS/x86/HPSocket4C-SSL_U.dll
diff --git a/HP-Socket/Bin/HPSocket4CS/x86/HPSocket4C_U.dll b/HP-Socket/Bin/HPSocket4CS/x86/HPSocket4C_U.dll
diff --git a/HP-Socket/Bin/HPSocket4CS/x86/HPSocketCS.dll b/HP-Socket/Bin/HPSocket4CS/x86/HPSocketCS.dll
diff --git a/HP-Socket/Bin/HPSocket4E/支持库/HPSocket_4C.lib b/HP-Socket/Bin/HPSocket4E/支持库/HPSocket_4C.lib
diff --git a/HP-Socket/Bin/HPSocket4E/支持库/Hp_Socket.fne b/HP-Socket/Bin/HPSocket4E/支持库/Hp_Socket.fne
diff --git a/HP-Socket/Bin/HPSocket4E/支持库/Hp_Socket_static.lib b/HP-Socket/Bin/HPSocket4E/支持库/Hp_Socket_static.lib
diff --git a/HP-Socket/Bin/HPSocket4E/支持库/使用方法.txt b/HP-Socket/Bin/HPSocket4E/支持库/使用方法.txt
@@ -3,4 +3,7 @@ Hp_Socket_static.lib、HPSocket_4C.lib 放入static_Lib目录
 
 本支持库需要易语言vs2010链接器(链接: http://pan.baidu.com/s/1i3ydamT 密码: baka)
 
-点击链接加入群【怪兽乐园】：http://jq.qq.com/?_wv=1027&k=2Ia8fHv
+点击链接加入群【怪兽乐园】：http://jq.qq.com/?_wv=1027&k=2Ia8fHv
+
+3.5.1 相对于其他版本变动
+1.删除AddressInfo 数据类型
diff --git a/HP-Socket/Bin/HPSocket4E/模块/HPSocket.ec b/HP-Socket/Bin/HPSocket4E/模块/HPSocket.ec
diff --git a/HP-Socket/Bin/HPSocket4E/模块/HPSocket4C.ec b/HP-Socket/Bin/HPSocket4E/模块/HPSocket4C.ec
diff --git a/HP-Socket/Demo/Global/helper.cpp b/HP-Socket/Demo/Global/helper.cpp
@@ -164,6 +164,13 @@ void LogOnConnect2(CONNID dwConnID)
 	LogMsg(msg);
 }
 
+void LogOnHandShake2(CONNID dwConnID)
+{
+	CString msg;
+	msg.Format(_T("  > [ %Iu, %s ]"), dwConnID, EVT_ON_HAND_SHAKE);
+	LogMsg(msg);
+}
+
 void PostOnSend(CONNID dwConnID, const BYTE* pData, int iLength)
 {
 	/*
@@ -240,6 +247,13 @@ void PostOnAccept2(CONNID dwConnID)
 	PostInfoMsg(msg);
 }
 
+void PostOnHandShake(CONNID dwConnID)
+{
+	info_msg* msg = info_msg::Construct(dwConnID, EVT_ON_HAND_SHAKE, 0, nullptr);
+
+	PostInfoMsg(msg);
+}
+
 void PostOnPrepareListen(LPCTSTR lpszAddress, USHORT usPort)
 {
 	LPTSTR lpszContent = new TCHAR[100];
@@ -277,6 +291,13 @@ void PostOnConnect2(CONNID dwConnID, LPCTSTR lpszAddress, USHORT usPort)
 	PostInfoMsg(msg);
 }
 
+void PostOnConnect3(CONNID dwConnID)
+{
+	info_msg* msg = info_msg::Construct(dwConnID, EVT_ON_CONNECT, 0, nullptr);
+
+	PostInfoMsg(msg);
+}
+
 void PostOnShutdown()
 {
 	info_msg* msg = info_msg::Construct(0, EVT_ON_SHUTDOWN, 0, nullptr);
@@ -403,3 +424,80 @@ CBufferPtr* GeneratePkgBuffer(const TPkgHeader& header, const TPkgBody& body)
 
 	return pBuffer;
 }
+
+#ifdef _SSL_SUPPORT
+
+#include "../../../Common/Src/FuncHelper.h"
+
+CString g_c_strCAPemCertFileOrPath;
+CString g_c_strPemCertFile;
+CString g_c_strPemKeyFile;
+
+CString g_s_strCAPemCertFileOrPath;
+CString g_s_strPemCertFile;
+CString g_s_strPemKeyFile;
+
+int g_c_iVerifyMode					= SSL_VM_PEER;
+LPCTSTR g_c_lpszCAPemCertFileOrPath	= _T("ssl-cert\\ca.crt");
+LPCTSTR g_c_lpszPemCertFile			= _T("ssl-cert\\client.cer");
+LPCTSTR g_c_lpszPemKeyFile			= _T("ssl-cert\\client.key");
+LPCTSTR g_c_lpszKeyPasswod			= _T("123456");
+
+int g_s_iVerifyMode					= SSL_VM_PEER | SSL_VM_FAIL_IF_NO_PEER_CERT;
+LPCTSTR g_s_lpszCAPemCertFileOrPath	= _T("ssl-cert\\ca.crt");
+LPCTSTR g_s_lpszPemCertFile			= _T("ssl-cert\\server.cer");
+LPCTSTR g_s_lpszPemKeyFile			= _T("ssl-cert\\server.key");
+LPCTSTR g_s_lpszKeyPasswod			= _T("123456");
+
+BOOL InitSSLParams();
+BOOL g_SSLParams = InitSSLParams();
+
+BOOL InitSSLParams()
+{
+	::SetCurrentPathToModulePath();
+
+	CString strPath;
+	::GetCurrentDirectory(MAX_PATH, strPath.GetBuffer(MAX_PATH));
+	strPath.ReleaseBuffer();
+	strPath += PATH_SEPARATOR_CHAR;
+
+	if(g_c_lpszPemCertFile)
+	{
+		g_c_strPemCertFile	= strPath + g_c_lpszPemCertFile;
+		g_c_lpszPemCertFile	= g_c_strPemCertFile;
+	}
+
+	if(g_c_lpszPemKeyFile)
+	{
+		g_c_strPemKeyFile	= strPath + g_c_lpszPemKeyFile;
+		g_c_lpszPemKeyFile	= g_c_strPemKeyFile;
+	}
+
+	if(g_c_lpszCAPemCertFileOrPath)
+	{
+		g_c_strCAPemCertFileOrPath	= strPath + g_c_lpszCAPemCertFileOrPath;
+		g_c_lpszCAPemCertFileOrPath	= g_c_strCAPemCertFileOrPath;
+	}
+
+	if(g_s_lpszPemCertFile)
+	{
+		g_s_strPemCertFile	= strPath + g_s_lpszPemCertFile;
+		g_s_lpszPemCertFile	= g_s_strPemCertFile;
+	}
+
+	if(g_s_lpszPemKeyFile)
+	{
+		g_s_strPemKeyFile	= strPath + g_s_lpszPemKeyFile;
+		g_s_lpszPemKeyFile	= g_s_strPemKeyFile;
+	}
+
+	if(g_s_lpszCAPemCertFileOrPath)
+	{
+		g_s_strCAPemCertFileOrPath	= strPath + g_s_lpszCAPemCertFileOrPath;
+		g_s_lpszCAPemCertFileOrPath	= g_s_strCAPemCertFileOrPath;
+	}
+
+	return TRUE;
+}
+
+#endif
diff --git a/HP-Socket/Demo/Global/helper.h b/HP-Socket/Demo/Global/helper.h
@@ -13,6 +13,7 @@
 #define EVT_ON_PREPARE_LISTEN	_T("OnPrepareListen")
 #define EVT_ON_ACCEPT			_T("OnAccept")
 #define EVT_ON_CONNECT			_T("OnConnect")
+#define EVT_ON_HAND_SHAKE		_T("OnHandShake")
 #define EVT_ON_SHUTDOWN			_T("OnShutdown")
 #define EVT_ON_END_TEST			_T("END TEST")
 
@@ -82,6 +83,7 @@ void LogDetect(CONNID dwConnID);
 void LogDetectFail(CONNID dwConnID);
 void LogOnConnect(CONNID dwConnID, const CString& strAddress, USHORT usPort);
 void LogOnConnect2(CONNID dwConnID);
+void LogOnHandShake2(CONNID dwConnID);
 void LogMsg(const CString& msg);
 void PostOnSend(CONNID dwConnID, const BYTE* pData, int iLength);
 void PostOnReceive(CONNID dwConnID, const BYTE* pData, int iLength);
@@ -90,12 +92,34 @@ void PostOnClose(CONNID dwConnID);
 void PostOnError(CONNID dwConnID, int enOperation, int iErrorCode);
 void PostOnAccept(CONNID dwConnID, LPCTSTR lpszAddress, USHORT usPort, BOOL bPass);
 void PostOnAccept2(CONNID dwConnID);
+void PostOnHandShake(CONNID dwConnID);
 void PostOnPrepareListen(LPCTSTR lpszAddress, USHORT usPort);
 void PostOnPrepareConnect(CONNID dwConnID);
 void PostOnConnect(CONNID dwConnID, LPCTSTR lpszAddress, USHORT usPort);
 void PostOnConnect2(CONNID dwConnID, LPCTSTR lpszAddress, USHORT usPort);
+void PostOnConnect3(CONNID dwConnID);
 void PostOnShutdown();
 void PostServerStatics(const LONGLONG& llTotalSent, const LONGLONG& llTotalReceived);
 void PostTimeConsuming(DWORD dwTickCount);
 void PostInfoMsg(info_msg* msg);
 void LogInfoMsg(info_msg* pInfoMsg);
+
+#ifdef _SSL_SUPPORT
+
+#include "../../Src/SocketInterface-SSL.h"
+
+extern int g_c_iVerifyMode;
+extern BOOL g_c_bNeedClientVerification;
+extern LPCTSTR g_c_lpszCAPemCertFileOrPath;
+extern LPCTSTR g_c_lpszPemCertFile;
+extern LPCTSTR g_c_lpszPemKeyFile;
+extern LPCTSTR g_c_lpszKeyPasswod;
+
+extern int g_s_iVerifyMode;
+extern BOOL g_s_bNeedClientVerification;
+extern LPCTSTR g_s_lpszCAPemCertFileOrPath;
+extern LPCTSTR g_s_lpszPemCertFile;
+extern LPCTSTR g_s_lpszPemKeyFile;
+extern LPCTSTR g_s_lpszKeyPasswod;
+
+#endif
diff --git a/HP-Socket/Demo/HttpProxy/HttpProxy.suo b/HP-Socket/Demo/HttpProxy/HttpProxy.suo
diff --git a/HP-Socket/Demo/HttpProxy/Server/Server.rc b/HP-Socket/Demo/HttpProxy/Server/Server.rc
diff --git a/HP-Socket/Demo/Other Languages Demos/Authors.txt b/HP-Socket/Demo/Other Languages Demos/Authors.txt
@@ -3,5 +3,5 @@
 * ������ģ��		���ߣ� ׿Խ��άС��
 
 1��C# Demo			���ߣ� int 2e
-2��Delphi Demo		���ߣ� int 2e
+2��Delphi Demo		���ߣ� �����д~
 3�������� Demo		���ߣ�  Yecate��׿Խ��άС��