added:download connect limit

Author: xengine-qyt

XEngine_Source/StorageModule_Config/Config_Define.h

@@ -84,6 +84,8 @@ typedef struct tag_XEngine_ServerConfig
 		BOOL bLimitMode;
         __int64x nMaxUPLoader;
         __int64x nMaxDNLoader;
+        int nMaxUPConnect;
+        int nMaxDNConnect;
 	}st_XLimit;
     struct  
     {

XEngine_Source/StorageModule_Config/Config_Json/Config_Json.cpp

@@ -169,7 +169,7 @@ BOOL CConfig_Json::Config_Json_File(LPCTSTR lpszConfigFile, XENGINE_SERVERCONFIG
 	_tcscpy(pSt_ServerConfig->st_XProxy.st_XProxyPass.tszDLPass, st_JsonXProxyPass["tszDLPass"].asCString());
 	_tcscpy(pSt_ServerConfig->st_XProxy.st_XProxyPass.tszUPPass, st_JsonXProxyPass["tszUPPass"].asCString());
 
-	if (st_JsonRoot["XLimit"].empty() || (3 != st_JsonRoot["XLimit"].size()))
+	if (st_JsonRoot["XLimit"].empty() || (5 != st_JsonRoot["XLimit"].size()))
 	{
 		Config_IsErrorOccur = TRUE;
 		Config_dwErrorCode = ERROR_XENGINE_BLOGIC_CONFIG_JSON_XSTORAGE;
@@ -179,6 +179,8 @@ BOOL CConfig_Json::Config_Json_File(LPCTSTR lpszConfigFile, XENGINE_SERVERCONFIG
 	pSt_ServerConfig->st_XLimit.bLimitMode = st_JsonXLimit["bLimitMode"].asBool();
 	pSt_ServerConfig->st_XLimit.nMaxDNLoader = st_JsonXLimit["nMaxDNLoad"].asInt64();
 	pSt_ServerConfig->st_XLimit.nMaxUPLoader = st_JsonXLimit["nMaxUPLoad"].asInt64();
+	pSt_ServerConfig->st_XLimit.nMaxUPConnect = st_JsonXLimit["nMaxUPConnect"].asInt();
+	pSt_ServerConfig->st_XLimit.nMaxDNConnect = st_JsonXLimit["nMaxDNConnect"].asInt();
 
 	if (st_JsonRoot["XP2xp"].empty() || (3 != st_JsonRoot["XP2xp"].size()))
 	{

XEngine_Source/StorageModule_Session/Session_Define.h

@@ -94,7 +94,7 @@ extern "C" BOOL Session_User_Exist(LPCTSTR lpszUser, LPCTSTR lpszPass, int* pInt
   意思：是否成功
 备注：
 *********************************************************************/
-extern "C" BOOL Session_DLStroage_Init();
+extern "C" BOOL Session_DLStroage_Init(int nMaxConnect);
 /********************************************************************
 函数名称：Session_DLStroage_Destory
 函数功能：销毁下载管理器
@@ -267,6 +267,20 @@ extern "C" BOOL Session_DLStorage_GetAll(SESSION_STORAGEINFO*** pppSt_StorageInf
 *********************************************************************/
 extern "C" BOOL Session_DLStroage_Delete(LPCTSTR lpszClientAddr);
 /********************************************************************
+函数名称：Session_DLStroage_MaxConnect
+函数功能：判断一个地址是否超过连接数限制
+ 参数.一：lpszClientAddr
+  In/Out：In
+  类型：常量字符指针
+  可空：N
+  意思：输入要处理的地址
+返回值
+  类型：逻辑型
+  意思：是否成功
+备注：
+*********************************************************************/
+extern "C" BOOL Session_DLStroage_MaxConnect(LPCTSTR lpszClientAddr);
+/********************************************************************
 函数名称：Session_UPStroage_Init
 函数功能：初始化上传会话管理器
  参数.一：bUPResume

XEngine_Source/StorageModule_Session/Session_Error.h

@@ -18,4 +18,5 @@
 #define ERROR_STORAGE_MODULE_SESSION_OPENFILE 0x0010003
 #define ERROR_STORAGE_MODULE_SESSION_NOTFOUND 0x0010004 
 #define ERROR_STORAGE_MODULE_SESSION_PASSWORD 0x0010005
-#define ERROR_STORAGE_MODULE_SESSION_EMPTY 0x0010006
+#define ERROR_STORAGE_MODULE_SESSION_EMPTY 0x0010006
+#define ERROR_STORAGE_MODULE_SESSION_MAXCONNECT 0x0010007

XEngine_Source/StorageModule_Session/Session_Stroage/Session_DLStroage.cpp

@@ -23,15 +23,26 @@ CSession_DLStroage::~CSession_DLStroage()
 /********************************************************************
 函数名称：Session_DLStroage_Init
 函数功能：初始化下载会话管理器
+ 参数.一：nMaxConnect
+  In/Out：
+  类型：
+  可空：
+  意思：
+ 参数.二：
+  In/Out：
+  类型：
+  可空：
+  意思：
 返回值
   类型：逻辑型
   意思：是否成功
 备注：
 *********************************************************************/
-BOOL CSession_DLStroage::Session_DLStroage_Init()
+BOOL CSession_DLStroage::Session_DLStroage_Init(int nMaxConnect)
 {
 	Session_IsErrorOccur = FALSE;
 
+	m_nMaxConnect = nMaxConnect;
 	return TRUE;
 }
 /********************************************************************
@@ -432,4 +443,53 @@ BOOL CSession_DLStroage::Session_DLStroage_Delete(LPCTSTR lpszClientAddr)
 	}
 	st_Locker.unlock_shared();
 	return TRUE;
+}
+/********************************************************************
+函数名称：Session_DLStroage_MaxConnect
+函数功能：判断一个地址是否超过连接数限制
+ 参数.一：lpszClientAddr
+  In/Out：In
+  类型：常量字符指针
+  可空：N
+  意思：输入要处理的地址
+返回值
+  类型：逻辑型
+  意思：是否成功
+备注：
+*********************************************************************/
+BOOL CSession_DLStroage::Session_DLStroage_MaxConnect(LPCTSTR lpszClientAddr)
+{
+	Session_IsErrorOccur = FALSE;
+
+	int nExistNumber = 0;
+	st_Locker.lock_shared();
+	unordered_map<string, SESSION_STORAGEINFO>::iterator stl_MapIterator = stl_MapStroage.begin();
+	for (; stl_MapIterator != stl_MapStroage.end(); stl_MapIterator++)
+	{
+		TCHAR tszIPSource[128];
+		TCHAR tszIPDest[128];
+
+		memset(tszIPSource, '\0', sizeof(tszIPSource));
+		memset(tszIPDest, '\0', sizeof(tszIPDest));
+
+		_tcscpy(tszIPSource, stl_MapIterator->first.c_str());
+		_tcscpy(tszIPDest, lpszClientAddr);
+
+		BaseLib_OperatorIPAddr_SegAddr(tszIPSource);
+		BaseLib_OperatorIPAddr_SegAddr(tszIPDest);
+
+		if (0 == _tcscmp(tszIPSource, tszIPDest))
+		{
+			nExistNumber++;
+		}
+	}
+	st_Locker.unlock_shared();
+
+	if (nExistNumber > m_nMaxConnect)
+	{
+		Session_IsErrorOccur = TRUE;
+		Session_dwErrorCode = ERROR_STORAGE_MODULE_SESSION_MAXCONNECT;
+		return FALSE;
+	}
+	return TRUE;
 }

XEngine_Source/StorageModule_Session/Session_Stroage/Session_DLStroage.h

@@ -17,7 +17,7 @@ class CSession_DLStroage
     CSession_DLStroage();
     ~CSession_DLStroage();
 public:
-    BOOL Session_DLStroage_Init();
+    BOOL Session_DLStroage_Init(int nMaxConnect);
     BOOL Session_DLStroage_Destory();
     BOOL Session_DLStroage_Insert(LPCTSTR lpszClientAddr, LPCTSTR lpszBuckKey, LPCTSTR lpszFileDir, __int64x* pInt_Count, __int64x* pInt_LeftCount, int nPosStart = 0, int nPostEnd = 0, LPCTSTR lpszFileHash = NULL, int nLimit = 0, XHANDLE xhToken = NULL);
     BOOL Session_DLStroage_GetBuffer(LPCTSTR lpszClientAddr, TCHAR* ptszMsgBuffer, int* pInt_MsgLen);
@@ -26,8 +26,9 @@ class CSession_DLStroage
     BOOL Session_DLStorage_SetSeek(LPCTSTR lpszClientAddr, int nSeek);
     BOOL Session_DLStorage_GetAll(SESSION_STORAGEINFO*** pppSt_StorageInfo, int* pInt_ListCount);
     BOOL Session_DLStroage_Delete(LPCTSTR lpszClientAddr);
+    BOOL Session_DLStroage_MaxConnect(LPCTSTR lpszClientAddr);
 private:
-    int m_nTryTime;
+    int m_nMaxConnect;
     shared_mutex st_Locker;
 private:
     unordered_map<string, SESSION_STORAGEINFO> stl_MapStroage;

XEngine_Source/StorageModule_Session/StorageModule_Session.def

@@ -16,6 +16,7 @@ EXPORTS
 	Session_DLStorage_SetSeek
 	Session_DLStorage_GetAll
 	Session_DLStroage_Delete
+	Session_DLStroage_MaxConnect
 
 	Session_UPStroage_Init
 	Session_UPStroage_Destory

XEngine_Source/StorageModule_Session/pch.cpp

@@ -48,9 +48,9 @@ extern "C" BOOL Session_User_Exist(LPCTSTR lpszUser, LPCTSTR lpszPass, int* pInt
 /************************************************************************/
 /*                        存储会话导出的函数                            */
 /************************************************************************/
-extern "C" BOOL Session_DLStroage_Init()
+extern "C" BOOL Session_DLStroage_Init(int nMaxConnect)
 {
-	return m_DLStorage.Session_DLStroage_Init();
+	return m_DLStorage.Session_DLStroage_Init(nMaxConnect);
 }
 extern "C" BOOL Session_DLStroage_Destory()
 {
@@ -84,6 +84,10 @@ extern "C" BOOL Session_DLStroage_Delete(LPCTSTR lpszClientAddr)
 {
 	return m_DLStorage.Session_DLStroage_Delete(lpszClientAddr);
 }
+extern "C" BOOL Session_DLStroage_MaxConnect(LPCTSTR lpszClientAddr)
+{
+	return m_DLStorage.Session_DLStroage_MaxConnect(lpszClientAddr);
+}
 extern "C" BOOL Session_UPStroage_Init(BOOL bUPResume)
 {
 	return m_UPStorage.Session_UPStroage_Init(bUPResume);

XEngine_Source/XEngine_StorageApp/StorageApp_Download.cpp

@@ -141,7 +141,21 @@ BOOL XEngine_Task_HttpDownload(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, in
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("下载客户端:%s,发送的方法不支持"), lpszClientAddr);
 		return FALSE;
 	}
-	
+	//连接数限制处理
+	if (st_ServiceCfg.st_XLimit.nMaxDNConnect > 0)
+	{
+		if (!Session_DLStroage_MaxConnect(lpszClientAddr))
+		{
+			st_HDRParam.bIsClose = TRUE;
+			st_HDRParam.nHttpCode = 503;
+
+			RfcComponents_HttpServer_SendMsgEx(xhDLHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
+			XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPDOWNLOAD);
+			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("下载客户端:%s,请求失败,连接数超过限制:%d,无法继续"), lpszClientAddr, st_ServiceCfg.st_XLimit.nMaxDNConnect);
+			return FALSE;
+		}
+	}
+	//验证用户
 	if (st_ServiceCfg.st_XProxy.st_XProxyAuth.bAuth)
 	{
 		TCHAR tszUserName[64];

XEngine_Source/XEngine_StorageApp/XEngine_StorageApp.cpp

@@ -234,12 +234,12 @@ int main(int argc, char** argv)
 		}
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务中，初始化HTTP下载服务成功，IO线程个数:%d"), st_ServiceCfg.st_XMax.nStorageDLThread);
 
-		if (!Session_DLStroage_Init())
+		if (!Session_DLStroage_Init(st_ServiceCfg.st_XLimit.nMaxDNConnect))
 		{
 			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("启动服务中，启动下载会话服务失败，错误：%lX"), Session_GetLastError());
 			goto XENGINE_EXITAPP;
 		}
-		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务中，启动下载会话服务成功,下载限速模式:%s"), st_ServiceCfg.st_XLimit.bLimitMode ? "开" : "关");
+		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务中，启动下载会话服务成功,下载限速模式:%s,连接数限制;%d"), st_ServiceCfg.st_XLimit.bLimitMode ? "开" : "关", st_ServiceCfg.st_XLimit.nMaxDNConnect);
 
 		if (st_ServiceCfg.st_XCert.bDLEnable)
 		{