modify:dns query support back server query

Author: xengine-qyt

XEngine_Release/XEngine_Config/XEngine_Config.json

@@ -5,7 +5,7 @@
     "nHttpPort": 5501,
     "nRFCPort": 5502,
     "nNTPPort": 0,
-    "nDNSPort": 53,
+    "nDNSPort": 0,
     "XMax": {
         "nMaxClient": 10000,
         "nMaxQueue": 10000,

XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/Makefile

@@ -6,7 +6,7 @@ LOADHDR = -I ./
 LOADSO = -L ../../XEngine_ModuleConfigure -L ../../XEngine_ModuleDatabase -L ../../XEngine_ModuleProtocol -L ../../XEngine_ModuleSystem -L ../../XEngine_ModuleHelp -L ../../XEngine_ModulePlugin   \
 		 -L ../../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp -L ../../XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/XEngine_InfoReport  \
 		 -L ../../XEngine_DependLibrary/XEngine_IPMacData/XEngine_Source/XEngine_APIModuleIPMac -L ../../XEngine_DependLibrary/XEngine_PhoneData/Source/C/XEngine_APIModulePhone
-LIB = -lXEngine_BaseSafe -lXEngine_BaseLib -lXEngine_Algorithm -lXEngine_Core -lXEngine_ManagePool -lXEngine_Cryption -lXClient_Stream -lXClient_APIHelp -lNetHelp_APIAddr -lHelpComponents_XLog -lRfcComponents_HttpProtocol -lRfcComponents_NatProtocol -lRfcComponents_NTPProtocol -lRfcComponents_DNSProtocol -lXEngine_ProcFile -lXEngine_SystemApi -lXEngine_AVHelp -lXEngine_VideoCodec -lXEngine_AudioCodec -lXEngine_AVCollect \
+LIB = -lXEngine_BaseSafe -lXEngine_BaseLib -lXEngine_Algorithm -lXEngine_Core -lXEngine_ManagePool -lXEngine_Cryption -lXClient_Stream -lXClient_APIHelp -lXClient_Socket -lNetHelp_APIAddr -lNetHelp_XSocket -lHelpComponents_XLog -lRfcComponents_HttpProtocol -lRfcComponents_NatProtocol -lRfcComponents_NTPProtocol -lRfcComponents_DNSProtocol -lXEngine_ProcFile -lXEngine_SystemApi -lXEngine_AVHelp -lXEngine_VideoCodec -lXEngine_AudioCodec -lXEngine_AVCollect \
 	  -lXEngine_ModuleConfigure -lXEngine_ModuleDatabase -lXEngine_ModuleProtocol -lXEngine_ModuleSystem -lXEngine_ModuleHelp -lXEngine_ModulePlugin                          \
 	  -ljsoncpp -lXEngine_InfoReport    \
 	  -lXEngine_APIModuleIPMac -lXEngine_APIModulePhone

XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_Hdr.h

@@ -35,6 +35,8 @@ using namespace std;
 #include <XEngine_Include/XEngine_Core/ManagePool_Error.h>
 #include <XEngine_Include/XEngine_Core/Cryption_Define.h>
 #include <XEngine_Include/XEngine_Core/Cryption_Error.h>
+#include <XEngine_Include/XEngine_Client/XClient_Define.h>
+#include <XEngine_Include/XEngine_Client/XClient_Error.h>
 #include <XEngine_Include/XEngine_Client/APIClient_Define.h>
 #include <XEngine_Include/XEngine_Client/APIClient_Error.h>
 #include <XEngine_Include/XEngine_Client/StreamClient_Define.h>
@@ -157,6 +159,7 @@ extern XENGINE_DEAMONAPPLIST st_DeamonAppConfig;
 #pragma comment(lib,"XEngine_Core/XEngine_Core.lib")
 #pragma comment(lib,"XEngine_Core/XEngine_ManagePool.lib")
 #pragma comment(lib,"XEngine_Core/XEngine_Cryption.lib")
+#pragma comment(lib,"XEngine_Client/XClient_Socket.lib")
 #pragma comment(lib,"XEngine_Client/XClient_Stream.lib")
 #pragma comment(lib,"XEngine_Client/XClient_APIHelp.lib")
 #pragma comment(lib,"XEngine_NetHelp/NetHelp_APIAddr")

XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_TaskRfc/RFCTask_Dns.cpp

@@ -2,6 +2,7 @@
 
 bool RFCTask_DNS_Parse(LPCXSTR lpszClientAddr, LPCXSTR lpszMSGBuffer, int nMSGLen)
 {
+	bool bQuery = false;
 	int nSDLen = 0;
 	int nRequestID = 0;
 	XCHAR tszSDBuffer[4096] = {};
@@ -10,6 +11,7 @@ bool RFCTask_DNS_Parse(LPCXSTR lpszClientAddr, LPCXSTR lpszMSGBuffer, int nMSGLe
 	if (!DNSProtocol_Parse_Header(lpszMSGBuffer, nMSGLen, &nRequestID, &st_DNSRequest))
 	{
 		DNSProtocol_Packet_Error(tszSDBuffer, &nSDLen, nRequestID, &st_DNSRequest, XENGINE_DNSPROTOCOL_QUERY_QUESTION_STATUS_FORMAT);
+		NetCore_UDPXCore_SendEx(xhDNSSocket, lpszClientAddr, tszSDBuffer, nSDLen);
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("DNS客户端:%s,发送的DNS协议不正确"), lpszClientAddr);
 		return false;
 	}
@@ -33,6 +35,7 @@ bool RFCTask_DNS_Parse(LPCXSTR lpszClientAddr, LPCXSTR lpszMSGBuffer, int nMSGLe
 			}
 			DNSProtocol_Packet_REPHeader(tszSDBuffer, &nSDLen, nRequestID, &st_DNSRequest, &ppSt_DNSAnswer, nListCount);
 			BaseLib_Memory_Free((XPPPMEM)&ppSt_DNSAnswer, nListCount);
+			bQuery = true;
 		}
 	}
 	else if (XENGINE_DNSPROTOCOL_QUERY_QUESTION_TYPE_PTR == st_DNSRequest.st_QueryInfo.nNameType)
