morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-14 00:14:11 +09:00
Code Issues Packages Projects Releases Wiki Activity

[core,nego] disable all enabled modes except the one requested

Browse Source 
If a TYPE_RDP_NEG_FAILURE message is received, evaluate the failure code
and disable all modes except the one requested. This eliminates
unnecessary connection attempts with security modes not enabled.
This commit is contained in:
Armin Novak
2025-12-03 10:13:25 +01:00
parent 767a020acb
commit cd8d2e98b1
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libfreerdp/core/nego.c
View File

@@ -1400,6 +1400,22 @@ static const char* nego_rdp_neg_fail_str(uint32_t what)
}
}
static void nego_disable_all_except(rdpNego* nego, uint32_t what)
{
WINPR_ASSERT(nego);
char buffer[32] = { 0 };
WLog_Print(nego->log, WLOG_DEBUG, "Disabling all modes except %s",
nego_protocol_to_str(what, buffer, sizeof(buffer)));
for (size_t x = 0; x < ARRAYSIZE(nego->EnabledProtocols); x++)
{
if (x == what)
continue;
nego->EnabledProtocols[x] = FALSE;
}
}
/**
* Process Negotiation Failure from Connection Confirm message.
* @param nego A pointer to the NEGO struct
@@ -1438,9 +1454,11 @@ BOOL nego_process_negotiation_failure(rdpNego* nego, wStream* s)
switch (failureCode)
{
case SSL_REQUIRED_BY_SERVER:
nego_disable_all_except(nego, PROTOCOL_SSL);
break;
case SSL_NOT_ALLOWED_BY_SERVER:
nego_disable_all_except(nego, PROTOCOL_RDP);
nego->sendNegoData = TRUE;
break;
@@ -1454,6 +1472,7 @@ BOOL nego_process_negotiation_failure(rdpNego* nego, wStream* s)
break;
case HYBRID_REQUIRED_BY_SERVER:
nego_disable_all_except(nego, PROTOCOL_HYBRID);
break;
default: