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

common: call recv/send before can_recv/can_send

Browse Source
This commit is contained in:
Jay Sorg 2016-04-06 16:37:34 -07:00
parent bd6c38af4d
commit 0655272b9c
1 changed files with 45 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
common/trans.c
View File

@ -442,45 +442,42 @@ trans_force_read_s(struct trans *self, struct stream *in_s, int size)
{
return 1;
}
if (self->trans_can_recv(self, self->sck, 100))
rcvd = self->trans_recv(self, in_s->end, size);
if (rcvd == -1)
{
rcvd = self->trans_recv(self, in_s->end, size);
if (rcvd == -1)
if (g_tcp_last_error_would_block(self->sck))
{
if (g_tcp_last_error_would_block(self->sck))
if (!self->trans_can_recv(self, self->sck, 100))
{
}
else
{
/* error */
self->status = TRANS_STATUS_DOWN;
return 1;
/* check for term here */
if (self->is_term != 0)
{
if (self->is_term())
{
/* term */
self->status = TRANS_STATUS_DOWN;
return 1;
}
}
}
}
else if (rcvd == 0)
else
{
/* error */
self->status = TRANS_STATUS_DOWN;
return 1;
}
else
{
in_s->end += rcvd;
size -= rcvd;
}
}
else if (rcvd == 0)
{
/* error */
self->status = TRANS_STATUS_DOWN;
return 1;
}
else
{
/* check for term here */
if (self->is_term != 0)
{
if (self->is_term())
{
/* term */
self->status = TRANS_STATUS_DOWN;
return 1;
}
}
in_s->end += rcvd;
size -= rcvd;
}
}
return 0;
@ -514,44 +511,41 @@ trans_force_write_s(struct trans *self, struct stream *out_s)
}
while (total < size)
{
if (g_tcp_can_send(self->sck, 100))
sent = self->trans_send(self, out_s->data + total, size - total);
if (sent == -1)
{
sent = self->trans_send(self, out_s->data + total, size - total);
if (sent == -1)
if (g_tcp_last_error_would_block(self->sck))
{
if (g_tcp_last_error_would_block(self->sck))
if (!g_tcp_can_send(self->sck, 100))
{
}
else
{
/* error */
self->status = TRANS_STATUS_DOWN;
return 1;
/* check for term here */
if (self->is_term != 0)
{
if (self->is_term())
{
/* term */
self->status = TRANS_STATUS_DOWN;
return 1;
}
}
}
}
else if (sent == 0)
else
{
/* error */
self->status = TRANS_STATUS_DOWN;
return 1;
}
else
{
total = total + sent;
}
}
else if (sent == 0)
{
/* error */
self->status = TRANS_STATUS_DOWN;
return 1;
}
else
{
/* check for term here */
if (self->is_term != 0)
{
if (self->is_term())
{
/* term */
self->status = TRANS_STATUS_DOWN;
return 1;
}
}
total = total + sent;
}
}
return 0;