diff options
| author | Jay Sorg <jay.sorg@gmail.com> | 2014-08-05 11:59:52 -0700 |
|---|---|---|
| committer | Jay Sorg <jay.sorg@gmail.com> | 2014-08-05 11:59:52 -0700 |
| commit | 821bf3e2a58e7f8de641118e608f58517a1567fb (patch) | |
| tree | bf7dcb2744d87ba9ecb202db70d86dfd6aeba995 /libxrdp | |
| parent | 59bba82f672483330f97580c7921a08f193c6fa3 (diff) | |
| download | xrdp-proprietary-821bf3e2a58e7f8de641118e608f58517a1567fb.tar.gz xrdp-proprietary-821bf3e2a58e7f8de641118e608f58517a1567fb.zip | |
no logic change, convert tabs to spaces
Diffstat (limited to 'libxrdp')
| -rw-r--r-- | libxrdp/xrdp_mcs.c | 24 | ||||
| -rw-r--r-- | libxrdp/xrdp_sec.c | 17 |
2 files changed, 21 insertions, 20 deletions
diff --git a/libxrdp/xrdp_mcs.c b/libxrdp/xrdp_mcs.c index a15c2fce..d211b89c 100644 --- a/libxrdp/xrdp_mcs.c +++ b/libxrdp/xrdp_mcs.c @@ -945,18 +945,18 @@ xrdp_mcs_incoming(struct xrdp_mcs *self) 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) - { - return 1; - } + if (xrdp_mcs_recv_cjrq(self) != 0) + { + return 1; + } - if (xrdp_mcs_send_cjcf(self, self->userid, - self->userid + MCS_USERCHANNEL_BASE + i) != 0) - { - return 1; - } + if (xrdp_mcs_send_cjcf(self, self->userid, + self->userid + MCS_USERCHANNEL_BASE + i) != 0) + { + return 1; + } } DEBUG((" out xrdp_mcs_incoming")); @@ -1085,7 +1085,7 @@ close_rdp_socket(struct xrdp_mcs *self) { 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); self->iso_layer->trans->sck = 0 ; 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) { - free_stream(s); + free_stream(s); close_rdp_socket(self); DEBUG((" out xrdp_mcs_disconnect error - 1")); return 1; diff --git a/libxrdp/xrdp_sec.c b/libxrdp/xrdp_sec.c index 5a63afc8..faaf9133 100644 --- a/libxrdp/xrdp_sec.c +++ b/libxrdp/xrdp_sec.c @@ -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. */ if (s->data[17] == 0x13) /* confirm active pdu */ { - g_writeln("CONFIRM ACTIVE ARRIVED"); - return 0; + g_writeln("CONFIRM ACTIVE ARRIVED"); + return 0; } if (s->data[17] == 0x17 || s->data[16] == 0x17) /* rdp data pdu */ { - g_writeln("RDP DATA ARRIVED"); - return 0; + g_writeln("RDP DATA ARRIVED"); + return 0; } in_uint32_le(s, flags); @@ -2096,7 +2096,7 @@ xrdp_sec_init_rdp_security(struct xrdp_sec *self) } else { - self->decrypt_rc4_info = ssl_rc4_info_create(); + self->decrypt_rc4_info = ssl_rc4_info_create(); } if (self->encrypt_rc4_info != NULL) @@ -2105,11 +2105,12 @@ xrdp_sec_init_rdp_security(struct xrdp_sec *self) } else { - self->encrypt_rc4_info = ssl_rc4_info_create(); + self->encrypt_rc4_info = ssl_rc4_info_create(); } - return 0; + return 0; } + /*****************************************************************************/ int APP_CC xrdp_sec_incoming(struct xrdp_sec *self) @@ -2153,7 +2154,7 @@ xrdp_sec_incoming(struct xrdp_sec *self) } else { - /* init rdp security */ + /* init rdp security */ DEBUG((" in xrdp_sec_incoming: init rdp security")); if (xrdp_sec_init_rdp_security(self) != 0) { |