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

Added alternate full address to rdp file parser.

Browse Source
This commit is contained in:
Armin Novak 2019-07-18 09:29:06 +02:00
parent 13fb3ffc39
commit 2394c987ee
2 changed files with 74 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
client/common/file.c
View File

@ -61,7 +61,7 @@ static BYTE BOM_UTF16_LE[2] = { 0xFF, 0xFE };
struct rdp_file_line
{
int index;
size_t index;
char* text;
DWORD flags;
char* name;
@ -182,13 +182,13 @@ struct rdp_file
LPSTR PreconnectionBlob; /* pcb */
int lineCount;
int lineSize;
size_t lineCount;
size_t lineSize;
rdpFileLine* lines;
int argc;
char** argv;
int argSize;
size_t argSize;
void* context;
};
@ -474,11 +474,11 @@ static int freerdp_client_rdp_file_set_string(rdpFile* file, const char* name, c
return standard;
}
static BOOL freerdp_client_add_option(rdpFile* file, char* option)
static BOOL freerdp_client_add_option(rdpFile* file, const char* option)
{
while ((file->argc + 1) > file->argSize)
{
int new_size;
size_t new_size;
char** new_argv;
new_size = file->argSize * 2;
new_argv = (char**) realloc(file->argv, new_size * sizeof(char*));
@ -499,14 +499,14 @@ static BOOL freerdp_client_add_option(rdpFile* file, char* option)
return TRUE;
}
static int freerdp_client_parse_rdp_file_add_line(rdpFile* file, char* line, int index)
static SSIZE_T freerdp_client_parse_rdp_file_add_line(rdpFile* file, const char* line, SSIZE_T index)
{
if (index < 0)
index = file->lineCount;
index = (SSIZE_T)file->lineCount;
while ((file->lineCount + 1) > file->lineSize)
{
int new_size;
size_t new_size;
rdpFileLine* new_line;
new_size = file->lineSize * 2;
new_line = (rdpFileLine*) realloc(file->lines, new_size * sizeof(rdpFileLine));
@ -524,7 +524,7 @@ static int freerdp_client_parse_rdp_file_add_line(rdpFile* file, char* line, int
if (!file->lines[file->lineCount].text)
return -1;
file->lines[file->lineCount].index = index;
file->lines[file->lineCount].index = (size_t)index;
(file->lineCount)++;
return index;
}
@ -548,7 +548,7 @@ static BOOL freerdp_client_parse_rdp_file_string(rdpFile* file, char* name, char
return ret;
}
static BOOL freerdp_client_parse_rdp_file_option(rdpFile* file, char* option, int index)
static BOOL freerdp_client_parse_rdp_file_option(rdpFile* file, const char* option, SSIZE_T index)
{
return freerdp_client_add_option(file, option);
}
@ -749,6 +749,7 @@ BOOL freerdp_client_populate_rdp_file_from_settings(rdpFile* file, const rdpSett
SETTING_MODIFIED_SET_STRING(file->Password, settings, Password);
SETTING_MODIFIED_SET(file->ServerPort, settings, ServerPort);
SETTING_MODIFIED_SET_STRING(file->FullAddress, settings, ServerHostname);
SETTING_MODIFIED_SET_STRING(file->AlternateFullAddress, settings, ServerHostname);
SETTING_MODIFIED_SET(file->DesktopWidth, settings, DesktopWidth);
SETTING_MODIFIED_SET(file->DesktopHeight, settings, DesktopHeight);
SETTING_MODIFIED_SET(file->SessionBpp, settings, ColorDepth);
@ -857,8 +858,8 @@ BOOL freerdp_client_write_rdp_file(const rdpFile* file, const char* name, BOOL u
size_t freerdp_client_write_rdp_file_buffer(const rdpFile* file, char* buffer, size_t size)
{
int index;
int length;
size_t index;
size_t length;
char* output;
rdpFileLine* line;
@ -870,7 +871,7 @@ size_t freerdp_client_write_rdp_file_buffer(const rdpFile* file, char* buffer, s
for (index = 0; index < file->lineCount; index++)
{
line = &(file->lines[index]);
length = (int) strlen(line->text);
length = strlen(line->text);
if (!buffer)
{
@ -926,12 +927,22 @@ BOOL freerdp_client_populate_settings_from_rdp_file(rdpFile* file, rdpSettings*
return FALSE;
}
if (~((size_t) file->FullAddress))
{
const char* address = NULL;
/* With MSTSC alternate full address always wins,
* so mimic this. */
if (~((size_t) file->AlternateFullAddress))
address = file->AlternateFullAddress;
else if (~((size_t) file->FullAddress))
address = file->FullAddress;
if (address)
{
int port = -1;
char* host = NULL;
if (!freerdp_parse_hostname(file->FullAddress, &host, &port))
if (!freerdp_parse_hostname(address, &host, &port))
return FALSE;
if (!freerdp_settings_set_string(settings, FreeRDP_ServerHostname, host))
@ -945,6 +956,7 @@ BOOL freerdp_client_populate_settings_from_rdp_file(rdpFile* file, rdpSettings*
return FALSE;
}
}
}
if (~file->ServerPort)
{
@ -1391,7 +1403,7 @@ static rdpFileLine* freerdp_client_rdp_file_find_line_index(rdpFile* file, int i
}
static rdpFileLine* freerdp_client_rdp_file_find_line_by_name(rdpFile* file, const char* name)
{
int index;
size_t index;
BOOL bFound = FALSE;
rdpFileLine* line = NULL;
@ -1585,7 +1597,7 @@ rdpFile* freerdp_client_rdp_file_new()
}
void freerdp_client_rdp_file_free(rdpFile* file)
{
int i;
size_t i;
if (file)
{

36
client/common/test/TestClientRdpFile.c
View File

@ -234,6 +234,7 @@ static char testRdpFileUTF8[] =
"disable cursor setting:i:0\n"
"bitmapcachepersistenable:i:1\n"
"full address:s:LAB1-W7-DM-01.lab1.awake.local\n"
"alternate full address:s:LAB1-W7-DM-01.lab1.awake.global\n"
"audiomode:i:0\n"
"redirectprinters:i:1\n"
"redirectcomports:i:0\n"
@ -265,6 +266,8 @@ int TestClientRdpFile(int argc, char* argv[])
int rc = -1;
int iValue;
const char* sValue;
char* utfname = NULL;
char* uniname = NULL;
rdpFile* file;
rdpSettings* settings;
@ -314,6 +317,13 @@ int TestClientRdpFile(int argc, char* argv[])
goto fail;
}
if (strcmp(settings->ServerHostname, "LAB1-W7-DM-01.lab1.awake.local") != 0)
{
printf("ServerHostname mismatch: Actual: %s, Expected: %s\n",
settings->ServerHostname, "LAB1-W7-DM-01.lab1.awake.local");
goto fail;
}
freerdp_client_rdp_file_free(file);
freerdp_settings_free(settings);
/* Ascii */
@ -352,6 +362,13 @@ int TestClientRdpFile(int argc, char* argv[])
}
#endif
if (strcmp(settings->ServerHostname, "LAB1-W7-DM-01.lab1.awake.global") != 0)
{
printf("ServerHostname mismatch: Actual: %s, Expected: %s\n",
settings->ServerHostname, "LAB1-W7-DM-01.lab1.awake.global");
goto fail;
}
if (strcmp(settings->GatewayHostname, "LAB1-W2K8R2-GW.lab1.awake.local") != 0)
{
printf("GatewayHostname mismatch: Actual: %s, Expected: %s\n",
@ -391,15 +408,30 @@ int TestClientRdpFile(int argc, char* argv[])
}
freerdp_client_rdp_file_free(file);
utfname = _strdup(tmpnam(NULL));
uniname = _strdup(tmpnam(NULL));
file = freerdp_client_rdp_file_new();
if (!file)
if (!file || !utfname || !uniname)
goto fail;
if (!freerdp_client_populate_rdp_file_from_settings(file, settings))
goto fail;
if (!freerdp_client_write_rdp_file(file, utfname, FALSE))
goto fail;
if (!freerdp_client_write_rdp_file(file, uniname, TRUE))
goto fail;
rc = 0;
fail:
fail:
if (utfname)
DeleteFileA(utfname);
if (uniname)
DeleteFileA(uniname);
free(utfname);
free(uniname);
freerdp_client_rdp_file_free(file);
freerdp_settings_free(settings);
return rc;