fixed:stun bind reply addr is incorrect

fixed:sometimes av packet buffer is leak

Author: xengine-qyt

XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/StreamMedia_PullStream/PullStream_ClientWebRtc.cpp

@@ -68,7 +68,13 @@ bool PullStream_ClientProtocol_Handle(LPCXSTR lpszClientAddr, XSOCKET hSocket, L
 		ModuleSession_PullStream_RTCGet(tszUserStr, NULL, NULL, tszICEPass);
 
 		NatProtocol_StunNat_BuildAttr(tszRVBuffer, &nRVLen, RFCCOMPONENTS_NATCLIENT_PROTOCOL_STUN_ATTR_USERNAME, tszUserStr, _tcsxlen(tszUserStr));
-		NatProtocol_StunNat_BuildMapAddress(tszRVBuffer + nRVLen, &nRVLen, st_ServiceConfig.tszIPAddr, st_ServiceConfig.nRTCPort, true);
+
+		int nPort = 0;
+		XCHAR tszIPPort[128] = {};
+		_tcsxcpy(tszIPPort, lpszClientAddr);
+		BaseLib_OperatorIPAddr_SegAddr(tszIPPort, &nPort);
+
+		NatProtocol_StunNat_BuildMapAddress(tszRVBuffer + nRVLen, &nRVLen, tszIPPort, nPort, true);
 		NatProtocol_StunNat_BuildMSGIntegrity(tszRVBuffer + nRVLen, &nRVLen, tszRVBuffer, nRVLen, tszICEPass);
 
 		nRVLen += 8;  //Finger 消息先加

XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/XEngine_AVPacket.cpp

@@ -179,8 +179,8 @@ bool XEngine_AVPacket_AVHdr(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int n
 			int nPos = 0;
 			int nSPSLen = 0;
 			int nPPSLen = 0;
-			XBYTE uszSPSBuffer[512];
-			XBYTE uszPPSBuffer[512];
+			XBYTE uszSPSBuffer[1024];
+			XBYTE uszPPSBuffer[1024];
 
 			memset(uszSPSBuffer, '\0', sizeof(uszSPSBuffer));
 			memset(uszPPSBuffer, '\0', sizeof(uszPPSBuffer));
@@ -238,8 +238,8 @@ bool XEngine_AVPacket_AVHdr(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int n
 			int nPos = 0;
 			int nSPSLen = 0;
 			int nPPSLen = 0;
-			XBYTE uszSPSBuffer[512];
-			XBYTE uszPPSBuffer[512];
+			XBYTE uszSPSBuffer[1024];
+			XBYTE uszPPSBuffer[1024];
 
 			memset(uszSPSBuffer, '\0', sizeof(uszSPSBuffer));
 			memset(uszPPSBuffer, '\0', sizeof(uszPPSBuffer));
@@ -292,11 +292,6 @@ bool XEngine_AVPacket_AVFrame(XCHAR* ptszSDBuffer, int* pInt_SDLen, XCHAR* ptszR
 	if (1 == byAVType && nMsgLen > 1024)
 	{
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _X("检测到推流:%s 过大的音频包:%d"), lpszClientAddr, nMsgLen);
-		for (int i = 0; i < nMsgLen; i++)
-		{
-			printf("%02X ", (XBYTE)lpszMsgBuffer[i]);
-		}
-		printf("\n");
 	}
 	XBYTE byFrameType = 0;
 	if (0 == byAVType)
@@ -408,14 +403,13 @@ bool XEngine_AVPacket_AVFrame(XCHAR* ptszSDBuffer, int* pInt_SDLen, XCHAR* ptszR
 		}
 		else
 		{
-			XCHAR byAACBuffer[2048] = {};
 			XENGINE_PROTOCOL_AVINFO st_AVInfo = {};
 
 			ModuleSession_PushStream_GetAVInfo(lpszClientAddr, &st_AVInfo);
-			AVHelp_Packet_AACHdr((XBYTE*)byAACBuffer, st_AVInfo.st_AudioInfo.nSampleRate, st_AVInfo.st_AudioInfo.nChannel, nMsgLen);
-			memcpy(byAACBuffer + 7, lpszMsgBuffer, nMsgLen);
+			AVHelp_Packet_AACHdr((XBYTE*)ptszRVBuffer, st_AVInfo.st_AudioInfo.nSampleRate, st_AVInfo.st_AudioInfo.nChannel, nMsgLen);
+			memcpy(ptszRVBuffer + 7, lpszMsgBuffer, nMsgLen);
 			nMsgLen += 7;
-			HLSProtocol_TSPacket_AVPacket(lpszClientAddr, (XBYTE*)ptszSDBuffer, pInt_SDLen, 0x101, byAACBuffer, nMsgLen);
+			HLSProtocol_TSPacket_AVPacket(lpszClientAddr, (XBYTE*)ptszSDBuffer, pInt_SDLen, 0x101, ptszRVBuffer, nMsgLen);
 		}
 
 		int nPATLen = 0;