diff options
| author | speidy <speidy@gmail.com> | 2016-11-29 00:49:29 -0500 |
|---|---|---|
| committer | speidy <speidy@gmail.com> | 2016-11-29 15:25:14 -0500 |
| commit | 1fe048b63d85641687de7e2eb539a74ac850be5d (patch) | |
| tree | 2e4e3e5e746cbbf56be26609aa2f8f8af3b8a908 /common | |
| parent | 5fbcaf1655edc3cc9734c4e785902c4ff6c5bf40 (diff) | |
| download | xrdp-proprietary-1fe048b63d85641687de7e2eb539a74ac850be5d.tar.gz xrdp-proprietary-1fe048b63d85641687de7e2eb539a74ac850be5d.zip | |
xrdp_encoder: do not initialize for non-UNIX rdp clients
xrdp_encoder: comment about temporary workaround
Diffstat (limited to 'common')
| -rw-r--r-- | common/xrdp_client_info.h | 3 | ||||
| -rw-r--r-- | common/xrdp_constants.h | 37 |
2 files changed, 22 insertions, 18 deletions
diff --git a/common/xrdp_client_info.h b/common/xrdp_client_info.h index 46589e30..254708f1 100644 --- a/common/xrdp_client_info.h +++ b/common/xrdp_client_info.h @@ -145,6 +145,9 @@ struct xrdp_client_info int disableSSLv3; /* 0 = no, 1 = yes */ char tls_ciphers[64]; + + int client_os_major; + int client_os_minor; }; #endif diff --git a/common/xrdp_constants.h b/common/xrdp_constants.h index f034a293..7dcb3064 100644 --- a/common/xrdp_constants.h +++ b/common/xrdp_constants.h @@ -217,8 +217,25 @@ /* RDP capabilities */ #define RDP_CAPSET_GENERAL 1 #define RDP_CAPLEN_GENERAL 0x18 -#define OS_MAJOR_TYPE_UNIX 4 -#define OS_MINOR_TYPE_XSERVER 7 +#define OSMAJORTYPE_UNSPECIFIED 0x0000 +#define OSMAJORTYPE_WINDOWS 0x0001 +#define OSMAJORTYPE_OS2 0x0002 +#define OSMAJORTYPE_MACINTOSH 0x0003 +#define OSMAJORTYPE_UNIX 0x0004 +#define OSMAJORTYPE_IOS 0x0005 +#define OSMAJORTYPE_OSX 0x0006 +#define OSMAJORTYPE_ANDROID 0x0007 +#define OSMAJORTYPE_CHROME_OS 0x0008 +#define OSMINORTYPE_UNSPECIFIED 0x0000 +#define OSMINORTYPE_WINDOWS_31X 0x0001 +#define OSMINORTYPE_WINDOWS_95 0x0002 +#define OSMINORTYPE_WINDOWS_NT 0x0003 +#define OSMINORTYPE_OS2_V21 0x0004 +#define OSMINORTYPE_POWER_PC 0x0005 +#define OSMINORTYPE_MACINTOSH 0x0006 +#define OSMINORTYPE_NATIVE_XSERVER 0x0007 +#define OSMINORTYPE_PSEUDO_XSERVER 0x0008 +#define OSMINORTYPE_WINDOWS_RT 0x0009 #define RDP_CAPSET_BITMAP 2 #define RDP_CAPLEN_BITMAP 0x1C @@ -499,22 +516,6 @@ #define CB_ITEMCHANGE 300 -#define OSMAJORTYPE_UNSPECIFIED 0x0000 -#define OSMAJORTYPE_WINDOWS 0x0001 -#define OSMAJORTYPE_OS2 0x0002 -#define OSMAJORTYPE_MACINTOSH 0x0003 -#define OSMAJORTYPE_UNIX 0x0004 - -#define OSMINORTYPE_UNSPECIFIED 0x0000 -#define OSMINORTYPE_WINDOWS_31X 0x0001 -#define TS_OSMINORTYPE_WINDOWS_95 0x0002 -#define TS_OSMINORTYPE_WINDOWS_NT 0x0003 -#define TS_OSMINORTYPE_OS2_V21 0x0004 - -#define TS_OSMINORTYPE_POWER_PC 0x0005 -#define TS_OSMINORTYPE_MACINTOSH 0x0006 -#define TS_OSMINORTYPE_NATIVE_XSERVER 0x0007 -#define TS_OSMINORTYPE_PSEUDO_XSERVER 0x0008 #define TS_CAPS_PROTOCOLVERSION 0x0200 #define FASTPATH_OUTPUT_SUPPORTED 0x0001 |