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

no logic change, convert tabs to spaces

Browse Source
This commit is contained in:
Jay Sorg 2014-08-05 11:59:52 -07:00
parent 59bba82f67
commit 821bf3e2a5
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libxrdp/xrdp_mcs.c
View File

@ -945,18 +945,18 @@ xrdp_mcs_incoming(struct xrdp_mcs *self)
return 1; return 1;
} }
for (i = 0 ; i < self->channel_list->count + 2 ; i++) for (i = 0; i < self->channel_list->count + 2; i++)
{ {
if (xrdp_mcs_recv_cjrq(self) != 0) if (xrdp_mcs_recv_cjrq(self) != 0)
{ {
return 1; return 1;
} }
if (xrdp_mcs_send_cjcf(self, self->userid, if (xrdp_mcs_send_cjcf(self, self->userid,
self->userid + MCS_USERCHANNEL_BASE + i) != 0) self->userid + MCS_USERCHANNEL_BASE + i) != 0)
{ {
return 1; return 1;
} }
} }
DEBUG((" out xrdp_mcs_incoming")); DEBUG((" out xrdp_mcs_incoming"));
@ -1085,7 +1085,7 @@ close_rdp_socket(struct xrdp_mcs *self)
{ {
if (self->iso_layer->trans != 0) if (self->iso_layer->trans != 0)
{ {
trans_shutdown_tls_mode(self->iso_layer->trans); trans_shutdown_tls_mode(self->iso_layer->trans);
g_tcp_close(self->iso_layer->trans->sck); g_tcp_close(self->iso_layer->trans->sck);
self->iso_layer->trans->sck = 0 ; self->iso_layer->trans->sck = 0 ;
g_writeln("xrdp_mcs_disconnect - socket closed"); g_writeln("xrdp_mcs_disconnect - socket closed");
@ -1108,7 +1108,7 @@ xrdp_mcs_disconnect(struct xrdp_mcs *self)
if (xrdp_iso_init(self->iso_layer, s) != 0) if (xrdp_iso_init(self->iso_layer, s) != 0)
{ {
free_stream(s); free_stream(s);
close_rdp_socket(self); close_rdp_socket(self);
DEBUG((" out xrdp_mcs_disconnect error - 1")); DEBUG((" out xrdp_mcs_disconnect error - 1"));
return 1; return 1;

17
libxrdp/xrdp_sec.c
View File

@ -1210,14 +1210,14 @@ xrdp_sec_recv(struct xrdp_sec *self, struct stream *s, int *chan)
However, client info packet and license packet always have security header. */ However, client info packet and license packet always have security header. */
if (s->data[17] == 0x13) /* confirm active pdu */ if (s->data[17] == 0x13) /* confirm active pdu */
{ {
g_writeln("CONFIRM ACTIVE ARRIVED"); g_writeln("CONFIRM ACTIVE ARRIVED");
return 0; return 0;
} }
if (s->data[17] == 0x17 || s->data[16] == 0x17) /* rdp data pdu */ if (s->data[17] == 0x17 || s->data[16] == 0x17) /* rdp data pdu */
{ {
g_writeln("RDP DATA ARRIVED"); g_writeln("RDP DATA ARRIVED");
return 0; return 0;
} }
in_uint32_le(s, flags); in_uint32_le(s, flags);
@ -2096,7 +2096,7 @@ xrdp_sec_init_rdp_security(struct xrdp_sec *self)
} }
else else
{ {
self->decrypt_rc4_info = ssl_rc4_info_create(); self->decrypt_rc4_info = ssl_rc4_info_create();
} }
if (self->encrypt_rc4_info != NULL) if (self->encrypt_rc4_info != NULL)
@ -2105,11 +2105,12 @@ xrdp_sec_init_rdp_security(struct xrdp_sec *self)
} }
else else
{ {
self->encrypt_rc4_info = ssl_rc4_info_create(); self->encrypt_rc4_info = ssl_rc4_info_create();
} }
return 0; return 0;
} }
/*****************************************************************************/ /*****************************************************************************/
int APP_CC int APP_CC
xrdp_sec_incoming(struct xrdp_sec *self) xrdp_sec_incoming(struct xrdp_sec *self)
@ -2153,7 +2154,7 @@ xrdp_sec_incoming(struct xrdp_sec *self)
} }
else else
{ {
/* init rdp security */ /* init rdp security */
DEBUG((" in xrdp_sec_incoming: init rdp security")); DEBUG((" in xrdp_sec_incoming: init rdp security"));
if (xrdp_sec_init_rdp_security(self) != 0) if (xrdp_sec_init_rdp_security(self) != 0)
{ {