added:use send callback to download file

modify:support two mode with download

Author: xengine-qyt

XEngine_Release/XEngine_Config/XEngine_Config.json

@@ -37,6 +37,7 @@
   },
   "XStorage": {
     "nHashMode": 2,
+    "nSendMode": 1,
     "bRename": 0,
     "tszFileDir": "/home/ubuntu/桌面/XEngine_Storage/XEngine_Source/Debug/XEngine_File"
   },
@@ -68,6 +69,7 @@
   },
   "XVer": {
     "StorageVersion": [
+      "2.4.0.1001 Build20210917",
       "2.3.0.1001 Build20210903",
       "2.2.0.1001 Build20210820",
       "2.1.0.1001 Build20210805",

XEngine_Source/StorageModule_Config/Config_Define.h

@@ -64,6 +64,7 @@ typedef struct tag_XEngine_ServerConfig
     struct  
 	{
         BOOL bRename;
+        int nSendMode;
         int nHashMode;
 		TCHAR tszFileDir[MAX_PATH];
     }st_XStorage;

XEngine_Source/StorageModule_Config/Config_Json/Config_Json.cpp

@@ -125,14 +125,15 @@ BOOL CConfig_Json::Config_Json_File(LPCTSTR lpszConfigFile,XENGINE_SERVERCONFIG
 	_tcscpy(pSt_ServerConfig->st_XSql.tszSQLPass, st_JsonXSql["SQLPass"].asCString());
 	_tcscpy(pSt_ServerConfig->st_XSql.tszSQLFile, st_JsonXSql["SQLFile"].asCString());
 
-    if (st_JsonRoot["XStorage"].empty() || (3 != st_JsonRoot["XStorage"].size()))
+    if (st_JsonRoot["XStorage"].empty() || (4 != st_JsonRoot["XStorage"].size()))
     {
         Config_IsErrorOccur = TRUE;
         Config_dwErrorCode = ERROR_XENGINE_BLOGIC_CONFIG_JSON_XSTORAGE;
         return FALSE;
     }
     Json::Value st_JsonXStorage = st_JsonRoot["XStorage"];
     pSt_ServerConfig->st_XStorage.nHashMode = st_JsonXStorage["nHashMode"].asInt();
+    pSt_ServerConfig->st_XStorage.nSendMode = st_JsonXStorage["nSendMode"].asInt();
     pSt_ServerConfig->st_XStorage.bRename = st_JsonXStorage["bRename"].asInt();
     _tcscpy(pSt_ServerConfig->st_XStorage.tszFileDir, st_JsonXStorage["tszFileDir"].asCString());
 

XEngine_Source/XEngine_StorageApp/StorageApp_Download.cpp

@@ -41,6 +41,55 @@ XHTHREAD CALLBACK XEngine_Download_HTTPThread(LPVOID lParam)
 	}
 	return 0;
 }
+
+void CALLBACK XEngine_Download_CBSend(LPCSTR lpszClientAddr, SOCKET hSocket, LPVOID lParam)
+{
+	int nThreadPos = 0;          //回调模式不需要发送线程池
+	int nMsgLen = 4096;
+	TCHAR tszMsgBuffer[4096];
+	memset(tszMsgBuffer, '\0', sizeof(tszMsgBuffer));
+
+	if (Session_DLStroage_GetBuffer(nThreadPos, lpszClientAddr, tszMsgBuffer, &nMsgLen))
+	{
+		if (nMsgLen <= 0)
+		{
+			if (st_ServiceCfg.st_XProxy.st_XProxyPass.bDLPass)
+			{
+				int nPLen = MAX_PATH;
+				int nHttpCode = 0;
+				UCHAR tszHashKey[MAX_PATH];
+				TCHAR tszHashStr[MAX_PATH];
+				TCHAR tszProxyStr[MAX_PATH];
+				SESSION_STORAGEINFO st_StorageInfo;
+
+				memset(tszHashKey, '\0', MAX_PATH);
+				memset(tszHashStr, '\0', MAX_PATH);
+				memset(tszProxyStr, '\0', MAX_PATH);
+				memset(&st_StorageInfo, '\0', sizeof(SESSION_STORAGEINFO));
+
+				OPenSsl_Api_Digest(st_StorageInfo.tszFileDir, tszHashKey, NULL, TRUE, st_ServiceCfg.st_XStorage.nHashMode);
+				BaseLib_OperatorString_StrToHex((char*)tszHashKey, 20, tszHashStr);
+				Session_DLStroage_GetInfo(nThreadPos, lpszClientAddr, &st_StorageInfo);
+
+				XStorageProtocol_Proxy_PacketUPDown(st_StorageInfo.tszFileDir, st_StorageInfo.tszClientAddr, st_StorageInfo.ullRWCount, tszProxyStr, &nPLen, tszHashStr);
+				APIHelp_HttpRequest_Post(st_ServiceCfg.st_XProxy.st_XProxyPass.tszDLPass, tszProxyStr, &nHttpCode);
+				XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_NOTICE, _T("下载客户端:%s,请求完成通知返回值:%d,文件:%s,地址:%s"), lpszClientAddr, nHttpCode, st_StorageInfo.tszFileDir, st_ServiceCfg.st_XProxy.st_XProxyPass.tszDLPass);
+			}
+			NetCore_TCPXCore_CBSendEx(xhNetDownload, lpszClientAddr);
+			Session_DLStroage_Delete(lpszClientAddr);
+			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_NOTICE, _T("下载客户端:%s,文件已经发送完毕,用户已经被移除发送列表"), lpszClientAddr);
+		}
+		else
+		{
+			XEngine_Task_SendDownload(lpszClientAddr, tszMsgBuffer, nMsgLen);
+		}
+	}
+	else
+	{
+		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("下载客户端:%s,获取用户对应文件内容失败,错误：%lX"), lpszClientAddr, Session_GetLastError());
+	}
+}
+
 XHTHREAD CALLBACK XEngine_Download_SendThread(LPVOID lParam)
 {
 	int nThreadPos = *(int*)lParam;
@@ -188,6 +237,20 @@ BOOL XEngine_Task_HttpDownload(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, in
 	_tcscpy(st_HDRParam.tszMimeType, _T("bin"));
 	RfcComponents_HttpServer_SendMsgEx(xhDLHttp, tszSDBuffer, &nSDLen, &st_HDRParam, NULL, ullSize);
 	XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPDOWNLOAD);
+	//不能在send之前调用
+	if (2 == st_ServiceCfg.st_XStorage.nSendMode)
+	{
+		if (!NetCore_TCPXCore_CBSendEx(xhNetDownload, lpszClientAddr, XEngine_Download_CBSend))
+		{
+			st_HDRParam.bIsClose = TRUE;
+			st_HDRParam.nHttpCode = 404;
+
+			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,设置回调下载失败,文件:%s,错误：%lX"), lpszClientAddr, tszFileDir, Session_GetLastError());
+			return FALSE;
+		}
+	}
 	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("下载客户端:%s,请求下载文件成功,文件名:%s,总大小:%llu,发送大小:%llu,范围:%d - %d"), lpszClientAddr, tszFileDir, ullCount, ullSize, nPosStart, nPosEnd);
 	return TRUE;
 }

