From 2335a307cb235d2aaacc013837bab7406b557848 Mon Sep 17 00:00:00 2001 From: "zihao.jiang" Date: Mon, 15 Jun 2015 19:37:26 +0800 Subject: [PATCH] server/shadow: integrate comment from @hardening Return directly at subsystem->ClientConnect Also change to argument to accept shadow_client instead of freerdp_peer --- include/freerdp/server/shadow.h | 4 ++-- server/shadow/shadow_client.c | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/include/freerdp/server/shadow.h b/include/freerdp/server/shadow.h index 64a134e..540080e 100644 --- a/include/freerdp/server/shadow.h +++ b/include/freerdp/server/shadow.h @@ -64,8 +64,8 @@ typedef int (*pfnShadowEnumMonitors)(MONITOR_DEF* monitors, int maxMonitors); typedef int (*pfnShadowAuthenticate)(rdpShadowSubsystem* subsystem, const char* user, const char* domain, const char* password); -typedef int (*pfnShadowClientConnect)(rdpShadowSubsystem* subsystem, freerdp_peer* peer); -typedef void (*pfnShadowClientDisconnect)(rdpShadowSubsystem* subsystem, freerdp_peer* peer); +typedef BOOL (*pfnShadowClientConnect)(rdpShadowSubsystem* subsystem, rdpShadowClient* client); +typedef void (*pfnShadowClientDisconnect)(rdpShadowSubsystem* subsystem, rdpShadowClient* client); typedef int (*pfnShadowSynchronizeEvent)(rdpShadowSubsystem* subsystem, UINT32 flags); typedef int (*pfnShadowKeyboardEvent)(rdpShadowSubsystem* subsystem, UINT16 flags, UINT16 code); diff --git a/server/shadow/shadow_client.c b/server/shadow/shadow_client.c index a39e046..ce414ec 100644 --- a/server/shadow/shadow_client.c +++ b/server/shadow/shadow_client.c @@ -250,10 +250,7 @@ BOOL shadow_client_post_connect(freerdp_peer* peer) if (subsystem->ClientConnect) { - if (subsystem->ClientConnect(subsystem, peer)) - return TRUE; - else - return FALSE; + return subsystem->ClientConnect(subsystem, client); } return TRUE; @@ -1084,7 +1081,7 @@ void* shadow_client_thread(rdpShadowClient* client) if (peer->connected && subsystem->ClientDisconnect) { - subsystem->ClientDisconnect(subsystem, peer); + subsystem->ClientDisconnect(subsystem, client); } out: -- 2.7.4