mirror of https://github.com/FreeRDP/FreeRDP
Modified transport_check_fds to deliver all available PDUs before returning to the caller. This prevents the caller from waiting indefinitely for a socket to get signalled that data is available. It fixes a problem with Microsoft mobile clients connecting to FreeRDS whereby the client places both the MCS Erect Domain and MCS Attach User PDUs into the same ethernet frame. As a result, FreeRDS was only processing the first PDU and then blocking indefinitely waiting for data to arrive on the socket.
This commit is contained in:
parent
b4b6a2171d
commit
1daea0d0dc
|
@ -853,9 +853,18 @@ int transport_check_fds(rdpTransport* transport)
|
|||
#endif
|
||||
ResetEvent(transport->ReceiveEvent);
|
||||
|
||||
/**
|
||||
* Loop through and read all available PDUs. Since multiple
|
||||
* PDUs can exist, it's important to deliver them all before
|
||||
* returning. Otherwise we run the risk of having a thread
|
||||
* wait for a socket to get signalled that data is available
|
||||
* (which may never happen).
|
||||
*/
|
||||
for (;;)
|
||||
{
|
||||
status = transport_read_nonblocking(transport);
|
||||
|
||||
if (status < 0)
|
||||
if (status <= 0)
|
||||
return status;
|
||||
|
||||
while ((pos = Stream_GetPosition(transport->ReceiveBuffer)) > 0)
|
||||
|
@ -963,6 +972,7 @@ int transport_check_fds(rdpTransport* transport)
|
|||
if (status < 0)
|
||||
return status;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue