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

client/common: Several fixes for the rdp file parser

Browse Source 
This PR fixes various issues in the rdp file parser:
- NetworkAutoDetect was written inverted
- GatewayHostname was missing the port info (if not default)
- Several settings were left out when populating the file struct
This commit is contained in:
Martin Fleisz
2020-11-12 16:18:17 +01:00
committed by akallabeth
parent 69c8926de9
commit 60317154a3
1 changed files with 39 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
client/common/file.c
View File

@@ -869,7 +869,10 @@ BOOL freerdp_client_populate_rdp_file_from_settings(rdpFile* file, const rdpSett
file->NegotiateSecurityLayer = settings->NegotiateSecurityLayer;
file->EnableCredSSPSupport = settings->NlaSecurity;
FILE_POPULATE_STRING(file->AlternateShell, settings->AlternateShell);
FILE_POPULATE_STRING(file->ShellWorkingDirectory, settings->ShellWorkingDirectory);
if (settings->RemoteApplicationMode)
FILE_POPULATE_STRING(file->ShellWorkingDirectory, settings->RemoteApplicationWorkingDir);
else
FILE_POPULATE_STRING(file->ShellWorkingDirectory, settings->ShellWorkingDirectory);
file->ConnectionType = settings->ConnectionType;
FILE_POPULATE_STRING(file->DrivesToRedirect, settings->DrivesToRedirect);
file->ScreenModeId = settings->Fullscreen ? 2 : 1;
@@ -889,9 +892,35 @@ BOOL freerdp_client_populate_rdp_file_from_settings(rdpFile* file, const rdpSett
else
file->AudioMode = AUDIO_MODE_NONE;
/* The gateway hostname should also contain a port specifier unless it is the default port 443
*/
if (settings->GatewayHostname)
{
freerdp_client_file_string_check_free(file->GatewayHostname);
if (settings->GatewayPort == 443)
file->GatewayHostname = _strdup(settings->GatewayHostname);
else
{
int length = _scprintf("%s:%" PRIu16, settings->GatewayHostname, settings->GatewayPort);
if (length < 0)
return FALSE;
file->GatewayHostname = (char*)malloc((size_t)length + 1);
if (!file->GatewayHostname)
return FALSE;
if (sprintf_s(file->GatewayHostname, (size_t)length + 1, "%s:%" PRIu16,
settings->GatewayHostname, settings->GatewayPort) < 0)
return FALSE;
}
if (!file->GatewayHostname)
return FALSE;
}
file->AudioCaptureMode = settings->AudioCapture;
file->BitmapCachePersistEnable = settings->BitmapCachePersistEnabled;
file->Compression = settings->CompressionEnabled;
FILE_POPULATE_STRING(file->GatewayHostname, settings->GatewayHostname);
file->AuthenticationLevel = settings->AuthenticationLevel;
FILE_POPULATE_STRING(file->GatewayAccessToken, settings->GatewayAccessToken);
file->GatewayUsageMethod = settings->GatewayUsageMethod;
file->PromptCredentialOnce = settings->GatewayUseSameCredentials;
@@ -905,13 +934,14 @@ BOOL freerdp_client_populate_rdp_file_from_settings(rdpFile* file, const rdpSett
FILE_POPULATE_STRING(file->RemoteApplicationCmdLine, settings->RemoteApplicationCmdLine);
file->SpanMonitors = settings->SpanMonitors;
file->UseMultiMon = settings->UseMultimon;
file->AllowDesktopComposition = settings->AllowDesktopComposition;
file->AllowFontSmoothing = settings->AllowFontSmoothing;
file->DisableWallpaper = settings->DisableWallpaper;
file->DisableFullWindowDrag = settings->DisableFullWindowDrag;
file->DisableMenuAnims = settings->DisableMenuAnims;
file->DisableThemes = settings->DisableThemes;
file->BandwidthAutoDetect = (settings->ConnectionType >= 7) ? TRUE : FALSE;
file->NetworkAutoDetect = settings->NetworkAutoDetect;
file->NetworkAutoDetect = settings->NetworkAutoDetect ? 0 : 1;
file->AutoReconnectionEnabled = settings->AutoReconnectionEnabled;
file->RedirectSmartCards = settings->RedirectSmartCards;
file->RedirectClipboard = settings->RedirectClipboard;
@@ -1324,8 +1354,12 @@ BOOL freerdp_client_populate_settings_from_rdp_file(rdpFile* file, rdpSettings*
if (~((size_t)file->ShellWorkingDirectory))
{
if (!freerdp_settings_set_string(settings, FreeRDP_ShellWorkingDirectory,
file->ShellWorkingDirectory))
/* ShellWorkingDir is used for either, shell working dir or remote app working dir */
size_t targetId = (~file->RemoteApplicationMode && file->RemoteApplicationMode != 0)
? FreeRDP_RemoteApplicationWorkingDir
: FreeRDP_ShellWorkingDirectory;
if (!freerdp_settings_set_string(settings, targetId, file->ShellWorkingDirectory))
return FALSE;
}