diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-01-29 21:38:57 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-01-29 21:38:57 -0500 |
| commit | 4d428cd2504c7ef03bc9672ecf2862eaedb3d87e (patch) | |
| tree | 2d640a824dd024e3a15db293eb8eb29e06fa3bdd /crypto/bio/bss_dgram.c | |
| parent | 33fc38ff8e2cb8723f7b116de3f8923c4f4eb9d5 (diff) | |
Dead code removal: #if 0 bio, comp, rand
The start of removing dead code.
A remaining #if 0 in bss_conn.c needs more thought.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/bio/bss_dgram.c')
| -rw-r--r-- | crypto/bio/bss_dgram.c | 42 |
1 files changed, 10 insertions, 32 deletions
diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c index 737359722a..0767809025 100644 --- a/crypto/bio/bss_dgram.c +++ b/crypto/bio/bss_dgram.c @@ -449,13 +449,6 @@ static int dgram_write(BIO *b, const char *in, int inl) if (BIO_dgram_should_retry(ret)) { BIO_set_retry_write(b); data->_errno = get_last_socket_error(); - -# if 0 /* higher layers are responsible for querying - * MTU, if necessary */ - if (data->_errno == EMSGSIZE) - /* retrieve the new MTU */ - BIO_ctrl(b, BIO_CTRL_DGRAM_QUERY_MTU, 0, NULL); -# endif } } return (ret); @@ -559,28 +552,19 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr) break; case BIO_CTRL_DGRAM_CONNECT: to = (struct sockaddr *)ptr; -# if 0 - if (connect(b->num, to, sizeof(struct sockaddr)) < 0) { - perror("connect"); - ret = 0; - } else { -# endif - switch (to->sa_family) { - case AF_INET: - memcpy(&data->peer, to, sizeof(data->peer.sa_in)); - break; + switch (to->sa_family) { + case AF_INET: + memcpy(&data->peer, to, sizeof(data->peer.sa_in)); + break; # if OPENSSL_USE_IPV6 - case AF_INET6: - memcpy(&data->peer, to, sizeof(data->peer.sa_in6)); - break; + case AF_INET6: + memcpy(&data->peer, to, sizeof(data->peer.sa_in6)); + break; # endif - default: - memcpy(&data->peer, to, sizeof(data->peer.sa)); - break; - } -# if 0 + default: + memcpy(&data->peer, to, sizeof(data->peer.sa)); + break; } -# endif break; /* (Linux)kernel sets DF bit on outgoing IP packets */ case BIO_CTRL_DGRAM_MTU_DISCOVER: @@ -1992,12 +1976,6 @@ int BIO_dgram_non_fatal_error(int err) # if defined(WSAEWOULDBLOCK) case WSAEWOULDBLOCK: # endif - -# if 0 /* This appears to always be an error */ -# if defined(WSAENOTCONN) - case WSAENOTCONN: -# endif -# endif # endif # ifdef EWOULDBLOCK |