fixed:dtls judgment fails sometimes

xengine-qyt · xengine-qyt · commit 3c1e4ea98b03 · 2024-05-27T17:54:04.000+08:00
diff --git a/XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/StreamMedia_PullStream/PullStream_ClientWebRtc.cpp b/XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/StreamMedia_PullStream/PullStream_ClientWebRtc.cpp
@@ -13,7 +13,7 @@
 bool PullStream_ClientProtocol_Dtls(LPCXSTR lpszMSGBuffer, int nMSGLen)
 {
 	// DTLS有可能以多种不同的记录层类型开头，这里检查它是否是handshake(0x16)
-	return nMSGLen >= 13 && lpszMSGBuffer[0] == 0x16;
+	return ((nMSGLen >= 13) && (lpszMSGBuffer[0] == 0x16));
 }
 bool PullStream_ClientProtocol_Stun(LPCXSTR lpszMSGBuffer, int nMSGLen)
 {
@@ -74,10 +74,9 @@ bool PullStream_ClientProtocol_Handle(LPCXSTR lpszClientAddr, XSOCKET hSocket, L
 		NatProtocol_StunNat_BuildMapAddress(tszRVBuffer + nRVLen, &nRVLen, tszIPPort, nPort, true);
 		nSDLen = nRVLen;
 		NatProtocol_StunNat_Packet(tszSDBuffer, &nSDLen, (LPCXSTR)st_NatClient.byTokenStr, RFCCOMPONENTS_NATCLIENT_PROTOCOL_STUN_CLASS_RESPONSE, RFCCOMPONENTS_NATCLIENT_PROTOCOL_STUN_ATTR_MAPPED_ADDRESS, tszRVBuffer);
-		//消息效验需要加上4个属性头大小
+		//消息效验需要加上24个属性头大小
 		NatProtocol_StunNat_Resize(tszSDBuffer, 24);
 		NatProtocol_StunNat_BuildMSGIntegrity(tszSDBuffer + nSDLen, &nSDLen, tszSDBuffer, nSDLen, st_ServiceConfig.st_XPull.st_PullWebRtc.tszICEPass);
-		//NatProtocol_StunNat_Resize(tszSDBuffer, 20);   //消息大小
 
 		nSDLen += 8;  //加上Finger的大小
 		NatProtocol_StunNat_Resize(tszSDBuffer, nSDLen - 20, 2);  //减去头大小20是固定头大小

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`bool PullStream_ClientProtocol_Dtls(LPCXSTR lpszMSGBuffer, int nMSGLen)`
`14`	`14`	`{`
`15`	`15`	`// DTLS有可能以多种不同的记录层类型开头，这里检查它是否是handshake(0x16)`
`16`		`- return nMSGLen >= 13 && lpszMSGBuffer[0] == 0x16;`
	`16`	`+ return ((nMSGLen >= 13) && (lpszMSGBuffer[0] == 0x16));`
`17`	`17`	`}`
`18`	`18`	`bool PullStream_ClientProtocol_Stun(LPCXSTR lpszMSGBuffer, int nMSGLen)`
`19`	`19`	`{`
`@@ -74,10 +74,9 @@ bool PullStream_ClientProtocol_Handle(LPCXSTR lpszClientAddr, XSOCKET hSocket, L`
`74`	`74`	`NatProtocol_StunNat_BuildMapAddress(tszRVBuffer + nRVLen, &nRVLen, tszIPPort, nPort, true);`
`75`	`75`	`nSDLen = nRVLen;`
`76`	`76`	`NatProtocol_StunNat_Packet(tszSDBuffer, &nSDLen, (LPCXSTR)st_NatClient.byTokenStr, RFCCOMPONENTS_NATCLIENT_PROTOCOL_STUN_CLASS_RESPONSE, RFCCOMPONENTS_NATCLIENT_PROTOCOL_STUN_ATTR_MAPPED_ADDRESS, tszRVBuffer);`
`77`		`- //消息效验需要加上4个属性头大小`
	`77`	`+ //消息效验需要加上24个属性头大小`
`78`	`78`	`NatProtocol_StunNat_Resize(tszSDBuffer, 24);`
`79`	`79`	`NatProtocol_StunNat_BuildMSGIntegrity(tszSDBuffer + nSDLen, &nSDLen, tszSDBuffer, nSDLen, st_ServiceConfig.st_XPull.st_PullWebRtc.tszICEPass);`
`80`		`- //NatProtocol_StunNat_Resize(tszSDBuffer, 20); //消息大小`
`81`	`80`
`82`	`81`	`nSDLen += 8; //加上Finger的大小`
`83`	`82`	`NatProtocol_StunNat_Resize(tszSDBuffer, nSDLen - 20, 2); //减去头大小20是固定头大小`