generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PR: 2559

Browse Source 
Submitted by: Robin Seggelmann <seggelmann@fh-muenster.de>
Reviewed by: steve

Fix DTLS socket error bug
This commit is contained in:
Dr. Stephen Henson
2011-07-20 15:20:19 +00:00
parent ac02a4b68a
commit 46a1f2487e
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
crypto/bio/bss_dgram.c
View File

@@ -288,7 +288,6 @@ static int dgram_read(BIO *b, char *out, int outl)
*/ */
dgram_adjust_rcv_timeout(b); dgram_adjust_rcv_timeout(b);
ret=recvfrom(b->num,out,outl,0,&peer,(void *)&peerlen); ret=recvfrom(b->num,out,outl,0,&peer,(void *)&peerlen);
dgram_reset_rcv_timeout(b);
if ( ! data->connected && ret >= 0) if ( ! data->connected && ret >= 0)
BIO_ctrl(b, BIO_CTRL_DGRAM_SET_PEER, 0, &peer); BIO_ctrl(b, BIO_CTRL_DGRAM_SET_PEER, 0, &peer);
@@ -302,6 +301,8 @@ static int dgram_read(BIO *b, char *out, int outl)
data->_errno = get_last_socket_error(); data->_errno = get_last_socket_error();
} }
} }
dgram_reset_rcv_timeout(b);
} }
return(ret); return(ret);
} }
@@ -654,9 +655,13 @@ static int BIO_dgram_should_retry(int i)
{ {
err=get_last_socket_error(); err=get_last_socket_error();
#if defined(OPENSSL_SYS_WINDOWS) && 0 /* more microsoft stupidity? perhaps not? Ben 4/1/99 */ #if defined(OPENSSL_SYS_WINDOWS)
if ((i == -1) && (err == 0)) /* If the socket return value (i) is -1
return(1); * and err is unexpectedly 0 at this point,
* the error code was overwritten by
* another system call before this error
* handling is called.
*/
#endif #endif
return(BIO_dgram_non_fatal_error(err)); return(BIO_dgram_non_fatal_error(err));