revert PR#2755: it breaks compilation
authorDr. Stephen Henson <steve@openssl.org>
Tue, 6 Mar 2012 18:25:33 +0000 (18:25 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Tue, 6 Mar 2012 18:25:33 +0000 (18:25 +0000)
crypto/bio/bio.h
crypto/bio/bss_dgram.c
ssl/d1_both.c
ssl/d1_lib.c

index 03bd3b2..6b2daa1 100644 (file)
@@ -145,7 +145,6 @@ extern "C" {
 /* #endif */
 
 #define BIO_CTRL_DGRAM_QUERY_MTU          40 /* as kernel for current MTU */
-#define BIO_CTRL_DGRAM_GET_FALLBACK_MTU   47
 #define BIO_CTRL_DGRAM_GET_MTU            41 /* get cached value for MTU */
 #define BIO_CTRL_DGRAM_SET_MTU            42 /* set cached value for
                                              * MTU. want to use this
index 437a050..bfbcf9b 100644 (file)
@@ -494,27 +494,6 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
                ret = 0;
 #endif
                break;
-       case BIO_CTRL_DGRAM_GET_FALLBACK_MTU:
-               switch (data->peer.sa.sa_family)
-                       {
-                       case AF_INET:
-                               ret = 576 - 20 - 8;
-                               break;
-#if OPENSSL_USE_IPV6
-                       case AF_INET6:
-#ifdef IN6_IS_ADDR_V4MAPPED
-                               if (IN6_IS_ADDR_V4MAPPED(&data->peer.sa_in6.sin6_addr))
-                                       ret = 576 - 20 - 8;
-                               else
-#endif
-                                       ret = 1280 - 40 - 8;
-                               break;
-#endif
-                       default:
-                               ret = 576 - 20 - 8;
-                               break;
-                       }
-               break;
        case BIO_CTRL_DGRAM_GET_MTU:
                return data->mtu;
                break;
index 4481c55..85f4d83 100644 (file)
@@ -227,14 +227,14 @@ int dtls1_do_write(SSL *s, int type)
        unsigned int len, frag_off, mac_size, blocksize;
 
        /* AHA!  Figure out the MTU, and stick to the right size */
-       if (s->d1->mtu < dtls1_min_mtu() && !(SSL_get_options(s) & SSL_OP_NO_QUERY_MTU))
+       if ( ! (SSL_get_options(s) & SSL_OP_NO_QUERY_MTU))
                {
                s->d1->mtu = 
                        BIO_ctrl(SSL_get_wbio(s), BIO_CTRL_DGRAM_QUERY_MTU, 0, NULL);
 
                /* I've seen the kernel return bogus numbers when it doesn't know
                 * (initial write), so just make sure we have a reasonable number */
-               if (s->d1->mtu < dtls1_min_mtu())
+               if ( s->d1->mtu < dtls1_min_mtu())
                        {
                        s->d1->mtu = 0;
                        s->d1->mtu = dtls1_guess_mtu(s->d1->mtu);
index bceba3c..2e57b63 100644 (file)
@@ -454,11 +454,6 @@ int dtls1_handle_timeout(SSL *s)
                state->timeout.read_timeouts = 1;
                }
 
-       if (state->timeout_duration > 2)
-               {
-               s->d1->mtu = BIO_ctrl(SSL_get_wbio(s), BIO_CTRL_DGRAM_GET_FALLBACK_MTU, 0, NULL);               
-               }
-
        dtls1_start_timer(s);
        return dtls1_retransmit_buffered_messages(s);
        }