Set TCP_NODELAY for TCP SSL connections. (sogou#1753)

Author: Barenboim

src/manager/RouteManager.cc

@@ -18,6 +18,8 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
 #include <netdb.h>
 #include <stdlib.h>
 #include <stdint.h>
@@ -76,8 +78,30 @@ class RouteTargetSCTP : public RouteManager::RouteTarget
 #endif
 };
 
+class RouteTargetTCP_SSL : public RouteTargetTCP
+{
+private:
+	virtual int create_connect_fd()
+	{
+		const struct sockaddr *addr;
+		socklen_t addrlen;
+		int sockfd;
+
+		this->get_addr(&addr, &addrlen);
+		sockfd = socket(addr->sa_family, SOCK_STREAM, 0);
+		if (sockfd >= 0)
+		{
+			int nodelay = 1;
+			setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY,
+					   &nodelay, sizeof (int));
+		}
+
+		return sockfd;
+	}
+};
+
 /* To support TLS SNI. */
-class RouteTargetTCPSNI : public RouteTargetTCP
+class RouteTargetTCP_TLS_SNI : public RouteTargetTCP_SSL
 {
 private:
 	virtual int init_ssl(SSL *ssl)
@@ -92,12 +116,14 @@ class RouteTargetTCPSNI : public RouteTargetTCP
 	std::string hostname;
 
 public:
-	RouteTargetTCPSNI(const std::string& name) : hostname(name)
+	RouteTargetTCP_TLS_SNI(const std::string& name) : hostname(name)
 	{
 	}
 };
 
-class RouteTargetSCTPSNI : public RouteTargetSCTP
+using RouteTargetSCTP_SSL = RouteTargetSCTP;
+
+class RouteTargetSCTP_TLS_SNI : public RouteTargetSCTP_SSL
 {
 private:
 	virtual int init_ssl(SSL *ssl)
@@ -112,7 +138,7 @@ class RouteTargetSCTPSNI : public RouteTargetSCTP
 	std::string hostname;
 
 public:
-	RouteTargetSCTPSNI(const std::string& name) : hostname(name)
+	RouteTargetSCTP_TLS_SNI(const std::string& name) : hostname(name)
 	{
 	}
 };
@@ -186,22 +212,26 @@ RouteResultEntry::create_target(const struct RouteParams *params,
 
 	switch (params->transport_type)
 	{
-	case TT_TCP_SSL:
-		if (params->use_tls_sni)
-			target = new RouteTargetTCPSNI(params->hostname);
-		else
 	case TT_TCP:
-			target = new RouteTargetTCP();
+		target = new RouteTargetTCP();
 		break;
 	case TT_UDP:
 		target = new RouteTargetUDP();
 		break;
+	case TT_SCTP:
+		target = new RouteTargetSCTP();
+		break;
+	case TT_TCP_SSL:
+		if (params->use_tls_sni)
+			target = new RouteTargetTCP_TLS_SNI(params->hostname);
+		else
+			target = new RouteTargetTCP_SSL;
+		break;
 	case TT_SCTP_SSL:
 		if (params->use_tls_sni)
-			target = new RouteTargetSCTPSNI(params->hostname);
+			target = new RouteTargetSCTP_TLS_SNI(params->hostname);
 		else
-	case TT_SCTP:
-			target = new RouteTargetSCTP();
+			target = new RouteTargetSCTP_SSL;
 		break;
 	default:
 		errno = EINVAL;

src/server/WFServer.cc

@@ -19,6 +19,8 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
 #include <errno.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -181,6 +183,18 @@ WFConnection *WFServerBase::new_connection(int accept_fd)
 		int reuse = 1;
 		setsockopt(accept_fd, SOL_SOCKET, SO_REUSEADDR,
 				   &reuse, sizeof (int));
+
+		if (this->get_ssl_ctx())
+		{
+			if (this->params.transport_type == TT_TCP ||
+				this->params.transport_type == TT_TCP_SSL)
+			{
+				int nodelay = 1;
+				setsockopt(accept_fd, IPPROTO_TCP, TCP_NODELAY,
+						   &nodelay, sizeof (int));
+			}
+		}
+
 		return new WFServerConnection(&this->conn_count);
 	}