From: Matt Caswell <matt@openssl.org>
Date: Wed, 2 May 2018 15:08:27 +0000 (+0100)
Subject: Don't set TCP_NODELAY on a UDP socket
X-Git-Tag: OpenSSL_1_1_1-pre7~68
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=f478c8a7c0229feb9f446df68e9940e8782edd91

Don't set TCP_NODELAY on a UDP socket

This was preventing DTLS connections from being made from the command line.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6159)
---

diff --git a/apps/s_socket.c b/apps/s_socket.c
index 69f0f4f05e..d16108c706 100644
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -146,7 +146,8 @@ int init_client(int *sock, const char *host, const char *port,
         }
 #endif
 
-        if (!BIO_connect(*sock, BIO_ADDRINFO_address(ai), BIO_SOCK_NODELAY)) {
+        if (!BIO_connect(*sock, BIO_ADDRINFO_address(ai),
+                         type == SOCK_STREAM ? BIO_SOCK_NODELAY : 0)) {
             BIO_closesocket(*sock);
             *sock = INVALID_SOCKET;
             continue;