diff options
| author | Idan Freiberg <speidy@gmail.com> | 2014-07-23 15:31:45 +0300 |
|---|---|---|
| committer | Idan Freiberg <speidy@gmail.com> | 2014-07-23 15:31:45 +0300 |
| commit | afdf638c7b56e7420e32853df6299d9217e0f8d4 (patch) | |
| tree | d2a63333e6ef04a6e34db906b3af2097525a6359 /libxrdp/libxrdp.c | |
| parent | 1acdc3085eb260c166db7d575f6dfcb8a9cc2e72 (diff) | |
| download | xrdp-proprietary-afdf638c7b56e7420e32853df6299d9217e0f8d4.tar.gz xrdp-proprietary-afdf638c7b56e7420e32853df6299d9217e0f8d4.zip | |
libxrdp, common: work on TLS mode
Diffstat (limited to 'libxrdp/libxrdp.c')
| -rw-r--r-- | libxrdp/libxrdp.c | 27 |
1 files changed, 3 insertions, 24 deletions
diff --git a/libxrdp/libxrdp.c b/libxrdp/libxrdp.c index 44e9d775..3b781f70 100644 --- a/libxrdp/libxrdp.c +++ b/libxrdp/libxrdp.c @@ -141,16 +141,8 @@ libxrdp_force_read(struct trans* trans) s = trans->in_s; init_stream(s, 32 * 1024); - if (trans->do_tls) - { - g_writeln("libxrdp_force_read: tls data in"); - if (xrdp_tls_force_read_s(trans, s, 4) != 0) - { - return 0; - } - g_hexdump(s->data, 4); - } - else if (trans_force_read(trans, 4) != 0) /*TCP*/ + + if (trans_force_read(trans, 4) != 0) { g_writeln("libxrdp_force_read: error"); return 0; @@ -167,24 +159,11 @@ libxrdp_force_read(struct trans* trans) return 0; } - if (trans->do_tls) - { - g_writeln("libxrdp_force_read: tls data in"); - xrdp_tls_force_read_s(trans, s, bytes - 4); - g_hexdump(s->data, bytes); - } - else if (trans_force_read(trans, bytes - 4) != 0) /*TCP*/ + if (trans_force_read(trans, bytes - 4) != 0) { g_writeln("libxrdp_force_read: error"); return 0; } - - -// if (trans_force_read(trans, bytes - 4) != 0) -// { -// g_writeln("libxrdp_force_read: error"); -// return 0; -// } return s; } |