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

Regenerated settings helpers

Browse Source
This commit is contained in:
akallabeth 2022-06-23 08:28:18 +02:00 committed by akallabeth
parent 648612d6d3
commit 31304951de
4 changed files with 44 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/freerdp/settings.h
View File

@ -635,8 +635,8 @@ typedef struct
#define FreeRDP_NtlmSamFile (1103)
#define FreeRDP_FIPSMode (1104)
#define FreeRDP_TlsSecLevel (1105)
#define FreeRDP_EnforceTLSv1_2 (1107)
#define FreeRDP_SspiModule (1106)
#define FreeRDP_EnforceTLSv1_2 (1107)
#define FreeRDP_MstscCookieMode (1152)
#define FreeRDP_CookieMaxLength (1153)
#define FreeRDP_PreconnectionId (1154)
@ -1124,7 +1124,7 @@ struct rdp_settings
ALIGN64 BOOL FIPSMode; /* 1104 */
ALIGN64 UINT32 TlsSecLevel; /* 1105 */
ALIGN64 char* SspiModule; /* 1106 */
ALIGN64 BOOL EnforceTLSv1_2; /* 1107 */
ALIGN64 BOOL EnforceTLSv1_2; /* 1107 */
UINT64 padding1152[1152 - 1108]; /* 1108 */
/* Connection Cookie */

7
libfreerdp/common/settings_getters.c
View File

@ -183,6 +183,9 @@ BOOL freerdp_settings_get_bool(const rdpSettings* settings, size_t id)
case FreeRDP_EncomspVirtualChannel:
return settings->EncomspVirtualChannel;
case FreeRDP_EnforceTLSv1_2:
return settings->EnforceTLSv1_2;
case FreeRDP_ExtSecurity:
return settings->ExtSecurity;
@ -773,6 +776,10 @@ BOOL freerdp_settings_set_bool(rdpSettings* settings, size_t id, BOOL val)
settings->EncomspVirtualChannel = cnv.c;
break;
case FreeRDP_EnforceTLSv1_2:
settings->EnforceTLSv1_2 = cnv.c;
break;
case FreeRDP_ExtSecurity:
settings->ExtSecurity = cnv.c;
break;

48
libfreerdp/common/settings_str.c
View File

