Skip to content

Commit 5ba07ef

Browse files
committed
improved:webrtc stun code
1 parent 407ff8b commit 5ba07ef

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/StreamMedia_PullStream/PullStream_ClientWebRtc.cpp

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,7 @@ bool PullStream_ClientProtocol_Handle(LPCXSTR lpszClientAddr, XSOCKET hSocket, L
7474
NatProtocol_StunNat_BuildAttr(tszRVBuffer, &nRVLen, RFCCOMPONENTS_NATCLIENT_PROTOCOL_STUN_ATTR_USERNAME, tszUserStr, _tcsxlen(tszUserStr));
7575
NatProtocol_StunNat_BuildMapAddress(tszRVBuffer + nRVLen, &nRVLen, tszIPPort, nPort, true);
7676
nSDLen = nRVLen;
77-
NatProtocol_StunNat_Packet(tszSDBuffer, &nSDLen, (LPCXSTR)st_NatClient.byTokenStr, RFCCOMPONENTS_NATCLIENT_PROTOCOL_STUN_CLASS_RESPONSE, RFCCOMPONENTS_NATCLIENT_PROTOCOL_STUN_ATTR_MAPPED_ADDRESS, tszRVBuffer);
78-
//消息效验需要加上24个属性头大小
79-
NatProtocol_StunNat_Resize(tszSDBuffer, 24);
80-
NatProtocol_StunNat_BuildMSGIntegrity(tszSDBuffer + nSDLen, &nSDLen, tszSDBuffer, nSDLen, st_ServiceConfig.st_XPull.st_PullWebRtc.tszICEPass);
81-
82-
nSDLen += 8; //加上Finger的大小
83-
NatProtocol_StunNat_Resize(tszSDBuffer, nSDLen - 20, 2); //减去头大小20是固定头大小
84-
nSDLen -= 8; //计算效验不包含自己的8个字节属性
85-
86-
NatProtocol_StunNat_BuildFinger(tszSDBuffer + nSDLen, &nSDLen, tszSDBuffer, nSDLen);
77+
NatProtocol_StunNat_Packet(tszSDBuffer, &nSDLen, (LPCXSTR)st_NatClient.byTokenStr, RFCCOMPONENTS_NATCLIENT_PROTOCOL_STUN_CLASS_RESPONSE, RFCCOMPONENTS_NATCLIENT_PROTOCOL_STUN_ATTR_MAPPED_ADDRESS, tszRVBuffer, true, st_ServiceConfig.st_XPull.st_PullWebRtc.tszICEPass, true);
8778
XEngine_Network_Send(lpszClientAddr, tszSDBuffer, nSDLen, ENUM_XENGINE_STREAMMEDIA_CLIENT_TYPE_PUSH_RTC);
8879
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("STUN客户端:%s,请求的STUN协议处理成功,请求的用户:%s"), lpszClientAddr, tszUserStr);
8980
}

0 commit comments

Comments
 (0)