fixed:P2XPProtocol_Packet_WLan not export

Now supports getting all address lists under wlan
WLANLIST AND LANLIST merge

Author: xengine-qyt

XEngine_Source/XEngine_P2XPComponents/XEngine_P2XPProtocol/XEngine_P2XPProtocol.def

@@ -11,5 +11,6 @@ EXPORTS
 
 	P2XPProtocol_Packet_Common
 	P2XPProtocol_Packet_Lan
+	P2XPProtocol_Packet_WLan
 	P2XPProtocol_Packet_User
 	P2XPProtocol_Packet_Connect

XEngine_Source/XEngine_StorageApp/StorageApp_P2XPNet.cpp

@@ -127,7 +127,31 @@ BOOL XEngine_Task_TCPP2xp(XENGINE_PROTOCOLHDR* pSt_ProtocolHdr, LPCTSTR lpszClie
 			}
 			else
 			{
+				//公网下所有列表
+				int nListCount = 0;
+				TCHAR** ppszClientList;
+				list<XENGINE_P2XPPEER_PROTOCOL> stl_ListClient;
+				if (P2XPPeer_Manage_GetLList(tszPubAddr, &ppszClientList, &nListCount))
+				{
+					for (int i = 0; i < nListCount; i++)
+					{
+						int nLanCount = 0;
+						XENGINE_P2XPPEER_PROTOCOL** ppSt_ListClients;
 
+						if (P2XPPeer_Manage_GetLan(tszPubAddr, ppszClientList[i], &ppSt_ListClients, &nLanCount))
+						{
+							for (int j = 0; j < nLanCount; j++)
+							{
+								stl_ListClient.push_back(*ppSt_ListClients[j]);
+							}
+							BaseLib_OperatorMemory_Free((XPPPMEM)&ppSt_ListClients, nLanCount);
+						}
+					}
+					BaseLib_OperatorMemory_Free((XPPPMEM)&ppszClientList, nListCount);
+				}
+				P2XPProtocol_Packet_WLan(pSt_ProtocolHdr, &stl_ListClient, tszSDBuffer, &nSDLen);
+				XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_TCPP2XP);
+				XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("客户端:%s,请求同步局域网列表成功,公有地址:%s,私有地址:%s"), lpszClientAddr, tszPubAddr, tszPriAddr);
 			}
 		}
 		else if (XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_P2XP_REQCONNECT == pSt_ProtocolHdr->unOperatorCode)
@@ -192,6 +216,13 @@ BOOL XEngine_Task_TCPP2xp(XENGINE_PROTOCOLHDR* pSt_ProtocolHdr, LPCTSTR lpszClie
 			XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_TCPP2XP);
 			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("客户端:%s,请求查询用户:%s 成功"), lpszClientAddr, tszUserName);
 		}
+		else if (XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_STORAGE_REQQUERY == pSt_ProtocolHdr->unOperatorCode)
+		{
+			TCHAR tszFileHash[MAX_PATH];
+			memset(tszFileHash, '\0', MAX_PATH);
+
+			XStorageProtocol_Core_REQQueryFile(lpszMsgBuffer, NULL, NULL, NULL, tszFileHash);
+		}
 		else
 		{
 			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _T("客户端:%s,请求了一条未知的子协议：%lX"), lpszClientAddr, pSt_ProtocolHdr->unOperatorCode);

XEngine_Source/XStorage_Protocol.h

@@ -14,17 +14,15 @@
 //                         协议定义
 //////////////////////////////////////////////////////////////////////////
 //存储服务
-#define XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_STORAGE_REQQUERY 0x4001    //查询请求
-#define XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_STORAGE_REPQUERY 0x4002    //
+#define XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_STORAGE_REQQUERY 0x4001     //查询请求
+#define XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_STORAGE_REPQUERY 0x4002     //查询回复
 //P2XP协议
 #define XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_P2XP_REQLANLIST 0x6001      //同步列表协议,同步本地局域网IP中的客户端
 #define XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_P2XP_REPLANLIST 0x6002      //同步列表回复确认协议
-#define XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_P2XP_REQWLANLIST 0x6003     //同步列表协议,同步同一外网IP中局域网
-#define XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_P2XP_REPWLANLIST 0x6004     //同步万维网IP确认协议
-#define XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_P2XP_REQCONNECT 0x6005      //请求用户连接到网络服务
-#define XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_P2XP_REPCONNECT 0x6006      //确认连接协议
-#define XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_P2XP_REQUSERQUERY 0x6007    //用户查询
-#define XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_P2XP_REPUSERQUERY 0x6008    //用户查询确认
+#define XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_P2XP_REQCONNECT 0x6003      //请求用户连接到网络服务
+#define XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_P2XP_REPCONNECT 0x6004      //确认连接协议
+#define XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_P2XP_REQUSERQUERY 0x6005    //用户查询
+#define XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_P2XP_REPUSERQUERY 0x6006    //用户查询确认
 //////////////////////////////////////////////////////////////////////////
 //                         协议结构体
 //////////////////////////////////////////////////////////////////////////