PR: 2559

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

Fix DTLS socket error bug

diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
index 14ca854b4af1c9b3dc6d152e72b71982947cc6bf..e6845eb87de074193333da35eddf54df207bef3f 100644 (file)
--- a/crypto/bio/bss_dgram.c
+++ b/crypto/bio/bss_dgram.c
@@ -288,7 +288,6 @@ static int dgram_read(BIO *b, char *out, int outl)
                 */
                dgram_adjust_rcv_timeout(b);
                ret=recvfrom(b->num,out,outl,0,&peer,(void *)&peerlen);
-               dgram_reset_rcv_timeout(b);
 
                if ( ! data->connected  && ret >= 0)
                        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();
                                }
                        }
+
+               dgram_reset_rcv_timeout(b);
                }
        return(ret);
        }
@@ -654,9 +655,13 @@ static int BIO_dgram_should_retry(int i)
                {
                err=get_last_socket_error();
 
-#if defined(OPENSSL_SYS_WINDOWS) && 0 /* more microsoft stupidity? perhaps not? Ben 4/1/99 */
-               if ((i == -1) && (err == 0))
-                       return(1);
+#if defined(OPENSSL_SYS_WINDOWS)
+       /* If the socket return value (i) is -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
 
                return(BIO_dgram_non_fatal_error(err));