Author: zym
Date: Fri Sep 16 09:11:40 2011
New Revision: 1171463
URL: http://svn.apache.org/viewvc?rev=1171463&view=rev
Log:
TS-956 fix the conflict with zlib-1.2.5.1
rename the ON to SOCKOPT_ON, and OFF to SOCKOPT_OFF.
Modified:
trafficserver/traffic/trunk/CHANGES
trafficserver/traffic/trunk/iocore/dns/DNSConnection.cc
trafficserver/traffic/trunk/iocore/net/Connection.cc
trafficserver/traffic/trunk/iocore/net/UnixConnection.cc
trafficserver/traffic/trunk/iocore/net/UnixNetAccept.cc
trafficserver/traffic/trunk/lib/ts/ink_defs.h
trafficserver/traffic/trunk/mgmt/LocalManager.cc
trafficserver/traffic/trunk/mgmt/web2/WebIntrMain.cc
trafficserver/traffic/trunk/proxy/logging/LogSock.cc
Modified: trafficserver/traffic/trunk/CHANGES
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/CHANGES?rev=1171463&r1=1171462&r2=1171463&view=diff
==============================================================================
--- trafficserver/traffic/trunk/CHANGES (original)
+++ trafficserver/traffic/trunk/CHANGES Fri Sep 16 09:11:40 2011
@@ -1,5 +1,7 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 3.1.1
+ *) [TS-956] fix the building with zlib-1.2.5.1.
+
*) [TS-924] More efficient sharing of origin connections.
This also overloads the config for shared connections as follows:
Modified: trafficserver/traffic/trunk/iocore/dns/DNSConnection.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/dns/DNSConnection.cc?rev=1171463&r1=1171462&r2=1171463&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/dns/DNSConnection.cc (original)
+++ trafficserver/traffic/trunk/iocore/dns/DNSConnection.cc Fri Sep 16 09:11:40
2011
@@ -165,7 +165,7 @@ DNSConnection::connect(sockaddr const* a
// cannot do this after connection on non-blocking connect
#ifdef SET_TCP_NO_DELAY
if (opt._use_tcp)
- if ((res = safe_setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, ON, sizeof(int)))
< 0)
+ if ((res = safe_setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, SOCKOPT_ON,
sizeof(int))) < 0)
goto Lerror;
#endif
#ifdef RECV_BUF_SIZE
@@ -173,7 +173,7 @@ DNSConnection::connect(sockaddr const* a
#endif
#ifdef SET_SO_KEEPALIVE
// enables 2 hour inactivity probes, also may fix IRIX FIN_WAIT_2 leak
- if ((res = safe_setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, ON, sizeof(int))) <
0)
+ if ((res = safe_setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, SOCKOPT_ON,
sizeof(int))) < 0)
goto Lerror;
#endif
Modified: trafficserver/traffic/trunk/iocore/net/Connection.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/Connection.cc?rev=1171463&r1=1171462&r2=1171463&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/Connection.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/Connection.cc Fri Sep 16 09:11:40
2011
@@ -101,7 +101,7 @@ Server::accept(Connection * c)
#endif
#ifdef SET_SO_KEEPALIVE
// enables 2 hour inactivity probes, also may fix IRIX FIN_WAIT_2 leak
- if ((res = safe_setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, ON, sizeof(int))) <
0)
+ if ((res = safe_setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, SOCKOPT_ON,
sizeof(int))) < 0)
goto Lerror;
#endif
@@ -202,12 +202,12 @@ Server::setup_fd_for_listen(
}
#endif
#ifdef SET_TCP_NO_DELAY
- if ((res = safe_setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, ON, sizeof(int))) <
0)
+ if ((res = safe_setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, SOCKOPT_ON,
sizeof(int))) < 0)
goto Lerror;
#endif
#ifdef SET_SO_KEEPALIVE
// enables 2 hour inactivity probes, also may fix IRIX FIN_WAIT_2 leak
- if ((res = safe_setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, ON, sizeof(int))) <
0)
+ if ((res = safe_setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, SOCKOPT_ON,
sizeof(int))) < 0)
goto Lerror;
#endif
@@ -332,22 +332,22 @@ Server::listen(bool non_blocking, int re
}
#endif
- if (ink_inet_is_ip6(&addr) && (res = safe_setsockopt(fd, IPPROTO_IPV6,
IPV6_V6ONLY, ON, sizeof(int))) < 0)
+ if (ink_inet_is_ip6(&addr) && (res = safe_setsockopt(fd, IPPROTO_IPV6,
IPV6_V6ONLY, SOCKOPT_ON, sizeof(int))) < 0)
goto Lerror;
- if ((res = safe_setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, ON, sizeof(int))) <
0)
+ if ((res = safe_setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, SOCKOPT_ON,
sizeof(int))) < 0)
goto Lerror;
if ((res = socketManager.ink_bind(fd, &addr.sa, ink_inet_ip_size(&addr.sa),
IPPROTO_TCP)) < 0) {
goto Lerror;
}
#ifdef SET_TCP_NO_DELAY
- if ((res = safe_setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, ON, sizeof(int))) <
0)
+ if ((res = safe_setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, SOCKOPT_ON,
sizeof(int))) < 0)
goto Lerror;
#endif
#ifdef SET_SO_KEEPALIVE
// enables 2 hour inactivity probes, also may fix IRIX FIN_WAIT_2 leak
- if ((res = safe_setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, ON, sizeof(int))) <
0)
+ if ((res = safe_setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, SOCKOPT_ON,
sizeof(int))) < 0)
goto Lerror;
#endif
Modified: trafficserver/traffic/trunk/iocore/net/UnixConnection.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/UnixConnection.cc?rev=1171463&r1=1171462&r2=1171463&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/UnixConnection.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/UnixConnection.cc Fri Sep 16
09:11:40 2011
@@ -274,11 +274,11 @@ Connection::open(NetVCOptions const& opt
if (SOCK_STREAM == sock_type) {
if (opt.sockopt_flags & NetVCOptions::SOCK_OPT_NO_DELAY) {
- safe_setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, ON, sizeof(int));
+ safe_setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, SOCKOPT_ON, sizeof(int));
Debug("socket", "::open: setsockopt() TCP_NODELAY on socket");
}
if (opt.sockopt_flags & NetVCOptions::SOCK_OPT_KEEP_ALIVE) {
- safe_setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, ON, sizeof(int));
+ safe_setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, SOCKOPT_ON, sizeof(int));
Debug("socket", "::open: setsockopt() SO_KEEPALIVE on socket");
}
}
Modified: trafficserver/traffic/trunk/iocore/net/UnixNetAccept.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/UnixNetAccept.cc?rev=1171463&r1=1171462&r2=1171463&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/UnixNetAccept.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/UnixNetAccept.cc Fri Sep 16 09:11:40
2011
@@ -429,11 +429,11 @@ NetAccept::acceptFastEvent(int event, vo
}
}
if (sockopt_flags & 1) { // we have to disable Nagle
- safe_setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, ON, sizeof(int));
+ safe_setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, SOCKOPT_ON, sizeof(int));
Debug("socket", "::acceptFastEvent: setsockopt() TCP_NODELAY on
socket");
}
if (sockopt_flags & 2) {
- safe_setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, ON, sizeof(int));
+ safe_setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, SOCKOPT_ON, sizeof(int));
Debug("socket", "::acceptFastEvent: setsockopt() SO_KEEPALIVE on
socket");
}
do {
Modified: trafficserver/traffic/trunk/lib/ts/ink_defs.h
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/ink_defs.h?rev=1171463&r1=1171462&r2=1171463&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/ink_defs.h (original)
+++ trafficserver/traffic/trunk/lib/ts/ink_defs.h Fri Sep 16 09:11:40 2011
@@ -27,8 +27,8 @@
/* Defines
*/
#define SIZE(x) (sizeof(x)/sizeof((x)[0]))
-#define ON ((char*)&on)
-#define OFF ((char*)&off)
+#define SOCKOPT_ON ((char*)&on)
+#define SOCKOPT_OFF ((char*)&off)
#ifndef ABS
#define ABS(_x_) (((_x_) < 0) ? ( - (_x_)) : (_x_))
#endif
Modified: trafficserver/traffic/trunk/mgmt/LocalManager.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/LocalManager.cc?rev=1171463&r1=1171462&r2=1171463&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/LocalManager.cc (original)
+++ trafficserver/traffic/trunk/mgmt/LocalManager.cc Fri Sep 16 09:11:40 2011
@@ -1289,7 +1289,7 @@ bindProxyPort(int proxy_port, char *inco
_exit(1);
}
if (domain == AF_INET6) {
- if (setsockopt(proxy_port_fd, IPPROTO_IPV6, IPV6_V6ONLY, ON, sizeof(int))
< 0) {
+ if (setsockopt(proxy_port_fd, IPPROTO_IPV6, IPV6_V6ONLY, SOCKOPT_ON,
sizeof(int)) < 0) {
mgmt_elog(stderr, "[bindProxyPort] Unable to set socket options: %d :
%s\n", proxy_port, strerror(errno));
}
}
Modified: trafficserver/traffic/trunk/mgmt/web2/WebIntrMain.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/web2/WebIntrMain.cc?rev=1171463&r1=1171462&r2=1171463&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/web2/WebIntrMain.cc (original)
+++ trafficserver/traffic/trunk/mgmt/web2/WebIntrMain.cc Fri Sep 16 09:11:40
2011
@@ -519,7 +519,7 @@ webIntr_main(void *x)
#endif
ink_atomic_increment((int32_t *) & numServiceThr, -1);
} else { // Accept succeeded
- if (safe_setsockopt(clientFD, IPPROTO_TCP, TCP_NODELAY, ON, sizeof(int))
< 0) {
+ if (safe_setsockopt(clientFD, IPPROTO_TCP, TCP_NODELAY, SOCKOPT_ON,
sizeof(int)) < 0) {
mgmt_log(stderr, "[WebIntrMain]Failed to set sock options: %s\n",
strerror(errno));
}
Modified: trafficserver/traffic/trunk/proxy/logging/LogSock.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logging/LogSock.cc?rev=1171463&r1=1171462&r2=1171463&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logging/LogSock.cc (original)
+++ trafficserver/traffic/trunk/proxy/logging/LogSock.cc Fri Sep 16 09:11:40
2011
@@ -127,7 +127,7 @@ LogSock::listen(int accept_port)
return -1;
}
// REUSEADDR
- if ((ret = safe_setsockopt(accept_sd, SOL_SOCKET, SO_REUSEADDR, ON,
sizeof(int))) < 0) {
+ if ((ret = safe_setsockopt(accept_sd, SOL_SOCKET, SO_REUSEADDR, SOCKOPT_ON,
sizeof(int))) < 0) {
Warning("Could not set option REUSEADDR on socket (%d): %s", ret,
strerror(errno));
return -1;
}
@@ -142,12 +142,12 @@ LogSock::listen(int accept_port)
return -1;
}
- if ((ret = safe_setsockopt(accept_sd, IPPROTO_TCP, TCP_NODELAY, ON,
sizeof(int))) < 0) {
+ if ((ret = safe_setsockopt(accept_sd, IPPROTO_TCP, TCP_NODELAY, SOCKOPT_ON,
sizeof(int))) < 0) {
Warning("Could not set option TCP_NODELAY on socket (%d): %s", ret,
strerror(errno));
return -1;
}
- if ((ret = safe_setsockopt(accept_sd, SOL_SOCKET, SO_KEEPALIVE, ON,
sizeof(int))) < 0) {
+ if ((ret = safe_setsockopt(accept_sd, SOL_SOCKET, SO_KEEPALIVE, SOCKOPT_ON,
sizeof(int))) < 0) {
Warning("Could not set option SO_KEEPALIVE on socket (%d): %s", ret,
strerror(errno));
return -1;
}
@@ -273,12 +273,12 @@ LogSock::connect(unsigned host_ip, int p
return LogSock::LS_ERROR_SOCKET;
}
- if ((ret = safe_setsockopt(connect_sd, IPPROTO_TCP, TCP_NODELAY, ON,
sizeof(int))) < 0) {
+ if ((ret = safe_setsockopt(connect_sd, IPPROTO_TCP, TCP_NODELAY, SOCKOPT_ON,
sizeof(int))) < 0) {
Note("Could not set option TCP_NODELAY on socket (%d): %s", ret,
strerror(errno));
return -1;
}
- if ((ret = safe_setsockopt(connect_sd, SOL_SOCKET, SO_KEEPALIVE, ON,
sizeof(int))) < 0) {
+ if ((ret = safe_setsockopt(connect_sd, SOL_SOCKET, SO_KEEPALIVE, SOCKOPT_ON,
sizeof(int))) < 0) {
Note("Could not set option SO_KEEPALIVE on socket (%d): %s", ret,
strerror(errno));
return -1;
}
