summaryrefslogtreecommitdiffstats
path: root/libxrdp/xrdp_tcp.c
diff options
context:
space:
mode:
authorjsorg71 <jsorg71>2007-01-14 05:00:16 +0000
committerjsorg71 <jsorg71>2007-01-14 05:00:16 +0000
commit08e292faf4c20317c761749e812aa565659eb11b (patch)
tree6ace402867893531dc4c62fa52415fd6c62a24bc /libxrdp/xrdp_tcp.c
parent728550e1b4b7660d73227d16c41fd7c6b51370b2 (diff)
downloadxrdp-proprietary-08e292faf4c20317c761749e812aa565659eb11b.tar.gz
xrdp-proprietary-08e292faf4c20317c761749e812aa565659eb11b.zip
check if server is shutting down
Diffstat (limited to 'libxrdp/xrdp_tcp.c')
-rw-r--r--libxrdp/xrdp_tcp.c28
1 files changed, 26 insertions, 2 deletions
diff --git a/libxrdp/xrdp_tcp.c b/libxrdp/xrdp_tcp.c
index 98f5ac4e..6d7dbd63 100644
--- a/libxrdp/xrdp_tcp.c
+++ b/libxrdp/xrdp_tcp.c
@@ -57,6 +57,7 @@ int APP_CC
xrdp_tcp_recv(struct xrdp_tcp* self, struct stream* s, int len)
{
int rcvd;
+ struct xrdp_session* session;
if (self->sck_closed)
{
@@ -64,6 +65,7 @@ xrdp_tcp_recv(struct xrdp_tcp* self, struct stream* s, int len)
return 1;
}
DEBUG((" in xrdp_tcp_recv, gota get %d bytes", len));
+ session = self->iso_layer->mcs_layer->sec_layer->rdp_layer->session;
init_stream(s, len);
while (len > 0)
{
@@ -72,7 +74,17 @@ xrdp_tcp_recv(struct xrdp_tcp* self, struct stream* s, int len)
{
if (g_tcp_last_error_would_block(self->sck))
{
- g_tcp_can_recv(self->sck, 10);
+ if (!g_tcp_can_recv(self->sck, 10))
+ {
+ if (session->is_term != 0)
+ {
+ if (session->is_term())
+ {
+ DEBUG((" out xrdp_tcp_recv, terminated"));
+ return 1;
+ }
+ }
+ }
}
else
{
@@ -105,6 +117,7 @@ xrdp_tcp_send(struct xrdp_tcp* self, struct stream* s)
int len;
int total;
int sent;
+ struct xrdp_session* session;
if (self->sck_closed)
{
@@ -113,6 +126,7 @@ xrdp_tcp_send(struct xrdp_tcp* self, struct stream* s)
}
len = s->end - s->data;
DEBUG((" in xrdp_tcp_send, gota send %d bytes", len));
+ session = self->iso_layer->mcs_layer->sec_layer->rdp_layer->session;
total = 0;
while (total < len)
{
@@ -121,7 +135,17 @@ xrdp_tcp_send(struct xrdp_tcp* self, struct stream* s)
{
if (g_tcp_last_error_would_block(self->sck))
{
- g_tcp_can_send(self->sck, 10);
+ if (!g_tcp_can_send(self->sck, 10))
+ {
+ if (session->is_term != 0)
+ {
+ if (session->is_term())
+ {
+ DEBUG((" out xrdp_tcp_send, terminated"));
+ return 1;
+ }
+ }
+ }
}
else
{