mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle RDP_NETCHAR_SYNC_RESPONSE_TYPE

Browse Source
This commit is contained in:
Armin Novak 2022-10-05 14:25:35 +02:00 committed by akallabeth
parent 016d2fe689
commit 85ce3388d7
1 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
libfreerdp/core/autodetect.c
View File

@ -575,7 +575,42 @@ static BOOL autodetect_recv_bandwidth_measure_results(rdpAutoDetect* autodetect,
} }
static BOOL autodetect_recv_netchar_result(rdpAutoDetect* autodetect, wStream* s, static BOOL autodetect_recv_netchar_result(rdpAutoDetect* autodetect, wStream* s,
const AUTODETECT_REQ_PDU* autodetectReqPdu) const AUTODETECT_RSP_PDU* autodetectRspPdu)
{
BOOL success = TRUE;
WINPR_ASSERT(autodetect);
WINPR_ASSERT(s);
WINPR_ASSERT(autodetectRspPdu);
switch (autodetectRspPdu->responseType)
{
case RDP_NETCHAR_SYNC_RESPONSE_TYPE:
/* bandwidth and averageRTT fields are present (baseRTT field is not) */
if ((autodetectRspPdu->headerLength != 0x0E) ||
(!Stream_CheckAndLogRequiredLength(AUTODETECT_TAG, s, 8)))
return FALSE;
Stream_Read_UINT32(s, autodetect->netCharBandwidth); /* bandwidth (4 bytes) */
Stream_Read_UINT32(s, autodetect->netCharAverageRTT); /* averageRTT (4 bytes) */
break;
default:
break;
}
WLog_VRB(AUTODETECT_TAG,
"received Network Characteristics Result PDU -> baseRTT=%" PRIu32
", bandwidth=%" PRIu32 ", averageRTT=%" PRIu32 "",
autodetect->netCharBaseRTT, autodetect->netCharBandwidth,
autodetect->netCharAverageRTT);
IFCALLRET(autodetect->NetworkCharacteristicsResult, success, autodetect,
autodetectRspPdu->sequenceNumber);
return success;
}
static BOOL autodetect_recv_netchar_request(rdpAutoDetect* autodetect, wStream* s,
const AUTODETECT_REQ_PDU* autodetectReqPdu)
{ {
BOOL success = TRUE; BOOL success = TRUE;
@ -618,6 +653,9 @@ static BOOL autodetect_recv_netchar_result(rdpAutoDetect* autodetect, wStream* s
Stream_Read_UINT32(s, autodetect->netCharBandwidth); /* bandwidth (4 bytes) */ Stream_Read_UINT32(s, autodetect->netCharBandwidth); /* bandwidth (4 bytes) */
Stream_Read_UINT32(s, autodetect->netCharAverageRTT); /* averageRTT (4 bytes) */ Stream_Read_UINT32(s, autodetect->netCharAverageRTT); /* averageRTT (4 bytes) */
break; break;
default:
break;
} }
WLog_VRB(AUTODETECT_TAG, WLog_VRB(AUTODETECT_TAG,
@ -707,7 +745,7 @@ int autodetect_recv_request_packet(rdpAutoDetect* autodetect, wStream* s)
case RDP_NETCHAR_RESULTS_0x0880: case RDP_NETCHAR_RESULTS_0x0880:
case RDP_NETCHAR_RESULTS_0x08C0: case RDP_NETCHAR_RESULTS_0x08C0:
/* Network Characteristics Result (RDP_NETCHAR_RESULT) - MS-RDPBCGR 2.2.14.1.5 */ /* Network Characteristics Result (RDP_NETCHAR_RESULT) - MS-RDPBCGR 2.2.14.1.5 */
success = autodetect_recv_netchar_result(autodetect, s, &autodetectReqPdu); success = autodetect_recv_netchar_request(autodetect, s, &autodetectReqPdu);
break; break;
default: default:
@ -781,6 +819,10 @@ int autodetect_recv_response_packet(rdpAutoDetect* autodetect, wStream* s)
success = autodetect_recv_bandwidth_measure_results(autodetect, s, &autodetectRspPdu); success = autodetect_recv_bandwidth_measure_results(autodetect, s, &autodetectRspPdu);
break; break;
case RDP_NETCHAR_SYNC_RESPONSE_TYPE:
success = autodetect_recv_netchar_result(autodetect, s, &autodetectRspPdu);
break;
default: default:
break; break;
} }