From 0e7844ab02f3a513acf3fcbf557b388f3601486f Mon Sep 17 00:00:00 2001 From: Koichiro IWAO Date: Mon, 5 Jun 2017 16:31:09 +0900 Subject: [PATCH] Constify MCS connectionType --- common/xrdp_constants.h | 9 +++++++++ xrdp/xrdp_encoder.c | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/common/xrdp_constants.h b/common/xrdp_constants.h index 961020ef..4539c244 100644 --- a/common/xrdp_constants.h +++ b/common/xrdp_constants.h @@ -77,6 +77,15 @@ #define MCS_GLOBAL_CHANNEL 1003 #define MCS_USERCHANNEL_BASE 1001 +/* MCS Connection Type (MS-RDPBCGR 2.2.1.3.2) */ +#define CONNECTION_TYPE_MODEM 0x01 +#define CONNECTION_TYPE_BROADBAND_LOW 0x02 +#define CONNECTION_TYPE_SATELLITE 0x03 +#define CONNECTION_TYPE_BROADBAND_HIGH 0x04 +#define CONNECTION_TYPE_WAN 0x05 +#define CONNECTION_TYPE_LAN 0x06 +#define CONNECTION_TYPE_AUTODETECT 0x07 + /* RDP secure transport constants */ #define SEC_RANDOM_SIZE 32 #define SEC_MODULUS_SIZE 64 diff --git a/xrdp/xrdp_encoder.c b/xrdp/xrdp_encoder.c index d5df5085..4d80214e 100644 --- a/xrdp/xrdp_encoder.c +++ b/xrdp/xrdp_encoder.c @@ -66,7 +66,7 @@ xrdp_encoder_create(struct xrdp_mm *mm) client_info = mm->wm->client_info; - if (client_info->mcs_connection_type != 6) /* LAN */ + if (client_info->mcs_connection_type != CONNECTION_TYPE_LAN) { return 0; }