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

sws: restrict TCP_NODELAY to IP sockets

Browse Source 
TCP_NODELAY does not make sense for Unix sockets, so enable it only if
the socket is using IP.

Signed-off-by: Peter Wu <peter@lekensteyn.nl>
This commit is contained in:
Peter Wu 2014-11-27 23:59:20 +01:00 committed by Daniel Stenberg
parent 8ef77547d0
commit fb7d7e0022
1 changed files with 44 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
tests/server/sws.c
View File

@ -326,6 +326,21 @@ static void restore_signal_handlers(void)
#endif #endif
} }
/* returns true if the current socket is an IP one */
static bool socket_domain_is_ip(void)
{
switch(socket_domain) {
case AF_INET:
#ifdef ENABLE_IPV6
case AF_INET6:
#endif
return true;
default:
/* case AF_UNIX: */
return false;
}
}
/* based on the testno, parse the correct server commands */ /* based on the testno, parse the correct server commands */
static int parse_servercmd(struct httprequest *req) static int parse_servercmd(struct httprequest *req)
{ {
@ -1286,9 +1301,6 @@ static curl_socket_t connect_to(const char *ipaddr, unsigned short port)
int rc; int rc;
const char *op_br = ""; const char *op_br = "";
const char *cl_br = ""; const char *cl_br = "";
#ifdef TCP_NODELAY
curl_socklen_t flag;
#endif
#ifdef ENABLE_IPV6 #ifdef ENABLE_IPV6
if(socket_domain == AF_INET6) { if(socket_domain == AF_INET6) {
@ -1313,13 +1325,15 @@ static curl_socket_t connect_to(const char *ipaddr, unsigned short port)
} }
#ifdef TCP_NODELAY #ifdef TCP_NODELAY
/* Disable the Nagle algorithm */ if(socket_domain_is_ip()) {
flag = 1; /* Disable the Nagle algorithm */
if(0 != setsockopt(serverfd, IPPROTO_TCP, TCP_NODELAY, curl_socklen_t flag = 1;
(void *)&flag, sizeof(flag))) if(0 != setsockopt(serverfd, IPPROTO_TCP, TCP_NODELAY,
logmsg("====> TCP_NODELAY for server conection failed"); (void *)&flag, sizeof(flag)))
else logmsg("====> TCP_NODELAY for server conection failed");
logmsg("TCP_NODELAY set for server conection"); else
logmsg("TCP_NODELAY set for server conection");
}
#endif #endif
switch(socket_domain) { switch(socket_domain) {
@ -1402,9 +1416,6 @@ static void http_connect(curl_socket_t *infdp,
bool poll_server_rd[2] = { TRUE, TRUE }; bool poll_server_rd[2] = { TRUE, TRUE };
bool poll_client_wr[2] = { TRUE, TRUE }; bool poll_client_wr[2] = { TRUE, TRUE };
bool poll_server_wr[2] = { TRUE, TRUE }; bool poll_server_wr[2] = { TRUE, TRUE };
#ifdef TCP_NODELAY
curl_socklen_t flag;
#endif
bool primary = FALSE; bool primary = FALSE;
bool secondary = FALSE; bool secondary = FALSE;
int max_tunnel_idx; /* CTRL or DATA */ int max_tunnel_idx; /* CTRL or DATA */
@ -1518,13 +1529,15 @@ static void http_connect(curl_socket_t *infdp,
memset(&req2, 0, sizeof(req2)); memset(&req2, 0, sizeof(req2));
logmsg("====> Client connect DATA"); logmsg("====> Client connect DATA");
#ifdef TCP_NODELAY #ifdef TCP_NODELAY
/* Disable the Nagle algorithm */ if(socket_domain_is_ip()) {
flag = 1; /* Disable the Nagle algorithm */
if(0 != setsockopt(datafd, IPPROTO_TCP, TCP_NODELAY, curl_socklen_t flag = 1;
(void *)&flag, sizeof(flag))) if(0 != setsockopt(datafd, IPPROTO_TCP, TCP_NODELAY,
logmsg("====> TCP_NODELAY for client DATA conection failed"); (void *)&flag, sizeof(flag)))
else logmsg("====> TCP_NODELAY for client DATA conection failed");
logmsg("TCP_NODELAY set for client DATA conection"); else
logmsg("TCP_NODELAY set for client DATA conection");
}
#endif #endif
req2.pipelining = FALSE; req2.pipelining = FALSE;
init_httprequest(&req2); init_httprequest(&req2);
@ -1838,15 +1851,17 @@ static curl_socket_t accept_connection(curl_socket_t sock)
num_sockets += 1; num_sockets += 1;
#ifdef TCP_NODELAY #ifdef TCP_NODELAY
/* if(socket_domain_is_ip()) {
* Disable the Nagle algorithm to make it easier to send out a large /*
* response in many small segments to torture the clients more. * Disable the Nagle algorithm to make it easier to send out a large
*/ * response in many small segments to torture the clients more.
if(0 != setsockopt(msgsock, IPPROTO_TCP, TCP_NODELAY, */
(void *)&flag, sizeof(flag))) if(0 != setsockopt(msgsock, IPPROTO_TCP, TCP_NODELAY,
logmsg("====> TCP_NODELAY failed"); (void *)&flag, sizeof(flag)))
else logmsg("====> TCP_NODELAY failed");
logmsg("TCP_NODELAY set"); else
logmsg("TCP_NODELAY set");
}
#endif #endif
return msgsock; return msgsock;