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

revert PR#2755: it breaks compilation

Browse Source
This commit is contained in:
Dr. Stephen Henson 2012-03-06 18:25:33 +00:00
parent b2a2c6af2a
commit 6720779c7e
4 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crypto/bio/bio.h
View File

@ -145,7 +145,6 @@ extern "C" {
/* #endif */ /* #endif */
#define BIO_CTRL_DGRAM_QUERY_MTU 40 /* as kernel for current MTU */ #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_GET_MTU 41 /* get cached value for MTU */
#define BIO_CTRL_DGRAM_SET_MTU 42 /* set cached value for #define BIO_CTRL_DGRAM_SET_MTU 42 /* set cached value for
* MTU. want to use this * MTU. want to use this

21
crypto/bio/bss_dgram.c
View File

@ -494,27 +494,6 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
ret = 0; ret = 0;
#endif #endif
break; 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: case BIO_CTRL_DGRAM_GET_MTU:
return data->mtu; return data->mtu;
break; break;

4
ssl/d1_both.c
View File

@ -227,14 +227,14 @@ int dtls1_do_write(SSL *s, int type)
unsigned int len, frag_off, mac_size, blocksize; unsigned int len, frag_off, mac_size, blocksize;
/* AHA! Figure out the MTU, and stick to the right size */ /* 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 = s->d1->mtu =
BIO_ctrl(SSL_get_wbio(s), BIO_CTRL_DGRAM_QUERY_MTU, 0, NULL); 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 /* I've seen the kernel return bogus numbers when it doesn't know
* (initial write), so just make sure we have a reasonable number */ * (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 = 0;
s->d1->mtu = dtls1_guess_mtu(s->d1->mtu); s->d1->mtu = dtls1_guess_mtu(s->d1->mtu);

5
ssl/d1_lib.c
View File

@ -454,11 +454,6 @@ int dtls1_handle_timeout(SSL *s)
state->timeout.read_timeouts = 1; 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); dtls1_start_timer(s);
return dtls1_retransmit_buffered_messages(s); return dtls1_retransmit_buffered_messages(s);
} }