From 3178d278487a4c3cc5d509aec579697e483121fc Mon Sep 17 00:00:00 2001 From: Vic Lee Date: Tue, 23 Aug 2011 13:05:58 +0800 Subject: [PATCH] Rename more functions. --- libfreerdp-core/capabilities.c | 4 ++-- libfreerdp-core/capabilities.h | 4 ++-- libfreerdp-core/connection.c | 20 ++++++++++---------- libfreerdp-core/license.c | 2 +- libfreerdp-core/license.h | 2 +- libfreerdp-core/mcs.c | 14 +++++++------- libfreerdp-core/mcs.h | 14 +++++++------- libfreerdp-core/rdp.c | 4 +--- 8 files changed, 31 insertions(+), 33 deletions(-) diff --git a/libfreerdp-core/capabilities.c b/libfreerdp-core/capabilities.c index e78bc71..2879741 100644 --- a/libfreerdp-core/capabilities.c +++ b/libfreerdp-core/capabilities.c @@ -1576,7 +1576,7 @@ boolean rdp_read_capability_sets(STREAM* s, rdpSettings* settings, uint16 number return True; } -boolean rdp_read_demand_active(rdpRdp* rdp, STREAM* s) +boolean rdp_recv_demand_active(rdpRdp* rdp, STREAM* s) { uint16 length; uint16 channelId; @@ -1676,7 +1676,7 @@ boolean rdp_send_demand_active(rdpRdp* rdp) return True; } -boolean rdp_read_confirm_active(rdpRdp* rdp, STREAM* s) +boolean rdp_recv_confirm_active(rdpRdp* rdp, STREAM* s) { uint16 length; uint16 channelId; diff --git a/libfreerdp-core/capabilities.h b/libfreerdp-core/capabilities.h index 677bed9..85460c1 100644 --- a/libfreerdp-core/capabilities.h +++ b/libfreerdp-core/capabilities.h @@ -163,10 +163,10 @@ #define CLW_ENTROPY_RLGR1 0x01 #define CLW_ENTROPY_RLGR3 0x04 -boolean rdp_read_demand_active(rdpRdp* rdp, STREAM* s); +boolean rdp_recv_demand_active(rdpRdp* rdp, STREAM* s); void rdp_write_demand_active(STREAM* s, rdpSettings* settings); boolean rdp_send_demand_active(rdpRdp* rdp); -boolean rdp_read_confirm_active(rdpRdp* rdp, STREAM* s); +boolean rdp_recv_confirm_active(rdpRdp* rdp, STREAM* s); void rdp_write_confirm_active(STREAM* s, rdpSettings* settings); boolean rdp_send_confirm_active(rdpRdp* rdp); diff --git a/libfreerdp-core/connection.c b/libfreerdp-core/connection.c index 3a5dab6..0f81a0e 100644 --- a/libfreerdp-core/connection.c +++ b/libfreerdp-core/connection.c @@ -106,7 +106,7 @@ boolean rdp_client_connect(rdpRdp* rdp) boolean rdp_client_connect_mcs_connect_response(rdpRdp* rdp, STREAM* s) { - if (!mcs_read_connect_response(rdp->mcs, s)) + if (!mcs_recv_connect_response(rdp->mcs, s)) return False; if (!mcs_send_erect_domain_request(rdp->mcs)) @@ -121,7 +121,7 @@ boolean rdp_client_connect_mcs_connect_response(rdpRdp* rdp, STREAM* s) boolean rdp_client_connect_mcs_attach_user_confirm(rdpRdp* rdp, STREAM* s) { - if (!mcs_read_attach_user_confirm(rdp->mcs, s)) + if (!mcs_recv_attach_user_confirm(rdp->mcs, s)) return False; if (!mcs_send_channel_join_request(rdp->mcs, rdp->mcs->user_id)) @@ -138,7 +138,7 @@ boolean rdp_client_connect_mcs_channel_join_confirm(rdpRdp* rdp, STREAM* s) uint16 channel_id; boolean all_joined = True; - if (!mcs_read_channel_join_confirm(rdp->mcs, s, &channel_id)) + if (!mcs_recv_channel_join_confirm(rdp->mcs, s, &channel_id)) return False; if (!rdp->mcs->user_channel_joined) @@ -198,7 +198,7 @@ boolean rdp_client_connect_mcs_channel_join_confirm(rdpRdp* rdp, STREAM* s) boolean rdp_client_connect_license(rdpRdp* rdp, STREAM* s) { - if (!license_read(rdp->license, s)) + if (!license_recv(rdp->license, s)) return False; if (rdp->license->state == LICENSE_STATE_ABORTED) @@ -219,7 +219,7 @@ boolean rdp_client_connect_license(rdpRdp* rdp, STREAM* s) boolean rdp_client_connect_demand_active(rdpRdp* rdp, STREAM* s) { - if (!rdp_read_demand_active(rdp, s)) + if (!rdp_recv_demand_active(rdp, s)) return False; if (!rdp_send_confirm_active(rdp)) @@ -315,7 +315,7 @@ boolean rdp_server_accept_mcs_connect_initial(rdpRdp* rdp, STREAM* s) { int i; - if (!mcs_read_connect_initial(rdp->mcs, s)) + if (!mcs_recv_connect_initial(rdp->mcs, s)) return False; printf("Accepted client: %s\n", rdp->settings->client_hostname); @@ -336,7 +336,7 @@ boolean rdp_server_accept_mcs_connect_initial(rdpRdp* rdp, STREAM* s) boolean rdp_server_accept_mcs_erect_domain_request(rdpRdp* rdp, STREAM* s) { - if (!mcs_read_erect_domain_request(rdp->mcs, s)) + if (!mcs_recv_erect_domain_request(rdp->mcs, s)) return False; rdp->state = CONNECTION_STATE_MCS_ERECT_DOMAIN; @@ -346,7 +346,7 @@ boolean rdp_server_accept_mcs_erect_domain_request(rdpRdp* rdp, STREAM* s) boolean rdp_server_accept_mcs_attach_user_request(rdpRdp* rdp, STREAM* s) { - if (!mcs_read_attach_user_request(rdp->mcs, s)) + if (!mcs_recv_attach_user_request(rdp->mcs, s)) return False; if (!mcs_send_attach_user_confirm(rdp->mcs)) @@ -363,7 +363,7 @@ boolean rdp_server_accept_mcs_channel_join_request(rdpRdp* rdp, STREAM* s) uint16 channel_id; boolean all_joined = True; - if (!mcs_read_channel_join_request(rdp->mcs, s, &channel_id)) + if (!mcs_recv_channel_join_request(rdp->mcs, s, &channel_id)) return False; if (!mcs_send_channel_join_confirm(rdp->mcs, channel_id)) @@ -407,7 +407,7 @@ boolean rdp_server_accept_client_info(rdpRdp* rdp, STREAM* s) boolean rdp_server_accept_confirm_active(rdpRdp* rdp, STREAM* s) { - if (!rdp_read_confirm_active(rdp, s)) + if (!rdp_recv_confirm_active(rdp, s)) return False; rdp->state = CONNECTION_STATE_ACTIVE; diff --git a/libfreerdp-core/license.c b/libfreerdp-core/license.c index 96f0703..d9ae8c4 100644 --- a/libfreerdp-core/license.c +++ b/libfreerdp-core/license.c @@ -161,7 +161,7 @@ boolean license_send(rdpLicense* license, STREAM* s, uint8 type) * @param s stream */ -boolean license_read(rdpLicense* license, STREAM* s) +boolean license_recv(rdpLicense* license, STREAM* s) { uint16 length; uint16 channelId; diff --git a/libfreerdp-core/license.h b/libfreerdp-core/license.h index 54e3105..a6d1a5e 100644 --- a/libfreerdp-core/license.h +++ b/libfreerdp-core/license.h @@ -156,7 +156,7 @@ struct rdp_license SCOPE_LIST* scope_list; }; -boolean license_read(rdpLicense* license, STREAM* s); +boolean license_recv(rdpLicense* license, STREAM* s); boolean license_send(rdpLicense* license, STREAM* s, uint8 type); STREAM* license_send_stream_init(rdpLicense* license); diff --git a/libfreerdp-core/mcs.c b/libfreerdp-core/mcs.c index 33315f9..f884ba6 100644 --- a/libfreerdp-core/mcs.c +++ b/libfreerdp-core/mcs.c @@ -319,7 +319,7 @@ void mcs_print_domain_parameters(DomainParameters* domainParameters) * @param s stream */ -boolean mcs_read_connect_initial(rdpMcs* mcs, STREAM* s) +boolean mcs_recv_connect_initial(rdpMcs* mcs, STREAM* s) { int length; boolean upwardFlag; @@ -496,7 +496,7 @@ boolean mcs_send_connect_initial(rdpMcs* mcs) * @param mcs mcs module */ -boolean mcs_read_connect_response(rdpMcs* mcs, STREAM* s) +boolean mcs_recv_connect_response(rdpMcs* mcs, STREAM* s) { int length; uint8 result; @@ -571,7 +571,7 @@ boolean mcs_send_connect_response(rdpMcs* mcs) * @param s stream */ -boolean mcs_read_erect_domain_request(rdpMcs* mcs, STREAM* s) +boolean mcs_recv_erect_domain_request(rdpMcs* mcs, STREAM* s) { uint16 length; enum DomainMCSPDU MCSPDU; @@ -613,7 +613,7 @@ boolean mcs_send_erect_domain_request(rdpMcs* mcs) * @param s stream */ -boolean mcs_read_attach_user_request(rdpMcs* mcs, STREAM* s) +boolean mcs_recv_attach_user_request(rdpMcs* mcs, STREAM* s) { uint16 length; enum DomainMCSPDU MCSPDU; @@ -651,7 +651,7 @@ boolean mcs_send_attach_user_request(rdpMcs* mcs) * @param mcs mcs module */ -boolean mcs_read_attach_user_confirm(rdpMcs* mcs, STREAM* s) +boolean mcs_recv_attach_user_confirm(rdpMcs* mcs, STREAM* s) { uint16 length; uint8 result; @@ -698,7 +698,7 @@ boolean mcs_send_attach_user_confirm(rdpMcs* mcs) * @param s stream */ -boolean mcs_read_channel_join_request(rdpMcs* mcs, STREAM* s, uint16* channel_id) +boolean mcs_recv_channel_join_request(rdpMcs* mcs, STREAM* s, uint16* channel_id) { uint16 length; enum DomainMCSPDU MCSPDU; @@ -748,7 +748,7 @@ boolean mcs_send_channel_join_request(rdpMcs* mcs, uint16 channel_id) * @param mcs mcs module */ -boolean mcs_read_channel_join_confirm(rdpMcs* mcs, STREAM* s, uint16* channel_id) +boolean mcs_recv_channel_join_confirm(rdpMcs* mcs, STREAM* s, uint16* channel_id) { uint16 length; uint8 result; diff --git a/libfreerdp-core/mcs.h b/libfreerdp-core/mcs.h index 66e8b51..f7ecc1e 100644 --- a/libfreerdp-core/mcs.h +++ b/libfreerdp-core/mcs.h @@ -132,19 +132,19 @@ typedef struct rdp_mcs rdpMcs; void mcs_write_connect_initial(STREAM* s, rdpMcs* mcs, STREAM* user_data); void mcs_write_connect_response(STREAM* s, rdpMcs* mcs, STREAM* user_data); -boolean mcs_read_connect_initial(rdpMcs* mcs, STREAM* s); +boolean mcs_recv_connect_initial(rdpMcs* mcs, STREAM* s); boolean mcs_send_connect_initial(rdpMcs* mcs); -boolean mcs_read_connect_response(rdpMcs* mcs, STREAM* s); +boolean mcs_recv_connect_response(rdpMcs* mcs, STREAM* s); boolean mcs_send_connect_response(rdpMcs* mcs); -boolean mcs_read_erect_domain_request(rdpMcs* mcs, STREAM* s); +boolean mcs_recv_erect_domain_request(rdpMcs* mcs, STREAM* s); boolean mcs_send_erect_domain_request(rdpMcs* mcs); -boolean mcs_read_attach_user_request(rdpMcs* mcs, STREAM* s); +boolean mcs_recv_attach_user_request(rdpMcs* mcs, STREAM* s); boolean mcs_send_attach_user_request(rdpMcs* mcs); -boolean mcs_read_attach_user_confirm(rdpMcs* mcs, STREAM* s); +boolean mcs_recv_attach_user_confirm(rdpMcs* mcs, STREAM* s); boolean mcs_send_attach_user_confirm(rdpMcs* mcs); -boolean mcs_read_channel_join_request(rdpMcs* mcs, STREAM* s, uint16* channel_id); +boolean mcs_recv_channel_join_request(rdpMcs* mcs, STREAM* s, uint16* channel_id); boolean mcs_send_channel_join_request(rdpMcs* mcs, uint16 channel_id); -boolean mcs_read_channel_join_confirm(rdpMcs* mcs, STREAM* s, uint16* channel_id); +boolean mcs_recv_channel_join_confirm(rdpMcs* mcs, STREAM* s, uint16* channel_id); boolean mcs_send_channel_join_confirm(rdpMcs* mcs, uint16 channel_id); boolean mcs_read_domain_mcspdu_header(STREAM* s, enum DomainMCSPDU* domainMCSPDU, uint16* length); void mcs_write_domain_mcspdu_header(STREAM* s, enum DomainMCSPDU domainMCSPDU, uint16 length, uint8 options); diff --git a/libfreerdp-core/rdp.c b/libfreerdp-core/rdp.c index 865e28e..d1bd269 100644 --- a/libfreerdp-core/rdp.c +++ b/libfreerdp-core/rdp.c @@ -459,9 +459,7 @@ static boolean rdp_recv_fastpath_pdu(rdpRdp* rdp, STREAM* s) if (!fastpath_read_security_header(rdp->fastpath, s)) return False; - fastpath_recv_updates(rdp->fastpath, s); - - return True; + return fastpath_recv_updates(rdp->fastpath, s); } static boolean rdp_recv_pdu(rdpRdp* rdp, STREAM* s) -- 2.7.4