@@ -41,25 +44,50 @@ bool RFCTask_DNS_Parse(LPCXSTR lpszClientAddr, LPCXSTR lpszMSGBuffer, int nMSGLe
 		int nListCount = 1;
 		XCHAR tszIPStr[256] = {};
 		XENGINE_DNSADDRINFO st_DNSAddr = {};
-		XENGINE_DNSPROTOCOL** ppSt_DNSAnswer;
-
+		
 		DNSProtocol_Help_PTRStr(st_DNSRequest.tszNameStr, tszIPStr, &nIPVer);
-		BaseLib_Memory_Malloc((XPPPMEM)&ppSt_DNSAnswer, nListCount, sizeof(XENGINE_DNSPROTOCOL));
-
 		if (ModuleHelp_DNSAddr_FindPtr(tszIPStr, &st_DNSAddr))
 		{
+			XENGINE_DNSPROTOCOL** ppSt_DNSAnswer;
+			BaseLib_Memory_Malloc((XPPPMEM)&ppSt_DNSAnswer, nListCount, sizeof(XENGINE_DNSPROTOCOL));
+
 			ppSt_DNSAnswer[0]->nTTL = st_DNSAddr.nTTL;
 			ppSt_DNSAnswer[0]->st_QueryInfo.nNameType = XENGINE_DNSPROTOCOL_QUERY_QUESTION_TYPE_PTR;
 			ppSt_DNSAnswer[0]->st_QueryInfo.nNameClass = XENGINE_DNSPROTOCOL_QUERY_QUESTION_CLASS_IN;
 			_tcsxcpy(ppSt_DNSAnswer[0]->tszNameStr, st_DNSAddr.tszDNSAddr);
 			_tcsxcpy(ppSt_DNSAnswer[0]->tszAddrStr, st_DNSAddr.tszDNSName);
+
+			DNSProtocol_Packet_REPHeader(tszSDBuffer, &nSDLen, nRequestID, &st_DNSRequest, &ppSt_DNSAnswer, nListCount);
+			BaseLib_Memory_Free((XPPPMEM)&ppSt_DNSAnswer, nListCount);
+			bQuery = true;
 		}
-		DNSProtocol_Packet_REPHeader(tszSDBuffer, &nSDLen, nRequestID, &st_DNSRequest, &ppSt_DNSAnswer, nListCount);
-		BaseLib_Memory_Free((XPPPMEM)&ppSt_DNSAnswer, nListCount);
+	}
+
+	if (!bQuery)
+	{
+		//选择一个备用DNS服务器
+		XCHAR tszIPServer[128] = {};
+		ModuleHelp_DNSAddr_Select(tszIPServer);
+		//创建UDP查询连接
+		XSOCKET hSocket = XSOCKET_ERROR;
+		XClient_UDPSelect_Create(&hSocket);
+		XClient_UDPSelect_Bind(hSocket, 12331);
+		XClient_UDPSelect_Connect(hSocket, tszIPServer, 53);
+		XClient_UDPSelect_SendMsg(hSocket, lpszMSGBuffer, nMSGLen);
+
+		if (!BaseLib_IO_Select(hSocket, true, 2000))
+		{
+			DNSProtocol_Packet_Error(tszSDBuffer, &nSDLen, nRequestID, &st_DNSRequest, XENGINE_DNSPROTOCOL_QUERY_QUESTION_STATUS_SERVFAIL);
+			NetCore_UDPXCore_SendEx(xhDNSSocket, lpszClientAddr, tszSDBuffer, nSDLen);
+			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("DNS客户端:%s,请求备用服务器数据失败,数据超时"), lpszClientAddr);
+			return false;
+		}
+		nSDLen = 4096;
+		XClient_UDPSelect_RecvMsg(hSocket, tszSDBuffer, &nSDLen);
+		XClient_UDPSelect_Close(hSocket);
 	}
 
 	NetCore_UDPXCore_SendEx(xhDNSSocket, lpszClientAddr, tszSDBuffer, nSDLen);
 	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("DNS客户端:%s,发送DNS协议给服务器,处理成功"), lpszClientAddr);
-
 	return true;
 }