yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Allow ssl_client2 to resend on read timeout

Browse source
This commit is contained in:
Manuel Pégourié-Gonnard 2014-10-02 14:02:32 +02:00 committed by Paul Bakker
parent 6b65141718
commit f1e0df3ccd
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
programs/ssl/ssl_client2.c
View file

@ -76,6 +76,7 @@ int main( int argc, char *argv[] )
#define DFL_DEBUG_LEVEL 0 #define DFL_DEBUG_LEVEL 0
#define DFL_NBIO 0 #define DFL_NBIO 0
#define DFL_READ_TIMEOUT 0 #define DFL_READ_TIMEOUT 0
#define DFL_MAX_RESEND 0
#define DFL_CA_FILE "" #define DFL_CA_FILE ""
#define DFL_CA_PATH "" #define DFL_CA_PATH ""
#define DFL_CRT_FILE "" #define DFL_CRT_FILE ""
@ -114,6 +115,7 @@ struct options
int debug_level; /* level of debugging */ int debug_level; /* level of debugging */
int nbio; /* should I/O be blocking? */ int nbio; /* should I/O be blocking? */
uint32_t read_timeout; /* timeout on ssl_read() in milliseconds */ uint32_t read_timeout; /* timeout on ssl_read() in milliseconds */
int max_resend; /* DTLS times to resend on read timeout */
const char *request_page; /* page on server to request */ const char *request_page; /* page on server to request */
int request_size; /* pad request with header to requested size */ int request_size; /* pad request with header to requested size */
const char *ca_file; /* the file with the CA certificate(s) */ const char *ca_file; /* the file with the CA certificate(s) */
@ -314,6 +316,7 @@ static int my_verify( void *data, x509_crt *crt, int depth, int *flags )
" nbio=%%d default: 0 (blocking I/O)\n" \ " nbio=%%d default: 0 (blocking I/O)\n" \
" options: 1 (non-blocking), 2 (added delays)\n" \ " options: 1 (non-blocking), 2 (added delays)\n" \
" read_timeout=%%d default: 0 (no timeout)\n" \ " read_timeout=%%d default: 0 (no timeout)\n" \
" max_resend=%%d default: 0 (no resend on timeout)\n" \
"\n" \ "\n" \
USAGE_DTLS \ USAGE_DTLS \
"\n" \ "\n" \
@ -412,6 +415,7 @@ int main( int argc, char *argv[] )
opt.debug_level = DFL_DEBUG_LEVEL; opt.debug_level = DFL_DEBUG_LEVEL;
opt.nbio = DFL_NBIO; opt.nbio = DFL_NBIO;
opt.read_timeout = DFL_READ_TIMEOUT; opt.read_timeout = DFL_READ_TIMEOUT;
opt.max_resend = DFL_MAX_RESEND;
opt.request_page = DFL_REQUEST_PAGE; opt.request_page = DFL_REQUEST_PAGE;
opt.request_size = DFL_REQUEST_SIZE; opt.request_size = DFL_REQUEST_SIZE;
opt.ca_file = DFL_CA_FILE; opt.ca_file = DFL_CA_FILE;
@ -479,6 +483,12 @@ int main( int argc, char *argv[] )
} }
else if( strcmp( p, "read_timeout" ) == 0 ) else if( strcmp( p, "read_timeout" ) == 0 )
opt.read_timeout = atoi( q ); opt.read_timeout = atoi( q );
else if( strcmp( p, "max_resend" ) == 0 )
{
opt.max_resend = atoi( q );
if( opt.max_resend < 0 )
goto usage;
}
else if( strcmp( p, "request_page" ) == 0 ) else if( strcmp( p, "request_page" ) == 0 )
opt.request_page = q; opt.request_page = q;
else if( strcmp( p, "request_size" ) == 0 ) else if( strcmp( p, "request_size" ) == 0 )
@ -1284,6 +1294,12 @@ send_request:
{ {
switch( ret ) switch( ret )
{ {
case POLARSSL_ERR_NET_TIMEOUT:
printf( " timeout\n" );
if( opt.max_resend-- > 0 )
goto send_request;
goto exit;
case POLARSSL_ERR_SSL_PEER_CLOSE_NOTIFY: case POLARSSL_ERR_SSL_PEER_CLOSE_NOTIFY:
printf( " connection was closed gracefully\n" ); printf( " connection was closed gracefully\n" );
ret = 0; ret = 0;