mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libfreerdp-core: fix TSG socket blocking mode

Browse Source
This commit is contained in:
Marc-André Moreau 2012-11-27 18:34:00 -05:00
parent 2db4c27be7
commit 12f0afd1e0
6 changed files with 68 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libfreerdp/core/rdp.c
View File

@ -678,10 +678,12 @@ BOOL rdp_decrypt(rdpRdp* rdp, STREAM* s, int length, UINT16 securityFlags)
stream_read(s, wmac, sizeof(wmac));
length -= sizeof(wmac);
security_decrypt(s->p, length, rdp);
if (securityFlags & SEC_SECURE_CHECKSUM)
security_salted_mac_signature(rdp, s->p, length, FALSE, cmac);
else
security_mac_signature(rdp, s->p, length, cmac);
if (memcmp(wmac, cmac, sizeof(wmac)) != 0)
{
printf("WARNING: invalid packet signature\n");
@ -694,6 +696,7 @@ BOOL rdp_decrypt(rdpRdp* rdp, STREAM* s, int length, UINT16 securityFlags)
*/
//return FALSE;
}
return TRUE;
}

1
libfreerdp/core/rpc.c
View File

@ -934,6 +934,7 @@ int rpc_recv_pdu_fragment(rdpRpc* rpc)
printf("Receiving Out-of-Sequence RTS PDU\n");
rts_recv_out_of_sequence_pdu(rpc);
return rpc_recv_pdu_fragment(rpc);
}
else if (header->common.ptype == PTYPE_FAULT)

7
libfreerdp/core/rts.c
View File

@ -869,6 +869,11 @@ int rts_send_flow_control_ack_pdu(rdpRpc* rpc)
return 0;
}
int rts_recv_flow_control_ack_pdu(rdpRpc* rpc, BYTE* buffer, UINT32 length)
{
return 0;
}
int rts_recv_flow_control_ack_with_destination_pdu(rdpRpc* rpc, BYTE* buffer, UINT32 length)
{
UINT32 offset;
@ -1362,7 +1367,7 @@ int rts_recv_out_of_sequence_pdu(rdpRpc* rpc)
if (SignatureId == RTS_PDU_FLOW_CONTROL_ACK)
{
return rts_recv_flow_control_ack_pdu(rpc, rpc->buffer, rpc->length);
}
else if (SignatureId == RTS_PDU_FLOW_CONTROL_ACK_WITH_DESTINATION)
{

18
libfreerdp/core/transport.c
View File

@ -282,7 +282,7 @@ int transport_read(rdpTransport* transport, STREAM* s)
else if (transport->layer == TRANSPORT_LAYER_TSG)
status = tsg_read(transport->tsg, stream_get_tail(s), stream_get_left(s));
if (status == 0 && transport->blocking)
if ((status == 0) && (transport->blocking))
{
freerdp_usleep(transport->usleep_interval);
continue;
@ -517,8 +517,22 @@ int transport_check_fds(rdpTransport** ptransport)
BOOL transport_set_blocking_mode(rdpTransport* transport, BOOL blocking)
{
BOOL status;
status = TRUE;
transport->blocking = blocking;
return tcp_set_blocking_mode(transport->TcpIn, blocking);
if (transport->SplitInputOutput)
{
status &= tcp_set_blocking_mode(transport->TcpIn, blocking);
status &= tcp_set_blocking_mode(transport->TcpOut, blocking);
}
else
{
status &= tcp_set_blocking_mode(transport->TcpIn, blocking);
}
return status;
}
rdpTransport* transport_new(rdpSettings* settings)

1
libfreerdp/core/tsg.c
View File

@ -1158,6 +1158,7 @@ int tsg_read(rdpTsg* tsg, BYTE* data, UINT32 length)
{
DEBUG_TSG("Ignoring TsProxySetupReceivePipe Response");
return tsg_read(tsg, data, length);
return 0;
}
tsg->PendingPdu = TRUE;

63
libfreerdp/crypto/tls.c
View File

@ -284,29 +284,39 @@ BOOL tls_disconnect(rdpTls* tls)
{
if (tls->ssl)
SSL_shutdown(tls->ssl);
return TRUE;
}
int tls_read(rdpTls* tls, BYTE* data, int length)
{
int error;
int status;
status = SSL_read(tls->ssl, data, length);
switch (SSL_get_error(tls->ssl, status))
if (status <= 0)
{
case SSL_ERROR_NONE:
break;
error = SSL_get_error(tls->ssl, status);
case SSL_ERROR_WANT_READ:
case SSL_ERROR_WANT_WRITE:
status = 0;
break;
//printf("tls_read: length: %d status: %d error: 0x%08X\n",
// length, status, error);
default:
tls_print_error("SSL_read", tls->ssl, status);
status = -1;
break;
switch (error)
{
case SSL_ERROR_NONE:
break;
case SSL_ERROR_WANT_READ:
case SSL_ERROR_WANT_WRITE:
status = 0;
break;
default:
tls_print_error("SSL_read", tls->ssl, status);
status = -1;
break;
}
}
return status;
@ -327,24 +337,33 @@ int tls_read_all(rdpTls* tls, BYTE* data, int length)
int tls_write(rdpTls* tls, BYTE* data, int length)
{
int error;
int status;
status = SSL_write(tls->ssl, data, length);
switch (SSL_get_error(tls->ssl, status))
if (status <= 0)
{
case SSL_ERROR_NONE:
break;
error = SSL_get_error(tls->ssl, status);
case SSL_ERROR_WANT_READ:
case SSL_ERROR_WANT_WRITE:
status = 0;
break;
//printf("tls_write: length: %d status: %d error: 0x%08X\n",
// length, status, error);
default:
tls_print_error("SSL_write", tls->ssl, status);
status = -1;
break;
switch (error)
{
case SSL_ERROR_NONE:
break;
case SSL_ERROR_WANT_READ:
case SSL_ERROR_WANT_WRITE:
status = 0;
break;
default:
tls_print_error("SSL_write", tls->ssl, status);
status = -1;
break;
}
}
return status;