@ -64,6 +64,7 @@ static const struct settings_str_entry settings_map[] = {
{ FreeRDP_EmbeddedWindow, 0, "FreeRDP_EmbeddedWindow" },
{ FreeRDP_EnableWindowsKey, 0, "FreeRDP_EnableWindowsKey" },
{ FreeRDP_EncomspVirtualChannel, 0, "FreeRDP_EncomspVirtualChannel" },
{ FreeRDP_EnforceTLSv1_2, 0, "FreeRDP_EnforceTLSv1_2" },
{ FreeRDP_ExtSecurity, 0, "FreeRDP_ExtSecurity" },
{ FreeRDP_ExternalCertificateManagement, 0, "FreeRDP_ExternalCertificateManagement" },
{ FreeRDP_FIPSMode, 0, "FreeRDP_FIPSMode" },
@ -426,6 +427,10 @@ static const struct settings_str_entry settings_map[] = {
BOOL freerdp_settings_clone_keys(rdpSettings* dst, const rdpSettings* src)
{
size_t x;
WINPR_ASSERT(dst);
WINPR_ASSERT(src);
for (x = 0; x < ARRAYSIZE(settings_map); x++)
{
const struct settings_str_entry* cur = &settings_map[x];
@ -505,13 +510,12 @@ BOOL freerdp_settings_clone_keys(rdpSettings* dst, const rdpSettings* src)
BOOL freerdp_settings_print_diff(wLog* log, DWORD level, const rdpSettings* settings,
const rdpSettings* other)
{
size_t x;
BOOL rc = FALSE;
size_t x;
if (!settings && other)
rc = TRUE;
if (settings && !other)
rc = TRUE;
WINPR_ASSERT(log);
WINPR_ASSERT(settings);
WINPR_ASSERT(other);
for (x = 0; x < ARRAYSIZE(settings_map); x++)
{
@ -524,9 +528,9 @@ BOOL freerdp_settings_print_diff(wLog* log, DWORD level, const rdpSettings* sett
BOOL cval = freerdp_settings_get_bool(other, cur->id);
if (sval != cval)
{
rc = TRUE;
WLog_Print(log, level, "%s [BOOL]: %s -> %s", cur->str, sval ? "TRUE" : "FALSE",
cval ? "TRUE" : "FALSE");
rc = TRUE;
}
}
break;
@ -536,9 +540,9 @@ BOOL freerdp_settings_print_diff(wLog* log, DWORD level, const rdpSettings* sett
UINT16 cval = freerdp_settings_get_uint16(other, cur->id);
if (sval != cval)
{
rc = TRUE;
WLog_Print(log, level, "%s [UINT16]: %" PRIu16 " -> %" PRIu16, cur->str, sval,
cval);
rc = TRUE;
}
}
break;
@ -548,9 +552,9 @@ BOOL freerdp_settings_print_diff(wLog* log, DWORD level, const rdpSettings* sett
INT16 cval = freerdp_settings_get_int16(other, cur->id);
if (sval != cval)
{
rc = TRUE;
WLog_Print(log, level, "%s [INT16]: %" PRId16 " -> %" PRId16, cur->str, sval,
cval);
rc = TRUE;
}
}
break;
@ -560,9 +564,9 @@ BOOL freerdp_settings_print_diff(wLog* log, DWORD level, const rdpSettings* sett
UINT32 cval = freerdp_settings_get_uint32(other, cur->id);
if (sval != cval)
{
rc = TRUE;
WLog_Print(log, level, "%s [UINT32]: %" PRIu32 " -> %" PRIu32, cur->str, sval,
cval);
rc = TRUE;
}
}
break;
@ -572,9 +576,9 @@ BOOL freerdp_settings_print_diff(wLog* log, DWORD level, const rdpSettings* sett
INT32 cval = freerdp_settings_get_int32(other, cur->id);
if (sval != cval)
{
rc = TRUE;
WLog_Print(log, level, "%s [INT32]: %" PRId32 " -> %" PRId32, cur->str, sval,
cval);
rc = TRUE;
}
}
break;
@ -584,9 +588,9 @@ BOOL freerdp_settings_print_diff(wLog* log, DWORD level, const rdpSettings* sett
UINT64 cval = freerdp_settings_get_uint64(other, cur->id);
if (sval != cval)
{
rc = TRUE;
WLog_Print(log, level, "%s [UINT64]: %" PRIu64 " -> %" PRIu64, cur->str, sval,
cval);
rc = TRUE;
}
}
break;
@ -596,9 +600,9 @@ BOOL freerdp_settings_print_diff(wLog* log, DWORD level, const rdpSettings* sett
INT64 cval = freerdp_settings_get_int64(other, cur->id);
if (sval != cval)
{
rc = TRUE;
WLog_Print(log, level, "%s [INT64]: %" PRId64 " -> %" PRId64, cur->str, sval,
cval);
rc = TRUE;
}
}
break;
@ -610,8 +614,8 @@ BOOL freerdp_settings_print_diff(wLog* log, DWORD level, const rdpSettings* sett
{
if (!sval || !cval || (strcmp(sval, cval) != 0))
{
WLog_Print(log, level, "%s [STRING]: '%s' -> '%s'", cur->str, sval, cval);
rc = TRUE;
WLog_Print(log, level, "%s [STRING]: '%s' -> '%s'", cur->str, sval, cval);
}
}
}
@ -624,8 +628,8 @@ BOOL freerdp_settings_print_diff(wLog* log, DWORD level, const rdpSettings* sett
{
if ((sval && !cval) || (!sval && cval))
{
WLog_Print(log, level, "%s [POINTER]: '%p' -> '%p'", cur->str, sval, cval);
rc = TRUE;
WLog_Print(log, level, "%s [POINTER]: '%p' -> '%p'", cur->str, sval, cval);
}
}
}
@ -634,9 +638,14 @@ BOOL freerdp_settings_print_diff(wLog* log, DWORD level, const rdpSettings* sett
}
return rc;
}
void freerdp_settings_dump(wLog* log, DWORD level, const rdpSettings* settings)
{
size_t x;
WINPR_ASSERT(log);
WINPR_ASSERT(settings);
for (x = 0; x < ARRAYSIZE(settings_map); x++)
{
const struct settings_str_entry* cur = &settings_map[x];
@ -703,6 +712,9 @@ void freerdp_settings_dump(wLog* log, DWORD level, const rdpSettings* settings)
void freerdp_settings_free_keys(rdpSettings* dst, BOOL cleanup)
{
size_t x;
WINPR_ASSERT(dst);
for (x = 0; x < ARRAYSIZE(settings_map); x++)
{
const struct settings_str_entry* cur = &settings_map[x];
@ -721,6 +733,9 @@ void freerdp_settings_free_keys(rdpSettings* dst, BOOL cleanup)
SSIZE_T freerdp_settings_get_key_for_name(const char* value)
{
size_t x;
WINPR_ASSERT(value);
for (x = 0; x < ARRAYSIZE(settings_map); x++)
{
const struct settings_str_entry* cur = &settings_map[x];
@ -733,6 +748,9 @@ SSIZE_T freerdp_settings_get_key_for_name(const char* value)
SSIZE_T freerdp_settings_get_type_for_name(const char* value)
{
size_t x;
WINPR_ASSERT(value);
for (x = 0; x < ARRAYSIZE(settings_map); x++)
{
const struct settings_str_entry* cur = &settings_map[x];
@ -745,6 +763,7 @@ SSIZE_T freerdp_settings_get_type_for_name(const char* value)
SSIZE_T freerdp_settings_get_type_for_key(size_t key)
{
size_t x;
for (x = 0; x < ARRAYSIZE(settings_map); x++)
{
const struct settings_str_entry* cur = &settings_map[x];
@ -757,6 +776,7 @@ SSIZE_T freerdp_settings_get_type_for_key(size_t key)
const char* freerdp_settings_get_name_for_key(size_t key)
{
size_t x;
for (x = 0; x < ARRAYSIZE(settings_map); x++)
{
const struct settings_str_entry* cur = &settings_map[x];

1
libfreerdp/core/test/settings_property_lists.h
View File

@ -53,6 +53,7 @@ static const size_t bool_list_indices[] = {
FreeRDP_EmbeddedWindow,
FreeRDP_EnableWindowsKey,
FreeRDP_EncomspVirtualChannel,
FreeRDP_EnforceTLSv1_2,
FreeRDP_ExtSecurity,
FreeRDP_ExternalCertificateManagement,
FreeRDP_FIPSMode,