PR: 2050

[openssl.git] / crypto / bio / bss_dgram.c

diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
index 3f568da142dbf8590ed98a99ee2f558d82e0dda7..5cd6342598146d27264cadf8d019066e7e0691f1 100644 (file)
--- a/crypto/bio/bss_dgram.c
+++ b/crypto/bio/bss_dgram.c
@@ -217,12 +217,19 @@ static void dgram_adjust_rcv_timeout(BIO *b)
                        timeleft.tv_usec += 1000000;
                        }
 
+               if (timeleft.tv_sec < 0)
+                       {
+                       timeleft.tv_sec = 0;
+                       timeleft.tv_usec = 1;
+                       }
+
                /* Adjust socket timeout if next handhake message timer
                 * will expire earlier.
                 */
-               if (data->socket_timeout.tv_sec < timeleft.tv_sec ||
+               if ((data->socket_timeout.tv_sec == 0 && data->socket_timeout.tv_usec == 0) ||
+                       (data->socket_timeout.tv_sec > timeleft.tv_sec) ||
                        (data->socket_timeout.tv_sec == timeleft.tv_sec &&
-                        data->socket_timeout.tv_usec <= timeleft.tv_usec))
+                        data->socket_timeout.tv_usec >= timeleft.tv_usec))
                        {
 #ifdef OPENSSL_SYS_WINDOWS
                        timeout = timeleft.tv_sec * 1000 + timeleft.tv_usec / 1000;
@@ -243,17 +250,22 @@ static void dgram_reset_rcv_timeout(BIO *b)
        {
 #if defined(SO_RCVTIMEO)
        bio_dgram_data *data = (bio_dgram_data *)b->ptr;
+
+       /* Is a timer active? */
+       if (data->next_timeout.tv_sec > 0 || data->next_timeout.tv_usec > 0)
+               {
 #ifdef OPENSSL_SYS_WINDOWS
-       int timeout = data->socket_timeout.tv_sec * 1000 +
-                                 data->socket_timeout.tv_usec / 1000;
-       if (setsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO,
-                                  (void*)&timeout, sizeof(timeout)) < 0)
-               { perror("setsockopt"); }
+               int timeout = data->socket_timeout.tv_sec * 1000 +
+                                         data->socket_timeout.tv_usec / 1000;
+               if (setsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO,
+                                          (void*)&timeout, sizeof(timeout)) < 0)
+                       { perror("setsockopt"); }
 #else
-       if ( setsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO, &(data->socket_timeout),
-                                       sizeof(struct timeval)) < 0)
-               { perror("setsockopt"); }
+               if ( setsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO, &(data->socket_timeout),
+                                               sizeof(struct timeval)) < 0)
+                       { perror("setsockopt"); }
 #endif
+               }
 #endif
        }
 
@@ -278,20 +290,17 @@ static int dgram_read(BIO *b, char *out, int outl)
                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_CONNECT, 0, &peer);
+               if ( ! data->connected  && ret >= 0)
+                       BIO_ctrl(b, BIO_CTRL_DGRAM_SET_PEER, 0, &peer);
 
                BIO_clear_retry_flags(b);
-               if (ret <= 0)
+               if (ret < 0)
                        {
                        if (BIO_dgram_should_retry(ret))
                                {
                                BIO_set_retry_read(b);
                                data->_errno = get_last_socket_error();
                                }
-#if 0
-                       memset(&(data->hstimeout), 0, sizeof(struct timeval));
-#endif
                        }
                }
        return(ret);
@@ -315,7 +324,7 @@ static int dgram_write(BIO *b, const char *in, int inl)
        BIO_clear_retry_flags(b);
        if (ret <= 0)
                {
-               if (BIO_sock_should_retry(ret))
+               if (BIO_dgram_should_retry(ret))
                        {
                        BIO_set_retry_write(b);  
                        data->_errno = get_last_socket_error();
@@ -336,8 +345,10 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
        int *ip;
        struct sockaddr *to = NULL;
        bio_dgram_data *data = NULL;
+#if defined(IP_MTU_DISCOVER) || defined(IP_MTU)
        long sockopt_val = 0;
        unsigned int sockopt_len = 0;
+#endif
 #ifdef OPENSSL_SYS_LINUX
        socklen_t addr_len;
        struct sockaddr_storage addr;
@@ -418,12 +429,14 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
                                &sockopt_val, sizeof(sockopt_val))) < 0)
                                perror("setsockopt");
                        break;
+#if OPENSSL_USE_IPV6
                case AF_INET6:
                        sockopt_val = IPV6_PMTUDISC_DO;
                        if ((ret = setsockopt(b->num, IPPROTO_IPV6, IPV6_MTU_DISCOVER,
                                &sockopt_val, sizeof(sockopt_val))) < 0)
                                perror("setsockopt");
                        break;
+#endif
                default:
                        ret = -1;
                        break;
@@ -459,6 +472,7 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
                                ret = data->mtu;
                                }
                        break;
+#if OPENSSL_USE_IPV6
                case AF_INET6:
                        if ((ret = getsockopt(b->num, IPPROTO_IPV6, IPV6_MTU, (void *)&sockopt_val,
                                &sockopt_len)) < 0 || sockopt_val < 0)
@@ -474,6 +488,7 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
                                ret = data->mtu;
                                }
                        break;
+#endif
                default:
                        ret = 0;
                        break;
@@ -503,6 +518,12 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
                        memset(&(data->peer), 0x00, sizeof(struct sockaddr));
                        }
                break;
+    case BIO_CTRL_DGRAM_GET_PEER:
+        to = (struct sockaddr *) ptr;
+
+        memcpy(to, &(data->peer), sizeof(struct sockaddr));
+               ret = sizeof(struct sockaddr);
+        break;
     case BIO_CTRL_DGRAM_SET_PEER:
         to = (struct sockaddr *) ptr;
 
@@ -673,10 +694,6 @@ int BIO_dgram_non_fatal_error(int err)
 # endif
 #endif
 
-#if defined(ENOTCONN)
-       case ENOTCONN:
-#endif
-
 #ifdef EINTR
        case EINTR:
 #endif
@@ -699,11 +716,6 @@ int BIO_dgram_non_fatal_error(int err)
        case EALREADY:
 #endif
 
-/* DF bit set, and packet larger than MTU */
-#ifdef EMSGSIZE
-       case EMSGSIZE:
-#endif
-
                return(1);
                /* break; */
        default: