modify:srt SRTSOCKET type to XSOCKET

Author: xengine-qyt

XEngine_Source/XEngine.sln

@@ -7,6 +7,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_ModuleConfigure", "
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XEngine_UserHdr", "XEngine_UserHdr", "{9E4F2158-9AC1-4C19-A3F7-375A9DBCF856}"
 	ProjectSection(SolutionItems) = preProject
+		XEngine_BuildSwitch.h = XEngine_BuildSwitch.h
 		XEngine_UserProtocol.h = XEngine_UserProtocol.h
 	EndProjectSection
 EndProject

XEngine_Source/XEngine_ModuleHelp/ModuleHelp_Srt/ModuleHelp_SrtCore.cpp

@@ -172,7 +172,7 @@ bool CModuleHelp_SrtCore::ModuleHelp_SrtCore_Send(LPCXSTR lpszClientAddr, LPCXST
 	int nRet = 0;
 	int nSendCount = 0;
 	int nLeftCount = nMsgLen;
-	SRTSOCKET hSocket = stl_MapIterator->second.hSocket;
+	XSOCKET hSocket = stl_MapIterator->second.hSocket;
 
 	while (true)
 	{
@@ -231,7 +231,7 @@ bool CModuleHelp_SrtCore::ModuleHelp_SrtCore_Send(LPCXSTR lpszClientAddr, LPCXST
   意思：是否成功
 备注：
 *********************************************************************/
-bool CModuleHelp_SrtCore::ModuleHelp_SrtCore_GetStreamID(SRTSOCKET hSocket, XCHAR* ptszSMSAddr, bool* pbPublish)
+bool CModuleHelp_SrtCore::ModuleHelp_SrtCore_GetStreamID(XSOCKET hSocket, XCHAR* ptszSMSAddr, bool* pbPublish)
 {
 	ModuleHelp_IsErrorOccur = false;
 
@@ -292,7 +292,7 @@ bool CModuleHelp_SrtCore::ModuleHelp_SrtCore_GetStreamID(SRTSOCKET hSocket, XCHA
   意思：是否成功
 备注：
 *********************************************************************/
-bool CModuleHelp_SrtCore::ModuleHelp_SrtCore_Close(LPCXSTR lpszClientAddr /* = NULL */, SRTSOCKET hSocket /* = 0 */)
+bool CModuleHelp_SrtCore::ModuleHelp_SrtCore_Close(LPCXSTR lpszClientAddr /* = NULL */, XSOCKET hSocket /* = 0 */)
 {
 	ModuleHelp_IsErrorOccur = false;
 
@@ -336,7 +336,7 @@ bool CModuleHelp_SrtCore::ModuleHelp_SrtCore_Destory()
 //////////////////////////////////////////////////////////////////////////
 //                             保护函数
 //////////////////////////////////////////////////////////////////////////
-bool CModuleHelp_SrtCore::ModuleHelp_SrtCore_Accept(SRTSOCKET hSRTSocket)
+bool CModuleHelp_SrtCore::ModuleHelp_SrtCore_Accept(XSOCKET hSRTSocket)
 {
 	ModuleHelp_IsErrorOccur = false;
 
@@ -384,7 +384,7 @@ bool CModuleHelp_SrtCore::ModuleHelp_SrtCore_Accept(SRTSOCKET hSRTSocket)
 	lpCall_Login(st_SRTClient.tszClientAddr, st_SRTClient.hSocket, m_lLogin);
 	return true;
 }
-bool CModuleHelp_SrtCore::ModuleHelp_SrtCore_Recv(SRTSOCKET hSocket)
+bool CModuleHelp_SrtCore::ModuleHelp_SrtCore_Recv(XSOCKET hSocket)
 {
 	ModuleHelp_IsErrorOccur = false;
 
@@ -414,7 +414,7 @@ bool CModuleHelp_SrtCore::ModuleHelp_SrtCore_Recv(SRTSOCKET hSocket)
 	}
 	return true;
 }
-bool CModuleHelp_SrtCore::ModuleHelp_SrtCore_Leave(SRTSOCKET hSocket)
+bool CModuleHelp_SrtCore::ModuleHelp_SrtCore_Leave(XSOCKET hSocket)
 {
 	ModuleHelp_IsErrorOccur = false;
 
@@ -450,9 +450,9 @@ XHTHREAD CALLBACK CModuleHelp_SrtCore::ModuleHelp_SrtCore_Thread(XPVOID lParam)
 	while (pClass_This->bRun)
 	{
 		int nSRTCount = 100;
-		SRTSOCKET hSRTClient[100];
+		XSOCKET hSRTClient[100];
 
-		int nSRTIndex = srt_epoll_wait(pClass_This->hSRTEPoll, hSRTClient, &nSRTCount, NULL, NULL, -1, NULL, NULL, NULL, NULL);
+		int nSRTIndex = srt_epoll_wait(pClass_This->hSRTEPoll, (SRTSOCKET *)hSRTClient, &nSRTCount, NULL, NULL, -1, NULL, NULL, NULL, NULL);
 		for (int i = 0; i < nSRTIndex; i++)
 		{
 			SRT_SOCKSTATUS nSRTStatus = srt_getsockstate(hSRTClient[i]);

XEngine_Source/XEngine_ModuleHelp/ModuleHelp_Srt/ModuleHelp_SrtCore.h

@@ -16,7 +16,7 @@ typedef struct
 	XCHAR tszClientAddr[MAX_PATH];
 
 	int nIDLen;
-	SRTSOCKET hSocket;
+	XSOCKET hSocket;
 }SRTCORE_CLIENTINFO;
 
 class CModuleHelp_SrtCore
@@ -28,19 +28,19 @@ class CModuleHelp_SrtCore
 	bool ModuleHelp_SrtCore_Start(int nPort);
 	bool ModuleHelp_SrtCore_SetCallback(CALLBACK_NETCORE_SOCKET_NETEVENT_LOGIN fpCallePoll_Login, CALLBACK_NETCORE_SOCKET_NETEVENT_RECV fpCallePoll_Recv, CALLBACK_NETCORE_SOCKET_NETEVENT_LEAVE fpCallePoll_Leave, XPVOID lPLogin = NULL, XPVOID lPRecv = NULL, XPVOID lPLeave = NULL);
 	bool ModuleHelp_SrtCore_Send(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int nMsgLen);
-	bool ModuleHelp_SrtCore_GetStreamID(SRTSOCKET hSocket, XCHAR* ptszSMSAddr, bool* pbPublish);
-	bool ModuleHelp_SrtCore_Close(LPCXSTR lpszClientAddr = NULL, SRTSOCKET hSocket = 0);
+	bool ModuleHelp_SrtCore_GetStreamID(XSOCKET hSocket, XCHAR* ptszSMSAddr, bool* pbPublish);
+	bool ModuleHelp_SrtCore_Close(LPCXSTR lpszClientAddr = NULL, XSOCKET hSocket = 0);
 	bool ModuleHelp_SrtCore_Destory();
 protected:
-	bool ModuleHelp_SrtCore_Accept(SRTSOCKET hSRTSocket);
-	bool ModuleHelp_SrtCore_Recv(SRTSOCKET hSocket);
-	bool ModuleHelp_SrtCore_Leave(SRTSOCKET hSocket);
+	bool ModuleHelp_SrtCore_Accept(XSOCKET hSRTSocket);
+	bool ModuleHelp_SrtCore_Recv(XSOCKET hSocket);
+	bool ModuleHelp_SrtCore_Leave(XSOCKET hSocket);
 protected:
 	static XHTHREAD CALLBACK ModuleHelp_SrtCore_Thread(XPVOID lParam);
 private:
 	bool bRun = false;
 	int hSRTEPoll = 0;
-	SRTSOCKET hSRTSocket;
+	XSOCKET hSRTSocket;
 private:
 	XPVOID m_lLogin;
 	XPVOID m_lRecv;
@@ -52,5 +52,5 @@ class CModuleHelp_SrtCore
 	shared_mutex st_Locker;
 	unique_ptr<thread> pSDTThread;
 private:
-	unordered_map<SRTSOCKET, SRTCORE_CLIENTINFO> stl_MapClients;
+	unordered_map<XSOCKET, SRTCORE_CLIENTINFO> stl_MapClients;
 };

XEngine_Source/XEngine_ModuleHelp/pch.h

@@ -32,6 +32,7 @@ using namespace std;
 #include <XEngine_Include/XEngine_Core/OPenSsl_Define.h>
 #include <XEngine_Include/XEngine_Core/OPenSsl_Error.h>
 #include "../XEngine_UserProtocol.h"
+#include "../XEngine_BuildSwitch.h"
 #include "ModuleHelp_Define.h"
 #include "ModuleHelp_Error.h"
 /********************************************************************
@@ -52,5 +53,4 @@ extern XLONG ModuleHelp_dwErrorCode;
 #pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib")
 #pragma comment(lib,"XEngine_Core/XEngine_OPenSsl")
 #pragma comment(lib,"Ws2_32")
-#pragma comment(lib,"srt")
 #endif