kekePower/rdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added 4 new disconnect reasons with corresponding return code.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/rdesktop/trunk@1742 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
Henrik Andersson 2013-09-17 14:48:56 +00:00
parent 4bc4e5b473
commit d74b2d4278
3 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
constants.h
View File

@ -454,7 +454,10 @@ enum RDP_INPUT_DEVICE
#define exDiscReasonOutOfMemory 0x0006 #define exDiscReasonOutOfMemory 0x0006
#define exDiscReasonServerDeniedConnection 0x0007 #define exDiscReasonServerDeniedConnection 0x0007
#define exDiscReasonServerDeniedConnectionFips 0x0008 #define exDiscReasonServerDeniedConnectionFips 0x0008
#define exDiscReasonWindows7Disconnect 0x000b /* unofficial */ #define exDiscReasonServerInsufficientPrivileges 0x0009
#define exDiscReasonServerFreshCredentialsRequired 0x000a
#define exDiscReasonRPCInitiatedDisconnectByUser 0x000b
#define exDiscReasonByUser 0x000c
#define exDiscReasonLicenseInternal 0x0100 #define exDiscReasonLicenseInternal 0x0100
#define exDiscReasonLicenseNoLicenseServer 0x0101 #define exDiscReasonLicenseNoLicenseServer 0x0101
#define exDiscReasonLicenseNoLicense 0x0102 #define exDiscReasonLicenseNoLicense 0x0102

21
rdesktop.c
View File

@ -281,7 +281,6 @@ handle_disconnect_reason(RD_BOOL deactivated, uint16 reason)
break; break;
case exDiscReasonAPIInitiatedDisconnect: case exDiscReasonAPIInitiatedDisconnect:
case exDiscReasonWindows7Disconnect:
text = "Server initiated disconnect"; text = "Server initiated disconnect";
retval = EXRD_API_DISCONNECT; retval = EXRD_API_DISCONNECT;
break; break;
@ -321,6 +320,26 @@ handle_disconnect_reason(RD_BOOL deactivated, uint16 reason)
retval = EXRD_DENIED_FIPS; retval = EXRD_DENIED_FIPS;
break; break;
case exDiscReasonServerInsufficientPrivileges:
text = "The user cannot connect to the server due to insufficient access privileges.";
retval = EXRD_INSUFFICIENT_PRIVILEGES;
break;
case exDiscReasonServerFreshCredentialsRequired:
text = "The server does not accept saved user credentials and requires that the user enter their credentials for each connection.";
retval = EXRD_FRESH_CREDENTIALS_REQUIRED;
break;
case exDiscReasonRPCInitiatedDisconnectByUser:
text = "Disconnect initiated by administration tool";
retval = EXRD_RPC_DISCONNECT_BY_USER;
break;
case exDiscReasonByUser:
text = "Disconnect initiated by user";
retval = EXRD_DISCONNECT_BY_USER;
break;
case exDiscReasonLicenseInternal: case exDiscReasonLicenseInternal:
text = "Internal licensing error"; text = "Internal licensing error";
retval = EXRD_LIC_INTERNAL; retval = EXRD_LIC_INTERNAL;

4
rdesktop.h
View File

@ -100,6 +100,10 @@
#define EXRD_OUT_OF_MEM 6 #define EXRD_OUT_OF_MEM 6
#define EXRD_DENIED 7 #define EXRD_DENIED 7
#define EXRD_DENIED_FIPS 8 #define EXRD_DENIED_FIPS 8
#define EXRD_INSUFFICIENT_PRIVILEGES 9
#define EXRD_FRESH_CREDENTIALS_REQUIRED 10
#define EXRD_RPC_DISCONNECT_BY_USER 11
#define EXRD_DISCONNECT_BY_USER 12
#define EXRD_LIC_INTERNAL 16 #define EXRD_LIC_INTERNAL 16
#define EXRD_LIC_NOSERVER 17 #define EXRD_LIC_NOSERVER 17
#define EXRD_LIC_NOLICENSE 18 #define EXRD_LIC_NOLICENSE 18