From 4386f49746b937c4401cebc3c7a4fade719d6b5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= Date: Sun, 28 Apr 2013 20:40:49 -0400 Subject: [PATCH] libfreerdp-core: add client hook for OnErrorInfo --- include/freerdp/client.h | 2 + include/freerdp/error.h | 104 ++++++++++++++++++++++++++++++++++++++ libfreerdp/core/errinfo.h | 100 ------------------------------------ libfreerdp/core/rdp.c | 6 +++ libfreerdp/core/rdp.h | 4 +- 5 files changed, 114 insertions(+), 102 deletions(-) diff --git a/include/freerdp/client.h b/include/freerdp/client.h index 9963d06c3..0cfbe5d29 100644 --- a/include/freerdp/client.h +++ b/include/freerdp/client.h @@ -37,11 +37,13 @@ extern "C" { typedef void (*pOnResizeWindow)(freerdp* instance, int width, int height); typedef void (*pOnWindowStateChange)(freerdp* instance, int state); +typedef void (*pOnErrorInfo)(freerdp* instance, UINT32 code); struct rdp_client { pOnResizeWindow OnResizeWindow; pOnWindowStateChange OnWindowStateChange; + pOnErrorInfo OnErrorInfo; }; /** diff --git a/include/freerdp/error.h b/include/freerdp/error.h index 0bb673956..27d54886a 100644 --- a/include/freerdp/error.h +++ b/include/freerdp/error.h @@ -24,6 +24,110 @@ extern "C" { #endif +/** + * Error Info Codes (Error Info PDU) + */ + +/* Protocol-independent codes */ +#define ERRINFO_RPC_INITIATED_DISCONNECT 0x00000001 +#define ERRINFO_RPC_INITIATED_LOGOFF 0x00000002 +#define ERRINFO_IDLE_TIMEOUT 0x00000003 +#define ERRINFO_LOGON_TIMEOUT 0x00000004 +#define ERRINFO_DISCONNECTED_BY_OTHER_CONNECTION 0x00000005 +#define ERRINFO_OUT_OF_MEMORY 0x00000006 +#define ERRINFO_SERVER_DENIED_CONNECTION 0x00000007 +#define ERRINFO_SERVER_INSUFFICIENT_PRIVILEGES 0x00000009 +#define ERRINFO_SERVER_FRESH_CREDENTIALS_REQUIRED 0x0000000A +#define ERRINFO_RPC_INITIATED_DISCONNECT_BY_USER 0x0000000B +#define ERRINFO_LOGOFF_BY_USER 0x0000000C + +/* Protocol-independent licensing codes */ +#define ERRINFO_LICENSE_INTERNAL 0x00000100 +#define ERRINFO_LICENSE_NO_LICENSE_SERVER 0x00000101 +#define ERRINFO_LICENSE_NO_LICENSE 0x00000102 +#define ERRINFO_LICENSE_BAD_CLIENT_MSG 0x00000103 +#define ERRINFO_LICENSE_HWID_DOESNT_MATCH_LICENSE 0x00000104 +#define ERRINFO_LICENSE_BAD_CLIENT_LICENSE 0x00000105 +#define ERRINFO_LICENSE_CANT_FINISH_PROTOCOL 0x00000106 +#define ERRINFO_LICENSE_CLIENT_ENDED_PROTOCOL 0x00000107 +#define ERRINFO_LICENSE_BAD_CLIENT_ENCRYPTION 0x00000108 +#define ERRINFO_LICENSE_CANT_UPGRADE_LICENSE 0x00000109 +#define ERRINFO_LICENSE_NO_REMOTE_CONNECTIONS 0x0000010A + +/* RDP specific codes */ +#define ERRINFO_UNKNOWN_DATA_PDU_TYPE 0x000010C9 +#define ERRINFO_UNKNOWN_PDU_TYPE 0x000010CA +#define ERRINFO_DATA_PDU_SEQUENCE 0x000010CB +#define ERRINFO_CONTROL_PDU_SEQUENCE 0x000010CD +#define ERRINFO_INVALID_CONTROL_PDU_ACTION 0x000010CE +#define ERRINFO_INVALID_INPUT_PDU_TYPE 0x000010CF +#define ERRINFO_INVALID_INPUT_PDU_MOUSE 0x000010D0 +#define ERRINFO_INVALID_REFRESH_RECT_PDU 0x000010D1 +#define ERRINFO_CREATE_USER_DATA_FAILED 0x000010D2 +#define ERRINFO_CONNECT_FAILED 0x000010D3 +#define ERRINFO_CONFIRM_ACTIVE_HAS_WRONG_SHAREID 0x000010D4 +#define ERRINFO_CONFIRM_ACTIVE_HAS_WRONG_ORIGINATOR 0x000010D5 +#define ERRINFO_PERSISTENT_KEY_PDU_BAD_LENGTH 0x000010DA +#define ERRINFO_PERSISTENT_KEY_PDU_ILLEGAL_FIRST 0x000010DB +#define ERRINFO_PERSISTENT_KEY_PDU_TOO_MANY_TOTAL_KEYS 0x000010DC +#define ERRINFO_PERSISTENT_KEY_PDU_TOO_MANY_CACHE_KEYS 0x000010DD +#define ERRINFO_INPUT_PDU_BAD_LENGTH 0x000010DE +#define ERRINFO_BITMAP_CACHE_ERROR_PDU_BAD_LENGTH 0x000010DF +#define ERRINFO_SECURITY_DATA_TOO_SHORT 0x000010E0 +#define ERRINFO_VCHANNEL_DATA_TOO_SHORT 0x000010E1 +#define ERRINFO_SHARE_DATA_TOO_SHORT 0x000010E2 +#define ERRINFO_BAD_SUPPRESS_OUTPUT_PDU 0x000010E3 +#define ERRINFO_CONFIRM_ACTIVE_PDU_TOO_SHORT 0x000010E5 +#define ERRINFO_CAPABILITY_SET_TOO_SMALL 0x000010E7 +#define ERRINFO_CAPABILITY_SET_TOO_LARGE 0x000010E8 +#define ERRINFO_NO_CURSOR_CACHE 0x000010E9 +#define ERRINFO_BAD_CAPABILITIES 0x000010EA +#define ERRINFO_VIRTUAL_CHANNEL_DECOMPRESSION 0x000010EC +#define ERRINFO_INVALID_VC_COMPRESSION_TYPE 0x000010ED +#define ERRINFO_INVALID_CHANNEL_ID 0x000010EF +#define ERRINFO_VCHANNELS_TOO_MANY 0x000010F0 +#define ERRINFO_REMOTEAPP_NOT_ENABLED 0x000010F3 +#define ERRINFO_CACHE_CAP_NOT_SET 0x000010F4 +#define ERRINFO_BITMAP_CACHE_ERROR_PDU_BAD_LENGTH2 0x000010F5 +#define ERRINFO_OFFSCREEN_CACHE_ERROR_PDU_BAD_LENGTH 0x000010F6 +#define ERRINFO_DRAWNINEGRID_CACHE_ERROR_PDU_BAD_LENGTH 0x000010F7 +#define ERRINFO_GDIPLUS_PDU_BAD_LENGTH 0x000010F8 +#define ERRINFO_SECURITY_DATA_TOO_SHORT2 0x00001111 +#define ERRINFO_SECURITY_DATA_TOO_SHORT3 0x00001112 +#define ERRINFO_SECURITY_DATA_TOO_SHORT4 0x00001113 +#define ERRINFO_SECURITY_DATA_TOO_SHORT5 0x00001114 +#define ERRINFO_SECURITY_DATA_TOO_SHORT6 0x00001115 +#define ERRINFO_SECURITY_DATA_TOO_SHORT7 0x00001116 +#define ERRINFO_SECURITY_DATA_TOO_SHORT8 0x00001117 +#define ERRINFO_SECURITY_DATA_TOO_SHORT9 0x00001118 +#define ERRINFO_SECURITY_DATA_TOO_SHORT10 0x00001119 +#define ERRINFO_SECURITY_DATA_TOO_SHORT11 0x0000111A +#define ERRINFO_SECURITY_DATA_TOO_SHORT12 0x0000111B +#define ERRINFO_SECURITY_DATA_TOO_SHORT13 0x0000111C +#define ERRINFO_SECURITY_DATA_TOO_SHORT14 0x0000111D +#define ERRINFO_SECURITY_DATA_TOO_SHORT15 0x0000111E +#define ERRINFO_SECURITY_DATA_TOO_SHORT16 0x0000111F +#define ERRINFO_SECURITY_DATA_TOO_SHORT17 0x00001120 +#define ERRINFO_SECURITY_DATA_TOO_SHORT18 0x00001121 +#define ERRINFO_SECURITY_DATA_TOO_SHORT19 0x00001122 +#define ERRINFO_SECURITY_DATA_TOO_SHORT20 0x00001123 +#define ERRINFO_SECURITY_DATA_TOO_SHORT21 0x00001124 +#define ERRINFO_SECURITY_DATA_TOO_SHORT22 0x00001125 +#define ERRINFO_SECURITY_DATA_TOO_SHORT23 0x00001126 +#define ERRINFO_BAD_MONITOR_DATA 0x00001129 +#define ERRINFO_VC_DECOMPRESSED_REASSEMBLE_FAILED 0x0000112A +#define ERRINFO_VC_DATA_TOO_LONG 0x0000112B +#define ERRINFO_GRAPHICS_MODE_NOT_SUPPORTED 0x0000112D +#define ERRINFO_GRAPHICS_SUBSYSTEM_RESET_FAILED 0x0000112E +#define ERRINFO_UPDATE_SESSION_KEY_FAILED 0x00001191 +#define ERRINFO_DECRYPT_FAILED 0x00001192 +#define ERRINFO_ENCRYPT_FAILED 0x00001193 +#define ERRINFO_ENCRYPTION_PACKAGE_MISMATCH 0x00001194 +#define ERRINFO_DECRYPT_FAILED2 0x00001195 + +#define ERRINFO_SUCCESS 0x00000000 +#define ERRINFO_NONE 0xFFFFFFFF + /** * This static variable holds an error code if the return value from connect is FALSE. * This variable is always set to 0 in the beginning of the connect sequence. diff --git a/libfreerdp/core/errinfo.h b/libfreerdp/core/errinfo.h index aab6ff340..54c1ee7d6 100644 --- a/libfreerdp/core/errinfo.h +++ b/libfreerdp/core/errinfo.h @@ -22,106 +22,6 @@ #include -/* Protocol-independent codes */ -#define ERRINFO_RPC_INITIATED_DISCONNECT 0x00000001 -#define ERRINFO_RPC_INITIATED_LOGOFF 0x00000002 -#define ERRINFO_IDLE_TIMEOUT 0x00000003 -#define ERRINFO_LOGON_TIMEOUT 0x00000004 -#define ERRINFO_DISCONNECTED_BY_OTHER_CONNECTION 0x00000005 -#define ERRINFO_OUT_OF_MEMORY 0x00000006 -#define ERRINFO_SERVER_DENIED_CONNECTION 0x00000007 -#define ERRINFO_SERVER_INSUFFICIENT_PRIVILEGES 0x00000009 -#define ERRINFO_SERVER_FRESH_CREDENTIALS_REQUIRED 0x0000000A -#define ERRINFO_RPC_INITIATED_DISCONNECT_BY_USER 0x0000000B -#define ERRINFO_LOGOFF_BY_USER 0x0000000C - -/* Protocol-independent licensing codes */ -#define ERRINFO_LICENSE_INTERNAL 0x00000100 -#define ERRINFO_LICENSE_NO_LICENSE_SERVER 0x00000101 -#define ERRINFO_LICENSE_NO_LICENSE 0x00000102 -#define ERRINFO_LICENSE_BAD_CLIENT_MSG 0x00000103 -#define ERRINFO_LICENSE_HWID_DOESNT_MATCH_LICENSE 0x00000104 -#define ERRINFO_LICENSE_BAD_CLIENT_LICENSE 0x00000105 -#define ERRINFO_LICENSE_CANT_FINISH_PROTOCOL 0x00000106 -#define ERRINFO_LICENSE_CLIENT_ENDED_PROTOCOL 0x00000107 -#define ERRINFO_LICENSE_BAD_CLIENT_ENCRYPTION 0x00000108 -#define ERRINFO_LICENSE_CANT_UPGRADE_LICENSE 0x00000109 -#define ERRINFO_LICENSE_NO_REMOTE_CONNECTIONS 0x0000010A - -/* RDP specific codes */ -#define ERRINFO_UNKNOWN_DATA_PDU_TYPE 0x000010C9 -#define ERRINFO_UNKNOWN_PDU_TYPE 0x000010CA -#define ERRINFO_DATA_PDU_SEQUENCE 0x000010CB -#define ERRINFO_CONTROL_PDU_SEQUENCE 0x000010CD -#define ERRINFO_INVALID_CONTROL_PDU_ACTION 0x000010CE -#define ERRINFO_INVALID_INPUT_PDU_TYPE 0x000010CF -#define ERRINFO_INVALID_INPUT_PDU_MOUSE 0x000010D0 -#define ERRINFO_INVALID_REFRESH_RECT_PDU 0x000010D1 -#define ERRINFO_CREATE_USER_DATA_FAILED 0x000010D2 -#define ERRINFO_CONNECT_FAILED 0x000010D3 -#define ERRINFO_CONFIRM_ACTIVE_HAS_WRONG_SHAREID 0x000010D4 -#define ERRINFO_CONFIRM_ACTIVE_HAS_WRONG_ORIGINATOR 0x000010D5 -#define ERRINFO_PERSISTENT_KEY_PDU_BAD_LENGTH 0x000010DA -#define ERRINFO_PERSISTENT_KEY_PDU_ILLEGAL_FIRST 0x000010DB -#define ERRINFO_PERSISTENT_KEY_PDU_TOO_MANY_TOTAL_KEYS 0x000010DC -#define ERRINFO_PERSISTENT_KEY_PDU_TOO_MANY_CACHE_KEYS 0x000010DD -#define ERRINFO_INPUT_PDU_BAD_LENGTH 0x000010DE -#define ERRINFO_BITMAP_CACHE_ERROR_PDU_BAD_LENGTH 0x000010DF -#define ERRINFO_SECURITY_DATA_TOO_SHORT 0x000010E0 -#define ERRINFO_VCHANNEL_DATA_TOO_SHORT 0x000010E1 -#define ERRINFO_SHARE_DATA_TOO_SHORT 0x000010E2 -#define ERRINFO_BAD_SUPPRESS_OUTPUT_PDU 0x000010E3 -#define ERRINFO_CONFIRM_ACTIVE_PDU_TOO_SHORT 0x000010E5 -#define ERRINFO_CAPABILITY_SET_TOO_SMALL 0x000010E7 -#define ERRINFO_CAPABILITY_SET_TOO_LARGE 0x000010E8 -#define ERRINFO_NO_CURSOR_CACHE 0x000010E9 -#define ERRINFO_BAD_CAPABILITIES 0x000010EA -#define ERRINFO_VIRTUAL_CHANNEL_DECOMPRESSION 0x000010EC -#define ERRINFO_INVALID_VC_COMPRESSION_TYPE 0x000010ED -#define ERRINFO_INVALID_CHANNEL_ID 0x000010EF -#define ERRINFO_VCHANNELS_TOO_MANY 0x000010F0 -#define ERRINFO_REMOTEAPP_NOT_ENABLED 0x000010F3 -#define ERRINFO_CACHE_CAP_NOT_SET 0x000010F4 -#define ERRINFO_BITMAP_CACHE_ERROR_PDU_BAD_LENGTH2 0x000010F5 -#define ERRINFO_OFFSCREEN_CACHE_ERROR_PDU_BAD_LENGTH 0x000010F6 -#define ERRINFO_DRAWNINEGRID_CACHE_ERROR_PDU_BAD_LENGTH 0x000010F7 -#define ERRINFO_GDIPLUS_PDU_BAD_LENGTH 0x000010F8 -#define ERRINFO_SECURITY_DATA_TOO_SHORT2 0x00001111 -#define ERRINFO_SECURITY_DATA_TOO_SHORT3 0x00001112 -#define ERRINFO_SECURITY_DATA_TOO_SHORT4 0x00001113 -#define ERRINFO_SECURITY_DATA_TOO_SHORT5 0x00001114 -#define ERRINFO_SECURITY_DATA_TOO_SHORT6 0x00001115 -#define ERRINFO_SECURITY_DATA_TOO_SHORT7 0x00001116 -#define ERRINFO_SECURITY_DATA_TOO_SHORT8 0x00001117 -#define ERRINFO_SECURITY_DATA_TOO_SHORT9 0x00001118 -#define ERRINFO_SECURITY_DATA_TOO_SHORT10 0x00001119 -#define ERRINFO_SECURITY_DATA_TOO_SHORT11 0x0000111A -#define ERRINFO_SECURITY_DATA_TOO_SHORT12 0x0000111B -#define ERRINFO_SECURITY_DATA_TOO_SHORT13 0x0000111C -#define ERRINFO_SECURITY_DATA_TOO_SHORT14 0x0000111D -#define ERRINFO_SECURITY_DATA_TOO_SHORT15 0x0000111E -#define ERRINFO_SECURITY_DATA_TOO_SHORT16 0x0000111F -#define ERRINFO_SECURITY_DATA_TOO_SHORT17 0x00001120 -#define ERRINFO_SECURITY_DATA_TOO_SHORT18 0x00001121 -#define ERRINFO_SECURITY_DATA_TOO_SHORT19 0x00001122 -#define ERRINFO_SECURITY_DATA_TOO_SHORT20 0x00001123 -#define ERRINFO_SECURITY_DATA_TOO_SHORT21 0x00001124 -#define ERRINFO_SECURITY_DATA_TOO_SHORT22 0x00001125 -#define ERRINFO_SECURITY_DATA_TOO_SHORT23 0x00001126 -#define ERRINFO_BAD_MONITOR_DATA 0x00001129 -#define ERRINFO_VC_DECOMPRESSED_REASSEMBLE_FAILED 0x0000112A -#define ERRINFO_VC_DATA_TOO_LONG 0x0000112B -#define ERRINFO_GRAPHICS_MODE_NOT_SUPPORTED 0x0000112D -#define ERRINFO_GRAPHICS_SUBSYSTEM_RESET_FAILED 0x0000112E -#define ERRINFO_UPDATE_SESSION_KEY_FAILED 0x00001191 -#define ERRINFO_DECRYPT_FAILED 0x00001192 -#define ERRINFO_ENCRYPT_FAILED 0x00001193 -#define ERRINFO_ENCRYPTION_PACKAGE_MISMATCH 0x00001194 -#define ERRINFO_DECRYPT_FAILED2 0x00001195 - -#define ERRINFO_SUCCESS 0x00000000 -#define ERRINFO_NONE 0xFFFFFFFF - struct _ERRINFO { UINT32 code; diff --git a/libfreerdp/core/rdp.c b/libfreerdp/core/rdp.c index d5ca4e2f9..e7f3f5e82 100644 --- a/libfreerdp/core/rdp.c +++ b/libfreerdp/core/rdp.c @@ -490,8 +490,14 @@ BOOL rdp_recv_set_error_info_data_pdu(rdpRdp* rdp, wStream* s) stream_read_UINT32(s, rdp->errorInfo); /* errorInfo (4 bytes) */ if (rdp->errorInfo != ERRINFO_SUCCESS) + { + rdpClient* client = rdp->instance->context->client; + rdp_print_errinfo(rdp->errorInfo); + IFCALL(client->OnErrorInfo, rdp->instance, rdp->errorInfo); + } + return TRUE; } diff --git a/libfreerdp/core/rdp.h b/libfreerdp/core/rdp.h index a8128c2ee..ef1668515 100644 --- a/libfreerdp/core/rdp.h +++ b/libfreerdp/core/rdp.h @@ -54,8 +54,8 @@ #define SEC_ENCRYPT 0x0008 #define SEC_RESET_SEQNO 0x0010 #define SEC_IGNORE_SEQNO 0x0020 -#define SEC_INFO_PKT 0x0040 -#define SEC_LICENSE_PKT 0x0080 +#define SEC_INFO_PKT 0x0040 +#define SEC_LICENSE_PKT 0x0080 #define SEC_LICENSE_ENCRYPT_CS 0x0200 #define SEC_LICENSE_ENCRYPT_SC 0x0200 #define SEC_REDIRECTION_PKT 0x0400