github/FreeRDP
7
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2025-06-03 00:00:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various fixes / improvements (#8146)

Browse Source 
* xfreerdp: fix typo in logs

* winpr: file appender, small code cleanup

* shadow-server: add an option for TLS secrets

This allows to dissect connections to the shadow server.
This commit is contained in:
David Fort 2022-08-22 09:42:15 +02:00 committed by GitHub
parent 95b4d3cd3d
commit 4fc7a9417d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/X11/xf_graphics.c
View File

@ -263,7 +263,7 @@ static BOOL xf_Pointer_GetCursorForCurrentScale(rdpContext* context, rdpPointer*
yTargetSize = pointer->height * yscale; yTargetSize = pointer->height * yscale;
WLog_DBG(TAG, "%s: scaled: %" PRIu32 "x%" PRIu32 ", desktop: %" PRIu32 "x%" PRIu32, __func__, WLog_DBG(TAG, "%s: scaled: %" PRIu32 "x%" PRIu32 ", desktop: %" PRIu32 "x%" PRIu32, __func__,
xfc->scaledWidth, xfc->savedHeight, settings->DesktopWidth, settings->DesktopHeight); xfc->scaledWidth, xfc->scaledHeight, settings->DesktopWidth, settings->DesktopHeight);
for (i = 0; i < xpointer->nCursors; i++) for (i = 0; i < xpointer->nCursors; i++)
{ {
if ((xpointer->cursorWidths[i] == xTargetSize) && if ((xpointer->cursorWidths[i] == xTargetSize) &&

2
server/shadow/shadow.c
View File

@ -75,6 +75,8 @@ int main(int argc, char** argv)
"Kerberos keytab file for NLA authentication" }, "Kerberos keytab file for NLA authentication" },
{ "ccache", COMMAND_LINE_VALUE_REQUIRED, "<file>", NULL, NULL, -1, NULL, { "ccache", COMMAND_LINE_VALUE_REQUIRED, "<file>", NULL, NULL, -1, NULL,
"Kerberos host ccache file for NLA authentication" }, "Kerberos host ccache file for NLA authentication" },
{ "tls-secrets-file", COMMAND_LINE_VALUE_REQUIRED, "<file>", NULL, NULL, -1, NULL,
"file where tls secrets shall be stored" },
{ "gfx-progressive", COMMAND_LINE_VALUE_BOOL, NULL, BoolValueTrue, NULL, -1, NULL, { "gfx-progressive", COMMAND_LINE_VALUE_BOOL, NULL, BoolValueTrue, NULL, -1, NULL,
"Allow GFX progressive codec" }, "Allow GFX progressive codec" },
{ "gfx-rfx", COMMAND_LINE_VALUE_BOOL, NULL, BoolValueTrue, NULL, -1, NULL, { "gfx-rfx", COMMAND_LINE_VALUE_BOOL, NULL, BoolValueTrue, NULL, -1, NULL,

5
server/shadow/shadow_server.c
View File

@ -402,6 +402,11 @@ int shadow_server_parse_command_line(rdpShadowServer* server, int argc, char** a
if (!freerdp_settings_set_string(settings, FreeRDP_KerberosCache, arg->Value)) if (!freerdp_settings_set_string(settings, FreeRDP_KerberosCache, arg->Value))
return COMMAND_LINE_ERROR; return COMMAND_LINE_ERROR;
} }
CommandLineSwitchCase(arg, "tls-secrets-file")
{
if (!freerdp_settings_set_string(settings, FreeRDP_TlsSecretsFile, arg->Value))
return COMMAND_LINE_ERROR;
}
CommandLineSwitchDefault(arg) CommandLineSwitchDefault(arg)
{ {
} }

9
winpr/libwinpr/utils/wlog/FileAppender.c
View File

@ -195,12 +195,11 @@ static BOOL WLog_FileAppender_Set(wLogAppender* appender, const char* setting, v
if (!strcmp("outputfilename", setting)) if (!strcmp("outputfilename", setting))
return WLog_FileAppender_SetOutputFileName(fileAppender, (const char*)value); return WLog_FileAppender_SetOutputFileName(fileAppender, (const char*)value);
else if (!strcmp("outputfilepath", setting))
return WLog_FileAppender_SetOutputFilePath(fileAppender, (const char*)value);
else
return FALSE;
return TRUE; if (!strcmp("outputfilepath", setting))
return WLog_FileAppender_SetOutputFilePath(fileAppender, (const char*)value);
return FALSE;
} }
static void WLog_FileAppender_Free(wLogAppender* appender) static void WLog_FileAppender_Free(wLogAppender* appender)