diff options
author | Jay Sorg <jay.sorg@gmail.com> | 2015-07-05 23:14:46 -0700 |
---|---|---|
committer | Jay Sorg <jay.sorg@gmail.com> | 2015-07-05 23:14:46 -0700 |
commit | b56aa9832ecf1193d3d364556a7a5bde58508daf (patch) | |
tree | 802df8ee74bce0ba23a9e21234e415438de97c39 /libxrdp | |
parent | f8432d0bb71e0b358c8ab32fdfae816229973034 (diff) | |
download | xrdp-proprietary-b56aa9832ecf1193d3d364556a7a5bde58508daf.tar.gz xrdp-proprietary-b56aa9832ecf1193d3d364556a7a5bde58508daf.zip |
work on main loop changes
Diffstat (limited to 'libxrdp')
-rw-r--r-- | libxrdp/libxrdpinc.h | 2 | ||||
-rw-r--r-- | libxrdp/xrdp_fastpath.c | 2 | ||||
-rw-r--r-- | libxrdp/xrdp_iso.c | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/libxrdp/libxrdpinc.h b/libxrdp/libxrdpinc.h index 8d99814c..e3e79564 100644 --- a/libxrdp/libxrdpinc.h +++ b/libxrdp/libxrdpinc.h @@ -72,6 +72,8 @@ struct xrdp_session int up_and_running; int (*is_term)(void); int in_process_data; /* inc / dec libxrdp_process_data calls */ + + struct source_info si; }; struct xrdp_session * DEFAULT_CC diff --git a/libxrdp/xrdp_fastpath.c b/libxrdp/xrdp_fastpath.c index 5bf63b29..6a0cdfc0 100644 --- a/libxrdp/xrdp_fastpath.c +++ b/libxrdp/xrdp_fastpath.c @@ -137,7 +137,7 @@ xrdp_fastpath_session_callback(struct xrdp_fastpath *self, int msg, int APP_CC xrdp_fastpath_send(struct xrdp_fastpath *self, struct stream *s) { - if (trans_force_write_s(self->trans, s) != 0) + if (trans_write_copy_s(self->trans, s) != 0) { return 1; } diff --git a/libxrdp/xrdp_iso.c b/libxrdp/xrdp_iso.c index 1a2fb08a..8369226c 100644 --- a/libxrdp/xrdp_iso.c +++ b/libxrdp/xrdp_iso.c @@ -286,7 +286,7 @@ xrdp_iso_send_cc(struct xrdp_iso *self) len_ptr[1] = len; len_indicator_ptr[0] = len_indicator; - if (trans_force_write_s(self->trans, s) != 0) + if (trans_write_copy_s(self->trans, s) != 0) { free_stream(s); return 1; @@ -409,7 +409,7 @@ xrdp_iso_send(struct xrdp_iso *self, struct stream *s) out_uint8(s, ISO_PDU_DT); out_uint8(s, 0x80); - if (trans_force_write_s(self->trans, s) != 0) + if (trans_write_copy_s(self->trans, s) != 0) { return 1; } |