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

improved dtls retry on connect

Browse Source
This commit is contained in:
John Safranek 2012-09-21 09:36:01 -07:00
parent 08a3423f43
commit c3aedc940f
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
examples/client/client.c
View File

@ -46,6 +46,7 @@
int ret = CyaSSL_connect_ex(ssl, handShakeCB, timeoutCB, timeout); int ret = CyaSSL_connect_ex(ssl, handShakeCB, timeoutCB, timeout);
#endif #endif
int error = CyaSSL_get_error(ssl, 0); int error = CyaSSL_get_error(ssl, 0);
int timeout_count = CyaSSL_dtls_get_current_timeout(ssl) * 10;
while (ret != SSL_SUCCESS && (error == SSL_ERROR_WANT_READ || while (ret != SSL_SUCCESS && (error == SSL_ERROR_WANT_READ ||
error == SSL_ERROR_WANT_WRITE)) { error == SSL_ERROR_WANT_WRITE)) {
if (error == SSL_ERROR_WANT_READ) if (error == SSL_ERROR_WANT_READ)
@ -55,7 +56,11 @@
#ifdef USE_WINDOWS_API #ifdef USE_WINDOWS_API
Sleep(100); Sleep(100);
#else #else
sleep(1); #ifdef CYASSL_DTLS
usleep(100000); /* 100ms */
#else
sleep(1);
#endif
#endif #endif
#ifndef CYASSL_CALLBACKS #ifndef CYASSL_CALLBACKS
ret = CyaSSL_connect(ssl); ret = CyaSSL_connect(ssl);
@ -63,6 +68,19 @@
ret = CyaSSL_connect_ex(ssl, handShakeCB, timeoutCB, timeout); ret = CyaSSL_connect_ex(ssl, handShakeCB, timeoutCB, timeout);
#endif #endif
error = CyaSSL_get_error(ssl, 0); error = CyaSSL_get_error(ssl, 0);
#ifdef CYASSL_DTLS
if (timeout_count-- <= 0) {
timeout_count = CyaSSL_dtls_got_timeout(ssl);
if (timeout_count < 0) {
error = SSL_FATAL_ERROR;
}
else {
printf("... updating timeout\n");
timeout_count =
CyaSSL_dtls_get_current_timeout(ssl) * 10;
}
}
#endif
} }
if (ret != SSL_SUCCESS) if (ret != SSL_SUCCESS)
err_sys("SSL_connect failed"); err_sys("SSL_connect failed");

7
src/io.c
View File

@ -90,18 +90,21 @@
#define SOCKET_ECONNRESET WSAECONNRESET #define SOCKET_ECONNRESET WSAECONNRESET
#define SOCKET_EINTR WSAEINTR #define SOCKET_EINTR WSAEINTR
#define SOCKET_EPIPE WSAEPIPE #define SOCKET_EPIPE WSAEPIPE
#define SOCKET_ECONNREFUSED WSAENOTCONN
#elif defined(__PPU) #elif defined(__PPU)
#define SOCKET_EWOULDBLOCK SYS_NET_EWOULDBLOCK #define SOCKET_EWOULDBLOCK SYS_NET_EWOULDBLOCK
#define SOCKET_EAGAIN SYS_NET_EAGAIN #define SOCKET_EAGAIN SYS_NET_EAGAIN
#define SOCKET_ECONNRESET SYS_NET_ECONNRESET #define SOCKET_ECONNRESET SYS_NET_ECONNRESET
#define SOCKET_EINTR SYS_NET_EINTR #define SOCKET_EINTR SYS_NET_EINTR
#define SOCKET_EPIPE SYS_NET_EPIPE #define SOCKET_EPIPE SYS_NET_EPIPE
#define SOCKET_ECONNREFUSED SYS_NET_ECONNREFUSED
#else #else
#define SOCKET_EWOULDBLOCK EWOULDBLOCK #define SOCKET_EWOULDBLOCK EWOULDBLOCK
#define SOCKET_EAGAIN EAGAIN #define SOCKET_EAGAIN EAGAIN
#define SOCKET_ECONNRESET ECONNRESET #define SOCKET_ECONNRESET ECONNRESET
#define SOCKET_EINTR EINTR #define SOCKET_EINTR EINTR
#define SOCKET_EPIPE EPIPE #define SOCKET_EPIPE EPIPE
#define SOCKET_ECONNREFUSED ECONNREFUSED
#endif /* USE_WINDOWS_API */ #endif /* USE_WINDOWS_API */
@ -176,6 +179,10 @@ int EmbedReceive(CYASSL *ssl, char *buf, int sz, void *ctx)
CYASSL_MSG(" Socket interrupted"); CYASSL_MSG(" Socket interrupted");
return IO_ERR_ISR; return IO_ERR_ISR;
} }
else if (err == SOCKET_ECONNREFUSED) {
CYASSL_MSG(" Connection refused");
return IO_ERR_WANT_READ;
}
else { else {
CYASSL_MSG(" General error"); CYASSL_MSG(" General error");
return IO_ERR_GENERAL; return IO_ERR_GENERAL;