cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-11-04 04:32:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Actually resend flights

Browse Source
This commit is contained in:
Manuel Pégourié-Gonnard 2014-09-19 21:18:23 +02:00 committed by Paul Bakker
parent 5d8ba53ace
commit 6a2bdfaf73
1 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
library/ssl_tls.c
View File

@ -1913,7 +1913,14 @@ int ssl_fetch_input( ssl_context *ssl, size_t nb_want )
return( POLARSSL_ERR_SSL_INTERNAL_ERROR ); return( POLARSSL_ERR_SSL_INTERNAL_ERROR );
} }
// TODO-DTLS: for now, use constant timeout = 1 sec/datagram
len = SSL_BUFFER_LEN - ( ssl->in_hdr - ssl->in_buf ); len = SSL_BUFFER_LEN - ( ssl->in_hdr - ssl->in_buf );
if( ssl->f_recv_timeout != NULL &&
ssl->handshake != NULL ) /* No resend outside handshake */
{
ret = ssl->f_recv_timeout( ssl->p_bio, ssl->in_hdr, len, 1 );
}
else
ret = ssl->f_recv( ssl->p_bio, ssl->in_hdr, len ); ret = ssl->f_recv( ssl->p_bio, ssl->in_hdr, len );
SSL_DEBUG_RET( 2, "ssl->f_recv", ret ); SSL_DEBUG_RET( 2, "ssl->f_recv", ret );
@ -1921,6 +1928,19 @@ int ssl_fetch_input( ssl_context *ssl, size_t nb_want )
if( ret == 0 ) if( ret == 0 )
return( POLARSSL_ERR_SSL_CONN_EOF ); return( POLARSSL_ERR_SSL_CONN_EOF );
if( ret == POLARSSL_ERR_NET_TIMEOUT )
{
SSL_DEBUG_MSG( 2, ( "recv timeout" ) );
if( ( ret = ssl_resend( ssl ) ) != 0 )
{
SSL_DEBUG_RET( 1, "ssl_resend", ret );
return( ret );
}
return( POLARSSL_ERR_NET_WANT_READ );
}
if( ret < 0 ) if( ret < 0 )
return( ret ); return( ret );
@ -2575,10 +2595,28 @@ static int ssl_prepare_handshake_record( ssl_context *ssl )
/* ssl->handshake is NULL when receiving ClientHello for renego */ /* ssl->handshake is NULL when receiving ClientHello for renego */
if( ssl->handshake != NULL && if( ssl->handshake != NULL &&
recv_msg_seq != ssl->handshake->in_msg_seq ) recv_msg_seq != ssl->handshake->in_msg_seq )
{
if( recv_msg_seq < ssl->handshake->in_flight_start_seq )
{
SSL_DEBUG_MSG( 2, ( "received message from last flight, "
"message_seq = %d, start_of_flight = %d",
recv_msg_seq,
ssl->handshake->in_flight_start_seq ) );
if( ( ret = ssl_resend( ssl ) ) != 0 )
{
SSL_DEBUG_RET( 1, "ssl_resend", ret );
return( ret );
}
}
else
{ {
SSL_DEBUG_MSG( 2, ( "dropping out-of-order message: " SSL_DEBUG_MSG( 2, ( "dropping out-of-order message: "
"message_seq = %d, expected = %d", "message_seq = %d, expected = %d",
recv_msg_seq, ssl->handshake->in_msg_seq ) ); recv_msg_seq,
ssl->handshake->in_msg_seq ) );
}
return( POLARSSL_ERR_NET_WANT_READ ); return( POLARSSL_ERR_NET_WANT_READ );
} }
/* Wait until message completion to increment in_msg_seq */ /* Wait until message completion to increment in_msg_seq */