Updated Branches: refs/heads/master 803567372 -> b0b1bbdcf
TS-1884: remove deprecated IPv4-only NetProcessor API Remove the IPv4-only versions of NetProcessor::connect_re() and NetProcessor::connect_s(). Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/b0b1bbdc Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/b0b1bbdc Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/b0b1bbdc Branch: refs/heads/master Commit: b0b1bbdcf0c3ffa0cec90ea22af6bbd12219d1c8 Parents: 8035673 Author: James Peach <[email protected]> Authored: Wed May 8 16:48:04 2013 -0700 Committer: James Peach <[email protected]> Committed: Wed May 8 16:48:04 2013 -0700 ---------------------------------------------------------------------- CHANGES | 3 ++ iocore/cluster/ClusterHandlerBase.cc | 10 ++++---- iocore/net/I_NetProcessor.h | 32 ----------------------------- proxy/SocksProxy.cc | 5 +++- 4 files changed, 12 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b0b1bbdc/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index dc7729e..f501e75 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 3.3.3 + + *) [TS-1884] Remove deprecated IPv4-only NetProcessor API. + *) [TS-1444] [TS-1881] URL lookup with regex through the web interface was broken. *) [TS-1880] Use pthread_setname_np to set the thread name on multiple platforms. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b0b1bbdc/iocore/cluster/ClusterHandlerBase.cc ---------------------------------------------------------------------- diff --git a/iocore/cluster/ClusterHandlerBase.cc b/iocore/cluster/ClusterHandlerBase.cc index b245db6..dd84da9 100644 --- a/iocore/cluster/ClusterHandlerBase.cc +++ b/iocore/cluster/ClusterHandlerBase.cc @@ -849,12 +849,12 @@ ClusterHandler::connectClusterEvent(int event, Event * e) opt.addr_binding = NetVCOptions::INTF_ADDR; opt.local_ip = this_cluster_machine()->ip; + struct sockaddr_in addr; + ats_ip4_set(&addr, machine->ip, + htons(machine->cluster_port ? machine->cluster_port : cluster_port)); + // TODO: Should we check the Action* returned here? - netProcessor.connect_re(this, machine->ip, - machine->cluster_port - ? machine->cluster_port - : cluster_port, - &opt); + netProcessor.connect_re(this, ats_ip_sa_cast(&addr), &opt); return EVENT_DONE; } else { if (event == NET_EVENT_OPEN) { http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b0b1bbdc/iocore/net/I_NetProcessor.h ---------------------------------------------------------------------- diff --git a/iocore/net/I_NetProcessor.h b/iocore/net/I_NetProcessor.h index 25b12f7..af5d6b0 100644 --- a/iocore/net/I_NetProcessor.h +++ b/iocore/net/I_NetProcessor.h @@ -222,21 +222,6 @@ public: ); /** - @deprecated preserve backward compatibility with non-IPv6 iocore - */ - inkcoreapi Action *connect_re( - Continuation * cont, - unsigned int ip, - int port, - NetVCOptions * options = NULL - ) { - struct sockaddr_in addr; - - ats_ip4_set(&addr, ip, htons(port)); - return connect_re(cont, ats_ip_sa_cast(&addr), options); - } - - /** Open a NetVConnection for connection oriented I/O. This call is simliar to connect method except that the cont is called back only after the connections has been established. In the @@ -263,23 +248,6 @@ public: ); /** - @deprecated preserve backward compatibility with non-IPv6 iocore - */ - - Action *connect_s( - Continuation * cont, - unsigned int ip, - int port, - int timeout = NET_CONNECT_TIMEOUT, - NetVCOptions * opts = NULL - ) { - struct sockaddr_in addr; - - ats_ip4_set(&addr, ip, htons(port)); - return connect_s(cont, ats_ip_sa_cast(&addr), timeout, opts); - } - - /** Starts the Netprocessor. This has to be called before doing any other net call. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b0b1bbdc/proxy/SocksProxy.cc ---------------------------------------------------------------------- diff --git a/proxy/SocksProxy.cc b/proxy/SocksProxy.cc index ef084b2..10b2b10 100644 --- a/proxy/SocksProxy.cc +++ b/proxy/SocksProxy.cc @@ -312,7 +312,10 @@ SocksProxy::mainEvent(int event, void *data) } uint32_t ip; + struct sockaddr_in addr; + memcpy(&ip, &p[4], 4); + ats_ip4_set(&addr, ip, htons(port)); state = SERVER_TUNNEL; clientVIO = vio; // used in the tunnel @@ -323,7 +326,7 @@ SocksProxy::mainEvent(int event, void *data) vc_options.socks_support = p[1]; vc_options.socks_version = version; - Action *action = netProcessor.connect_re(this, ip, port, &vc_options); + Action *action = netProcessor.connect_re(this, ats_ip_sa_cast(&addr), &vc_options); if (action != ACTION_RESULT_DONE) { ink_assert(pending_action == NULL); pending_action = action;
