transport: exit transport loop when the session is activated.

diff --git a/libfreerdp/core/rdp.c b/libfreerdp/core/rdp.c
index 170b93b..5360d53 100644 (file)
--- a/libfreerdp/core/rdp.c
+++ b/libfreerdp/core/rdp.c
@@ -1153,7 +1153,10 @@ static int rdp_recv_callback(rdpTransport* transport, wStream* s, void* extra)
                        status = rdp_recv_pdu(rdp, s);
 
                        if ((status >= 0) && (rdp->finalize_sc_pdus == FINALIZE_SC_COMPLETE))
+                       {
                                rdp_client_transition_to_state(rdp, CONNECTION_STATE_ACTIVE);
+                               return 2;
+                       }
                        break;
 
                case CONNECTION_STATE_ACTIVE:

diff --git a/libfreerdp/core/transport.c b/libfreerdp/core/transport.c
index a7c0c93..4ffe35a 100644 (file)
--- a/libfreerdp/core/transport.c
+++ b/libfreerdp/core/transport.c
@@ -1071,12 +1071,13 @@ int transport_check_fds(rdpTransport* transport)
                 */
 
                recv_status = transport->ReceiveCallback(transport, received, transport->ReceiveExtra);
+               Stream_Release(received);
 
-               if (recv_status == 1)
+               /* session redirection or activation */
+               if (recv_status == 1 || recv_status == 2)
                {
-                       return 1; /* session redirection */
+                       return recv_status;
                }
-               Stream_Release(received);
 
                if (recv_status < 0)
                        return -1;