1 files changed, 14 insertions, 25 deletions

diff --git a/src/lib/libcrypto/bio/bss_dgram.c b/src/lib/libcrypto/bio/bss_dgram.c
index 50281b5650..c1e85a21c6 100644
--- a/src/lib/libcrypto/bio/bss_dgram.c
+++ b/src/lib/libcrypto/bio/bss_dgram.c
@@ -411,12 +411,10 @@ dgram_write(BIO *b, const char *in, int inl)
                         BIO_set_retry_write(b);
 
                         data->_errno = errno;
-
-#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
+                        /*
+                         * higher layers are responsible for querying MTU,
+                         * if necessary
+                         */
                 }
         }
         return (ret);
@@ -486,28 +484,19 @@ 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: