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

libxrdp: iso_send_rdpnegrdp fix + notes.

Browse Source
This commit is contained in:
speidy 2013-10-09 23:06:45 +03:00
parent c2e7da84d4
commit a4d2917a0a
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libxrdp/xrdp_iso.c
View File

@ -176,24 +176,18 @@ xrdp_iso_send_rdpnegrsp(struct xrdp_iso *self, struct stream *s, int code)
return 1; return 1;
} }
//check for RDPNEGDATA
send_rdpnegdata = 1;
if (self->selectedProtocol == -1) {
send_rdpnegdata = 0;
}
/* TPKT HEADER - 4 bytes */ /* TPKT HEADER - 4 bytes */
out_uint8(s, 3); /* version */ out_uint8(s, 3); /* version */
out_uint8(s, 0); /* RESERVED */ out_uint8(s, 0); /* RESERVED */
if (send_rdpnegdata == 1) { if (self->selectedProtocol != -1) {
out_uint16_be(s, 19); /* length */ out_uint16_be(s, 19); /* length */ //rdp negotiation happens.
} }
else else
{ {
out_uint16_be(s, 11); /* length */ out_uint16_be(s, 11); /* length */ //rdp negotiation doesn't happen.
} }
/* ISO LAYER - X.224 - 7 bytes*/ /* ISO LAYER - X.224 - 7 bytes*/
if (send_rdpnegdata == 1) { if (self->selectedProtocol != -1) {
out_uint8(s, 14); /* length */ out_uint8(s, 14); /* length */
} }
else else
@ -204,7 +198,7 @@ xrdp_iso_send_rdpnegrsp(struct xrdp_iso *self, struct stream *s, int code)
out_uint16_be(s, 0); out_uint16_be(s, 0);
out_uint16_be(s, 0x1234); out_uint16_be(s, 0x1234);
out_uint8(s, 0); out_uint8(s, 0);
if (send_rdpnegdata == 1) { if (self->selectedProtocol != -1) {
/* RDP_NEG_RSP - 8 bytes*/ /* RDP_NEG_RSP - 8 bytes*/
out_uint8(s, RDP_NEG_RSP); out_uint8(s, RDP_NEG_RSP);
out_uint8(s, EXTENDED_CLIENT_DATA_SUPPORTED); /* flags */ out_uint8(s, EXTENDED_CLIENT_DATA_SUPPORTED); /* flags */