Various fixes / improvements (FreeRDP#8146)

* 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.
kuchingking1 · Aug 22, 2022 · 4fc7a94 · 4fc7a94
1 parent 95b4d3c
commit 4fc7a94
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/client/X11/xf_graphics.c b/client/X11/xf_graphics.c
@@ -263,7 +263,7 @@ static BOOL xf_Pointer_GetCursorForCurrentScale(rdpContext* context, rdpPointer*
 	yTargetSize = pointer->height * yscale;
 
 	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++)
 	{
 		if ((xpointer->cursorWidths[i] == xTargetSize) &&

diff --git a/server/shadow/shadow.c b/server/shadow/shadow.c
@@ -75,6 +75,8 @@ int main(int argc, char** argv)
 		  "Kerberos keytab file for NLA authentication" },
 		{ "ccache", COMMAND_LINE_VALUE_REQUIRED, "<file>", NULL, NULL, -1, NULL,
 		  "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,
 		  "Allow GFX progressive codec" },
 		{ "gfx-rfx", COMMAND_LINE_VALUE_BOOL, NULL, BoolValueTrue, NULL, -1, NULL,

diff --git a/server/shadow/shadow_server.c b/server/shadow/shadow_server.c
@@ -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))
 				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)
 		{
 		}

diff --git a/winpr/libwinpr/utils/wlog/FileAppender.c b/winpr/libwinpr/utils/wlog/FileAppender.c
@@ -195,12 +195,11 @@ static BOOL WLog_FileAppender_Set(wLogAppender* appender, const char* setting, v
 
 	if (!strcmp("outputfilename", setting))
 		return WLog_FileAppender_SetOutputFileName(fileAppender, (const char*)value);
-	else if (!strcmp("outputfilepath", setting))
+
+	if (!strcmp("outputfilepath", setting))
 		return WLog_FileAppender_SetOutputFilePath(fileAppender, (const char*)value);
-	else
-		return FALSE;
 
-	return TRUE;
+	return FALSE;
 }
 
 static void WLog_FileAppender_Free(wLogAppender* appender)