From 70ca0284537f26881e7616e8c2a60c4008eeb64c Mon Sep 17 00:00:00 2001 From: kubistika Date: Tue, 16 Jul 2019 16:08:45 +0300 Subject: [PATCH] server: proxy: remove unnecessary files --- server/proxy/CMakeLists.txt | 2 - server/proxy/pf_client.c | 1 - server/proxy/pf_common.c | 112 -------------------------------------------- server/proxy/pf_common.h | 31 ------------ server/proxy/pf_context.c | 1 - server/proxy/pf_server.c | 1 - 6 files changed, 148 deletions(-) delete mode 100644 server/proxy/pf_common.c delete mode 100644 server/proxy/pf_common.h diff --git a/server/proxy/CMakeLists.txt b/server/proxy/CMakeLists.txt index 4133a3a..727d469 100644 --- a/server/proxy/CMakeLists.txt +++ b/server/proxy/CMakeLists.txt @@ -37,8 +37,6 @@ set(${MODULE_PREFIX}_SRCS pf_disp.h pf_server.c pf_server.h - pf_common.c - pf_common.h pf_gdi.c pf_gdi.h pf_config.c diff --git a/server/proxy/pf_client.c b/server/proxy/pf_client.c index 8c9cb53..ad1a135 100644 --- a/server/proxy/pf_client.c +++ b/server/proxy/pf_client.c @@ -45,7 +45,6 @@ #include "pf_channels.h" #include "pf_gdi.h" #include "pf_graphics.h" -#include "pf_common.h" #include "pf_client.h" #include "pf_context.h" #include "pf_update.h" diff --git a/server/proxy/pf_common.c b/server/proxy/pf_common.c deleted file mode 100644 index b9dcf4c..0000000 --- a/server/proxy/pf_common.c +++ /dev/null @@ -1,112 +0,0 @@ -/** - * FreeRDP: A Remote Desktop Protocol Implementation - * FreeRDP Proxy Server - * - * Copyright 2019 Mati Shabtay - * Copyright 2019 Kobi Mizrachi - * Copyright 2019 Idan Freiberg - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "pf_common.h" - -BOOL pf_common_connection_aborted_by_peer(proxyData* pdata) -{ - return WaitForSingleObject(pdata->connectionClosed, 0) == WAIT_OBJECT_0; -} - -void pf_common_copy_settings(rdpSettings* dst, rdpSettings* src) -{ - /* Client/server CORE options */ - dst->RdpVersion = src->RdpVersion; - dst->DesktopWidth = src->DesktopWidth; - dst->DesktopHeight = src->DesktopHeight; - dst->ColorDepth = src->ColorDepth; - dst->ConnectionType = src->ConnectionType; - dst->ClientBuild = src->ClientBuild; - dst->ClientHostname = _strdup(src->ClientHostname); - dst->ClientProductId = _strdup(src->ClientProductId); - dst->EarlyCapabilityFlags = src->EarlyCapabilityFlags; - dst->NetworkAutoDetect = src->NetworkAutoDetect; - dst->SupportAsymetricKeys = src->SupportAsymetricKeys; - dst->SupportErrorInfoPdu = src->SupportErrorInfoPdu; - dst->SupportStatusInfoPdu = src->SupportStatusInfoPdu; - dst->SupportMonitorLayoutPdu = src->SupportMonitorLayoutPdu; - dst->SupportGraphicsPipeline = src->SupportGraphicsPipeline; - dst->SupportDynamicTimeZone = src->SupportDynamicTimeZone; - dst->SupportHeartbeatPdu = src->SupportHeartbeatPdu; - dst->DesktopPhysicalWidth = src->DesktopPhysicalWidth; - dst->DesktopPhysicalHeight = src->DesktopPhysicalHeight; - dst->DesktopOrientation = src->DesktopOrientation; - dst->DesktopScaleFactor = src->DesktopScaleFactor; - dst->DeviceScaleFactor = src->DeviceScaleFactor; - dst->SupportMonitorLayoutPdu = src->SupportMonitorLayoutPdu; - /* client info */ - dst->AutoLogonEnabled = src->AutoLogonEnabled; - dst->CompressionEnabled = src->CompressionEnabled; - dst->DisableCtrlAltDel = src->DisableCtrlAltDel; - dst->EnableWindowsKey = src->EnableWindowsKey; - dst->MaximizeShell = src->MaximizeShell; - dst->LogonNotify = src->LogonNotify; - dst->LogonErrors = src->LogonErrors; - dst->MouseAttached = src->MouseAttached; - dst->MouseHasWheel = src->MouseHasWheel; - dst->RemoteConsoleAudio = src->RemoteConsoleAudio; - dst->AudioPlayback = src->AudioPlayback; - dst->AudioCapture = src->AudioCapture; - dst->VideoDisable = src->VideoDisable; - dst->PasswordIsSmartcardPin = src->PasswordIsSmartcardPin; - dst->UsingSavedCredentials = src->UsingSavedCredentials; - dst->ForceEncryptedCsPdu = src->ForceEncryptedCsPdu; - dst->HiDefRemoteApp = src->HiDefRemoteApp; - dst->CompressionLevel = src->CompressionLevel; - dst->PerformanceFlags = src->PerformanceFlags; - dst->AllowFontSmoothing = src->AllowFontSmoothing; - dst->DisableWallpaper = src->DisableWallpaper; - dst->DisableFullWindowDrag = src->DisableFullWindowDrag; - dst->DisableMenuAnims = src->DisableMenuAnims; - dst->DisableThemes = src->DisableThemes; - dst->DisableCursorShadow = src->DisableCursorShadow; - dst->DisableCursorBlinking = src->DisableCursorBlinking; - dst->AllowDesktopComposition = src->AllowDesktopComposition; - dst->DisableThemes = src->DisableThemes; - /* Remote App */ - dst->RemoteApplicationMode = src->RemoteApplicationMode; - dst->RemoteApplicationName = src->RemoteApplicationName; - dst->RemoteApplicationIcon = src->RemoteApplicationIcon; - dst->RemoteApplicationProgram = src->RemoteApplicationProgram; - dst->RemoteApplicationFile = src->RemoteApplicationFile; - dst->RemoteApplicationGuid = src->RemoteApplicationGuid; - dst->RemoteApplicationCmdLine = src->RemoteApplicationCmdLine; - dst->RemoteApplicationExpandCmdLine = src->RemoteApplicationExpandCmdLine; - dst->RemoteApplicationExpandWorkingDir = src->RemoteApplicationExpandWorkingDir; - dst->DisableRemoteAppCapsCheck = src->DisableRemoteAppCapsCheck; - dst->RemoteAppNumIconCaches = src->RemoteAppNumIconCaches; - dst->RemoteAppNumIconCacheEntries = src->RemoteAppNumIconCacheEntries; - dst->RemoteAppLanguageBarSupported = src->RemoteAppLanguageBarSupported; - dst->RemoteWndSupportLevel = src->RemoteWndSupportLevel; - /* GFX */ - dst->GfxThinClient = src->GfxThinClient; - dst->GfxSmallCache = src->GfxSmallCache; - dst->GfxProgressive = src->GfxProgressive; - dst->GfxProgressiveV2 = src->GfxProgressiveV2; - dst->GfxH264 = src->GfxH264; - dst->GfxAVC444 = src->GfxAVC444; - dst->GfxSendQoeAck = src->GfxSendQoeAck; - dst->GfxAVC444v2 = src->GfxAVC444v2; - dst->SupportDisplayControl = src->SupportDisplayControl; - dst->SupportMonitorLayoutPdu = src->SupportMonitorLayoutPdu; - dst->DynamicResolutionUpdate = src->DynamicResolutionUpdate; - dst->DesktopResize = src->DesktopResize; -} diff --git a/server/proxy/pf_common.h b/server/proxy/pf_common.h deleted file mode 100644 index 9cca30d..0000000 --- a/server/proxy/pf_common.h +++ /dev/null @@ -1,31 +0,0 @@ -/** - * FreeRDP: A Remote Desktop Protocol Implementation - * FreeRDP Proxy Server - * - * Copyright 2019 Mati Shabtay - * Copyright 2019 Kobi Mizrachi - * Copyright 2019 Idan Freiberg - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef FREERDP_SERVER_PROXY_PFCOMMON_H -#define FREERDP_SERVER_PROXY_PFCOMMON_H - -#include -#include "pf_context.h" - -BOOL pf_common_connection_aborted_by_peer(proxyData* pdata); -void pf_common_copy_settings(rdpSettings* dst, rdpSettings* src); - -#endif /* FREERDP_SERVER_PROXY_PFCOMMON_H */ diff --git a/server/proxy/pf_context.c b/server/proxy/pf_context.c index 2d29c54..3729d9d 100644 --- a/server/proxy/pf_context.c +++ b/server/proxy/pf_context.c @@ -21,7 +21,6 @@ #include "pf_client.h" #include "pf_context.h" -#include "pf_common.h" /* Proxy context initialization callback */ static BOOL client_to_proxy_context_new(freerdp_peer* client, diff --git a/server/proxy/pf_server.c b/server/proxy/pf_server.c index 5bf6512..4a69864 100644 --- a/server/proxy/pf_server.c +++ b/server/proxy/pf_server.c @@ -41,7 +41,6 @@ #include #include "pf_server.h" -#include "pf_common.h" #include "pf_log.h" #include "pf_config.h" #include "pf_client.h" -- 2.7.4