diff --git a/libfreerdp/core/gateway/rpc.c b/libfreerdp/core/gateway/rpc.c index a4d015183..3a258ea7c 100644 --- a/libfreerdp/core/gateway/rpc.c +++ b/libfreerdp/core/gateway/rpc.c @@ -145,7 +145,7 @@ static const char* client_out_state_str(CLIENT_OUT_CHANNEL_STATE state) return str; } -static const char* vc_state_str(VIRTUAL_CONNECTION_STATE state) +const char* rpc_vc_state_str(VIRTUAL_CONNECTION_STATE state) { const char* str = "VIRTUAL_CONNECTION_STATE_UNKNOWN"; @@ -618,7 +618,7 @@ BOOL rpc_virtual_connection_transition_to_state(rdpRpc* rpc, RpcVirtualConnectio WINPR_ASSERT(rpc); connection->State = state; - WLog_Print(rpc->log, WLOG_DEBUG, "%s", vc_state_str(state)); + WLog_Print(rpc->log, WLOG_DEBUG, "%s", rpc_vc_state_str(state)); return TRUE; } diff --git a/libfreerdp/core/gateway/rpc.h b/libfreerdp/core/gateway/rpc.h index 4870c269b..85041dddd 100644 --- a/libfreerdp/core/gateway/rpc.h +++ b/libfreerdp/core/gateway/rpc.h @@ -753,6 +753,7 @@ struct rdp_rpc wLog* log; }; +FREERDP_LOCAL const char* rpc_vc_state_str(VIRTUAL_CONNECTION_STATE state); FREERDP_LOCAL void rpc_pdu_header_print(wLog* log, const rpcconn_hdr_t* header); FREERDP_LOCAL rpcconn_common_hdr_t rpc_pdu_header_init(const rdpRpc* rpc); diff --git a/libfreerdp/core/gateway/rpc_client.c b/libfreerdp/core/gateway/rpc_client.c index b4c249006..30dff4733 100644 --- a/libfreerdp/core/gateway/rpc_client.c +++ b/libfreerdp/core/gateway/rpc_client.c @@ -84,26 +84,6 @@ static const char* rpc_client_state_str(RPC_CLIENT_STATE state) return str; } -static const char* vc_state_str(VIRTUAL_CONNECTION_STATE state) -{ - switch (state) - { - case VIRTUAL_CONNECTION_STATE_INITIAL: - return "VIRTUAL_CONNECTION_STATE_INITIAL"; - case VIRTUAL_CONNECTION_STATE_OUT_CHANNEL_WAIT: - return "VIRTUAL_CONNECTION_STATE_OUT_CHANNEL_WAIT"; - case VIRTUAL_CONNECTION_STATE_WAIT_A3W: - return "VIRTUAL_CONNECTION_STATE_WAIT_A3W"; - case VIRTUAL_CONNECTION_STATE_WAIT_C2: - return "VIRTUAL_CONNECTION_STATE_WAIT_C2"; - case VIRTUAL_CONNECTION_STATE_OPENED: - return "VIRTUAL_CONNECTION_STATE_OPENED"; - case VIRTUAL_CONNECTION_STATE_FINAL: - return "VIRTUAL_CONNECTION_STATE_FINAL"; - default: - return "VIRTUAL_CONNECTION_STATE_UNKNOWN"; - } -} static void rpc_pdu_reset(RPC_PDU* pdu) { pdu->Type = 0; @@ -212,7 +192,7 @@ static int rpc_client_recv_pdu_int(rdpRpc* rpc, RPC_PDU* pdu) rdpTsg* tsg = transport_get_tsg(rpc->transport); - WLog_VRB(TAG, "state %s", vc_state_str(rpc->State)); + WLog_VRB(TAG, "state %s", rpc_vc_state_str(rpc->State)); if (rpc->VirtualConnection->State < VIRTUAL_CONNECTION_STATE_OPENED) { if (rts_match_pdu_signature_ex(&RTS_PDU_PING_SIGNATURE, pdu->s, NULL, &found))