adding g_ prefix to global vars, mcs.c done
git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@380 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
parent
599062c6a0
commit
63c4677522
14
mcs.c
14
mcs.c
@ -20,7 +20,7 @@
|
||||
|
||||
#include "rdesktop.h"
|
||||
|
||||
uint16 mcs_userid;
|
||||
uint16 g_mcs_userid;
|
||||
extern BOOL use_rdp5;
|
||||
|
||||
/* Parse an ASN.1 BER header */
|
||||
@ -177,7 +177,7 @@ mcs_recv_connect_response(STREAM mcs_data)
|
||||
/*
|
||||
if (length > mcs_data->size)
|
||||
{
|
||||
error("MCS data length %d, expected %d\n", length,
|
||||
error("MCS data length %d, expected %d\n", length,
|
||||
mcs_data->size);
|
||||
length = mcs_data->size;
|
||||
}
|
||||
@ -259,7 +259,7 @@ mcs_send_cjrq(uint16 chanid)
|
||||
s = iso_init(5);
|
||||
|
||||
out_uint8(s, (MCS_CJRQ << 2));
|
||||
out_uint16_be(s, mcs_userid);
|
||||
out_uint16_be(s, g_mcs_userid);
|
||||
out_uint16_be(s, chanid);
|
||||
|
||||
s_mark_end(s);
|
||||
@ -321,7 +321,7 @@ mcs_send(STREAM s)
|
||||
length |= 0x8000;
|
||||
|
||||
out_uint8(s, (MCS_SDRQ << 2));
|
||||
out_uint16_be(s, mcs_userid);
|
||||
out_uint16_be(s, g_mcs_userid);
|
||||
out_uint16_be(s, MCS_GLOBAL_CHANNEL);
|
||||
out_uint8(s, 0x70); /* flags */
|
||||
out_uint16_be(s, length);
|
||||
@ -375,10 +375,10 @@ mcs_connect(char *server, STREAM mcs_data, char *username)
|
||||
mcs_send_edrq();
|
||||
|
||||
mcs_send_aurq();
|
||||
if (!mcs_recv_aucf(&mcs_userid))
|
||||
if (!mcs_recv_aucf(&g_mcs_userid))
|
||||
goto error;
|
||||
|
||||
mcs_send_cjrq(mcs_userid + 1001);
|
||||
mcs_send_cjrq(g_mcs_userid + 1001);
|
||||
if (!mcs_recv_cjcf())
|
||||
goto error;
|
||||
|
||||
@ -388,7 +388,7 @@ mcs_connect(char *server, STREAM mcs_data, char *username)
|
||||
|
||||
if (use_rdp5)
|
||||
{
|
||||
/* Note: If we send this cjrq after telling the server we support RDP4 only,
|
||||
/* Note: If we send this cjrq after telling the server we support RDP4 only,
|
||||
the server won't respond with a cjcf and we will hang. */
|
||||
mcs_send_cjrq(MCS_GLOBAL_CHANNEL + 1); /* hack - clipboard */
|
||||
if (!mcs_recv_cjcf())
|
||||
|
6
rdp.c
6
rdp.c
@ -20,7 +20,7 @@
|
||||
|
||||
#include "rdesktop.h"
|
||||
|
||||
extern uint16 mcs_userid;
|
||||
extern uint16 g_mcs_userid;
|
||||
extern char username[16];
|
||||
extern BOOL bitmap_compression;
|
||||
extern BOOL orders;
|
||||
@ -100,7 +100,7 @@ rdp_send_data(STREAM s, uint8 data_pdu_type)
|
||||
|
||||
out_uint16_le(s, length);
|
||||
out_uint16_le(s, (RDP_PDU_DATA | 0x10));
|
||||
out_uint16_le(s, (mcs_userid + 1001));
|
||||
out_uint16_le(s, (g_mcs_userid + 1001));
|
||||
|
||||
out_uint32_le(s, rdp_shareid);
|
||||
out_uint8(s, 0); /* pad */
|
||||
@ -552,7 +552,7 @@ rdp_send_confirm_active(void)
|
||||
|
||||
out_uint16_le(s, 2 + 14 + caplen + sizeof(RDP_SOURCE));
|
||||
out_uint16_le(s, (RDP_PDU_CONFIRM_ACTIVE | 0x10)); /* Version 1 */
|
||||
out_uint16_le(s, (mcs_userid + 1001));
|
||||
out_uint16_le(s, (g_mcs_userid + 1001));
|
||||
|
||||
out_uint32_le(s, rdp_shareid);
|
||||
out_uint16_le(s, 0x3ea); /* userid */
|
||||
|
Loading…
Reference in New Issue
Block a user