mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4 from llyzs/transport 

libfreerdp-core/transport: process PDU (if any) only after sending has co
This commit is contained in:
Marc-André Moreau 2011-07-03 19:44:14 -07:00
parent 107b0f1b32 8afa7cf227
commit 22ec4a1332
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libfreerdp-core/transport.c
View File

@ -90,10 +90,13 @@ transport_connect_nla(rdpTransport * transport)
return True;
}
static int
transport_recv(rdpTransport * transport);
static int
transport_delay(rdpTransport * transport)
{
transport_check_fds(transport);
transport_recv(transport);
nanosleep(&transport->ts, NULL);
return 0;
}
@ -140,10 +143,17 @@ transport_send_tcp(rdpTransport * transport, STREAM * stream)
int
transport_send(rdpTransport * transport, STREAM * stream)
{
int r;
if (transport->state == TRANSPORT_STATE_TLS)
return transport_send_tls(transport, stream);
r = transport_send_tls(transport, stream);
else
return transport_send_tcp(transport, stream);
r = transport_send_tcp(transport, stream);
if (r == 0)
r = transport_check_fds(transport);
return r;
}
static int
@ -175,6 +185,15 @@ transport_recv_tcp(rdpTransport * transport)
return bytes;
}
static int
transport_recv(rdpTransport * transport)
{
if (transport->state == TRANSPORT_STATE_TLS)
return transport_recv_tls(transport);
else
return transport_recv_tcp(transport);
}
int
transport_check_fds(rdpTransport * transport)
{
@ -183,10 +202,7 @@ transport_check_fds(rdpTransport * transport)
uint16 length;
STREAM * received;
if (transport->state == TRANSPORT_STATE_TLS)
bytes = transport_recv_tls(transport);
else
bytes = transport_recv_tcp(transport);
bytes = transport_recv(transport);
if (bytes <= 0)
return bytes;