diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2004-03-25 13:37:18 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2004-03-25 13:37:18 +0000 |
| commit | bb3d6e8552f428bd0c2624854403d36ab3cf163d (patch) | |
| tree | 3844a61e49ad9a1bdddd671681bfc1845f04ce95 /lib/connect.c | |
| parent | 189c2f498987e443836aada953ace7795202e350 (diff) | |
tcp-nodelay patch by Joe Halpin
Diffstat (limited to 'lib/connect.c')
| -rw-r--r-- | lib/connect.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/lib/connect.c b/lib/connect.c index 04e3d234b..28783445e 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -31,6 +31,7 @@ #endif #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> +#include <netinet/tcp.h> /* for TCP_NODELAY */ #endif #include <sys/ioctl.h> #ifdef HAVE_UNISTD_H @@ -476,6 +477,23 @@ CURLcode Curl_is_connected(struct connectdata *conn, return CURLE_OK; } +static void Curl_setNoDelay(struct connectdata *conn, + curl_socket_t sockfd, + int ip) +{ +#ifdef TCP_NODELAY + struct SessionHandle *data= conn->data; + socklen_t onoff = (socklen_t) data->tcp_nodelay; + infof(data,"Setting TCP_NODELAY for IPv%d\n", ip); + if(setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, &onoff, sizeof(onoff)) < 0) + infof(data, "Could not set TCP_NODELAY: %s\n", + Curl_strerror(conn, Curl_ourerrno())); +#else + (void)conn; + (void)sockfd; + (void)ip; +#endif +} /* * TCP connect to the given host with timeout, proxy or remote doesn't matter. @@ -554,6 +572,9 @@ CURLcode Curl_connecthost(struct connectdata *conn, /* context */ sockfd = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol); if (sockfd == CURL_SOCKET_BAD) continue; + + else if(data->tcp_nodelay) + Curl_setNoDelay(conn, sockfd, 6); #else /* * Connecting with old style IPv4-only support @@ -573,6 +594,9 @@ CURLcode Curl_connecthost(struct connectdata *conn, /* context */ return CURLE_COULDNT_CONNECT; /* big time error */ } + else if(data->tcp_nodelay) + Curl_setNoDelay(conn, sockfd, 4); + /* nasty address work before connect can be made */ memset((char *) &serv_addr, '\0', sizeof(serv_addr)); memcpy((char *)&(serv_addr.sin_addr), |