From 016d2fe68972fdf12a5e8fc407b95f2aa11ed67e Mon Sep 17 00:00:00 2001 From: akallabeth Date: Tue, 4 Oct 2022 15:51:52 +0200 Subject: [PATCH] Renamed rdp_recv_server_synchronize_pdu --- libfreerdp/core/activation.c | 16 ---------------- libfreerdp/core/activation.h | 2 +- libfreerdp/core/rdp.c | 5 +++-- 3 files changed, 4 insertions(+), 19 deletions(-) diff --git a/libfreerdp/core/activation.c b/libfreerdp/core/activation.c index 58e9af719..054ebe127 100644 --- a/libfreerdp/core/activation.c +++ b/libfreerdp/core/activation.c @@ -26,7 +26,6 @@ #define TAG FREERDP_TAG("core.activation") -static BOOL rdp_recv_server_synchronize_pdu(rdpRdp* rdp, wStream* s); static BOOL rdp_recv_client_font_list_pdu(wStream* s); static BOOL rdp_recv_client_persistent_key_list_pdu(wStream* s); static BOOL rdp_recv_server_font_map_pdu(rdpRdp* rdp, wStream* s); @@ -45,23 +44,8 @@ static BOOL rdp_write_synchronize_pdu(wStream* s, const rdpSettings* settings) return TRUE; } -BOOL rdp_recv_synchronize_pdu(rdpRdp* rdp, wStream* s) -{ - WINPR_ASSERT(rdp); - WINPR_ASSERT(rdp->settings); - WINPR_ASSERT(s); - - if (rdp->settings->ServerMode) - return rdp_recv_server_synchronize_pdu(rdp, s); - else - return rdp_recv_client_synchronize_pdu(rdp, s); -} - BOOL rdp_recv_server_synchronize_pdu(rdpRdp* rdp, wStream* s) { - WINPR_ASSERT(rdp); - WINPR_ASSERT(s); - return rdp_finalize_set_flag(rdp, FINALIZE_SC_SYNCHRONIZE_PDU); } diff --git a/libfreerdp/core/activation.h b/libfreerdp/core/activation.h index 9f114d1f5..2f90fd945 100644 --- a/libfreerdp/core/activation.h +++ b/libfreerdp/core/activation.h @@ -63,7 +63,7 @@ FREERDP_LOCAL const char* rdp_ctrlaction_string(UINT16 action, char* buffer, siz FREERDP_LOCAL BOOL rdp_recv_deactivate_all(rdpRdp* rdp, wStream* s); FREERDP_LOCAL BOOL rdp_send_deactivate_all(rdpRdp* rdp); -FREERDP_LOCAL BOOL rdp_recv_synchronize_pdu(rdpRdp* rdp, wStream* s); +FREERDP_LOCAL BOOL rdp_recv_server_synchronize_pdu(rdpRdp* rdp, wStream* s); FREERDP_LOCAL BOOL rdp_send_server_synchronize_pdu(rdpRdp* rdp); FREERDP_LOCAL BOOL rdp_recv_client_synchronize_pdu(rdpRdp* rdp, wStream* s); FREERDP_LOCAL BOOL rdp_send_client_synchronize_pdu(rdpRdp* rdp); diff --git a/libfreerdp/core/rdp.c b/libfreerdp/core/rdp.c index 613f84696..2253f1d70 100644 --- a/libfreerdp/core/rdp.c +++ b/libfreerdp/core/rdp.c @@ -1042,9 +1042,10 @@ int rdp_recv_data_pdu(rdpRdp* rdp, wStream* s) break; case DATA_PDU_TYPE_SYNCHRONIZE: - if (!rdp_recv_synchronize_pdu(rdp, cs)) + if (!rdp_recv_server_synchronize_pdu(rdp, cs)) { - WLog_ERR(TAG, "DATA_PDU_TYPE_SYNCHRONIZE - rdp_recv_synchronize_pdu() failed"); + WLog_ERR(TAG, + "DATA_PDU_TYPE_SYNCHRONIZE - rdp_recv_server_synchronize_pdu() failed"); goto out_fail; }