XEngine_Source/XEngine_StorageApp/StorageApp_Download.h

@@ -2,6 +2,7 @@
 
 XHTHREAD CALLBACK XEngine_Download_HTTPThread(LPVOID lParam);
 XHTHREAD CALLBACK XEngine_Download_SendThread(LPVOID lParam);
+void CALLBACK XEngine_Download_CBSend(LPCSTR lpszClientAddr, SOCKET hSocket, LPVOID lParam);
 
 BOOL XEngine_Task_HttpDownload(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, int nMsgLen, RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam, TCHAR** pptszListHdr, int nHdrCount);
 BOOL XEngine_Task_SendDownload(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, int nMsgLen);

XEngine_Source/XEngine_StorageApp/XEngine_StorageApp.cpp

@@ -268,7 +268,7 @@ int main(int argc, char** argv)
 		goto XENGINE_EXITAPP;
 	}
 	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务中，启动用户管理服务成功"));
-	if (!Session_DLStroage_Init(st_ServiceCfg.st_XMax.nStorageDLThread, st_ServiceCfg.st_XLimit.nDLTry, st_ServiceCfg.st_XLimit.nDLError))
+	if (!Session_DLStroage_Init(1 == st_ServiceCfg.st_XStorage.nSendMode ? st_ServiceCfg.st_XMax.nStorageDLThread : 1, st_ServiceCfg.st_XLimit.nDLTry, st_ServiceCfg.st_XLimit.nDLError))
 	{
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("启动服务器中，启动下载会话服务失败，错误：%lX"), Session_GetLastError());
 		goto XENGINE_EXITAPP;
@@ -339,12 +339,19 @@ int main(int argc, char** argv)
 		goto XENGINE_EXITAPP;
 	}
 	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务中，启动HTTP下载任务处理线程池成功,线程池个数:%d"), st_ServiceCfg.st_XMax.nStorageDLThread);
-	if (!ManagePool_Thread_NQCreate(&xhSDPool, &ppSt_ListSDThread, st_ServiceCfg.st_XMax.nStorageDLThread))
+	if (1 == st_ServiceCfg.st_XStorage.nSendMode)
 	{
-		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("启动服务中，启动下载任务线程池失败，错误：%d"), errno);
-		goto XENGINE_EXITAPP;
+		if (!ManagePool_Thread_NQCreate(&xhSDPool, &ppSt_ListSDThread, st_ServiceCfg.st_XMax.nStorageDLThread))
+		{
+			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("启动服务中，启动下载任务线程池失败，错误：%d"), errno);
+			goto XENGINE_EXITAPP;
+		}
+		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务中，启动下载任务线程池成功,线程池个数:%d"), st_ServiceCfg.st_XMax.nStorageDLThread);
+	}
+	else
+	{
+		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务中，使用发送回调模式处理下载"));
 	}
-	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务中，启动下载任务线程池成功,线程池个数:%d"), st_ServiceCfg.st_XMax.nStorageDLThread);
 
 	for (int i = 0; i < st_ServiceCfg.st_XMax.nStorageUPThread; i++)
 	{