jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added CHANNEL_NAME_LEN to ms-rdpbcgr.h

Browse Source
This commit is contained in:
matt335672 2020-04-27 15:01:56 +01:00
parent 617283eb34
commit aa0dbbae15
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/ms-rdpbcgr.h
View File

@ -74,8 +74,11 @@
#define CONNECTION_TYPE_LAN 0x06 #define CONNECTION_TYPE_LAN 0x06
#define CONNECTION_TYPE_AUTODETECT 0x07 #define CONNECTION_TYPE_AUTODETECT 0x07
/* Virtual channel options */ /* Channel definition structure CHANNEL_DEF (2.2.1.3.4.1) */
/* Channel Definition Structure: options (2.2.1.3.4.1) */ /* This isn't explicitly named in MS-RDPBCGR */
#define CHANNEL_NAME_LEN 7
/* Oprions field */
/* NOTE: XR_ prefixed to avoid conflict with FreeRDP */ /* NOTE: XR_ prefixed to avoid conflict with FreeRDP */
#define XR_CHANNEL_OPTION_INITIALIZED 0x80000000 #define XR_CHANNEL_OPTION_INITIALIZED 0x80000000
#define XR_CHANNEL_OPTION_ENCRYPT_RDP 0x40000000 #define XR_CHANNEL_OPTION_ENCRYPT_RDP 0x40000000

7
sesman/chansrv/chansrv.c
View File

@ -39,7 +39,8 @@
#include "xrdp_sockets.h" #include "xrdp_sockets.h"
#include "audin.h" #include "audin.h"
#define CHANNEL_NAME_BYTES 7 #include "ms-rdpbcgr.h"
#define MAX_PATH 260 #define MAX_PATH 260
static struct trans *g_lis_trans = 0; static struct trans *g_lis_trans = 0;
@ -1047,10 +1048,10 @@ my_api_trans_data_in(struct trans *trans)
int ver; int ver;
struct chansrv_drdynvc_procs procs; struct chansrv_drdynvc_procs procs;
/* /*
* Name is limited to CHANNEL_NAME_BYTES for an SVC, or MAX_PATH * Name is limited to CHANNEL_NAME_LEN for an SVC, or MAX_PATH
* bytes for a DVC * bytes for a DVC
*/ */
char chan_name[MAX(CHANNEL_NAME_BYTES, MAX_PATH) + 1]; char chan_name[MAX(CHANNEL_NAME_LEN, MAX_PATH) + 1];
unsigned int channel_name_bytes; unsigned int channel_name_bytes;
//g_writeln("my_api_trans_data_in: extra_flags %d", trans->extra_flags); //g_writeln("my_api_trans_data_in: extra_flags %d", trans->extra_flags);