libxrdp: keep rdp packets < 16K

ulab-next
Jay Sorg 11 years ago
parent a801e44bfa
commit 4cae44ce3b

@ -876,7 +876,7 @@ xrdp_mcs_send(struct xrdp_mcs *self, struct stream *s, int chan)
if (len > 8192 * 2) if (len > 8192 * 2)
{ {
g_writeln("error in xrdp_mcs_send, size too bog, its %d", len); g_writeln("error in xrdp_mcs_send, size too big, its %d", len);
} }
//if (len > max_len) //if (len > max_len)

@ -34,7 +34,7 @@
} \ } \
} }
#define MAX_ORDERS_SIZE (16 * 1024 + 512) #define MAX_ORDERS_SIZE (16 * 1024 - 256)
/*****************************************************************************/ /*****************************************************************************/
struct xrdp_orders *APP_CC struct xrdp_orders *APP_CC

@ -32,7 +32,7 @@
#define LLOGLN(_level, _args) \ #define LLOGLN(_level, _args) \
do { if (_level < LOG_LEVEL) { g_writeln _args ; } } while (0) do { if (_level < LOG_LEVEL) { g_writeln _args ; } } while (0)
#define FASTPATH_FRAG_SIZE (16 * 1024 + 1024) #define FASTPATH_FRAG_SIZE (16 * 1024 - 128)
/*****************************************************************************/ /*****************************************************************************/
static int APP_CC static int APP_CC
@ -587,7 +587,6 @@ xrdp_rdp_send_fastpath(struct xrdp_rdp *self, struct stream *s,
fragmentation = 1; /* FASTPATH_FRAGMENT_LAST */ fragmentation = 1; /* FASTPATH_FRAGMENT_LAST */
} }
} }
len = MIN(len, 32 * 1024);
LLOGLN(10, ("xrdp_rdp_send_fastpath: len %d fragmentation %d", LLOGLN(10, ("xrdp_rdp_send_fastpath: len %d fragmentation %d",
len, fragmentation)); len, fragmentation));
updateHeader = (updateCode & 15) | updateHeader = (updateCode & 15) |

@ -950,6 +950,7 @@ xrdp_sec_establish_keys(struct xrdp_sec *self)
ssl_rc4_set_key(self->decrypt_rc4_info, self->decrypt_key, self->rc4_key_len); ssl_rc4_set_key(self->decrypt_rc4_info, self->decrypt_key, self->rc4_key_len);
ssl_rc4_set_key(self->encrypt_rc4_info, self->encrypt_key, self->rc4_key_len); ssl_rc4_set_key(self->encrypt_rc4_info, self->encrypt_key, self->rc4_key_len);
} }
/*****************************************************************************/ /*****************************************************************************/
/* returns error */ /* returns error */
int APP_CC int APP_CC

Loading…
Cancel
Save