trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject [1/2] trafficserver git commit: TS-4070: RemapProcessor Forward Mapping w/ Recv Port failing w/ TS-2157 changes. This closes #375.
Date Fri, 22 Jan 2016 19:21:51 GMT
Repository: trafficserver
Updated Branches:
  refs/heads/6.1.x dcdbcd913 -> c59b94663


TS-4070: RemapProcessor Forward Mapping w/ Recv Port failing w/ TS-2157 changes.
This closes #375.

During the rework of RemapProcessor.cc, RemapProcessor::setup_for_remap()
as part of the TS-2157 changeset, the port access API appears to have been
incorrectly modified to use the client_info.src_addr.host_order_port() API
[source port, host order] instead of the client_info.dst_addr.port()
[destination/receive port, network order] API. This caused port based
remapping based on the receive port to fail with ATS 6.0.0.

(cherry picked from commit 894ef7f859772508331bdb610036baa9fafe81c6)


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/4ce267d2
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/4ce267d2
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/4ce267d2

Branch: refs/heads/6.1.x
Commit: 4ce267d2a6ff9db1d135ff989d862bb60196b04f
Parents: dcdbcd9
Author: Craig Schomburg <craigs@cisco.com>
Authored: Thu Dec 17 07:19:44 2015 -0500
Committer: Leif Hedstrom <zwoop@apache.org>
Committed: Fri Jan 22 12:01:03 2016 -0700

----------------------------------------------------------------------
 proxy/http/remap/RemapProcessor.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4ce267d2/proxy/http/remap/RemapProcessor.cc
----------------------------------------------------------------------
diff --git a/proxy/http/remap/RemapProcessor.cc b/proxy/http/remap/RemapProcessor.cc
index 1c1e029..4040118 100644
--- a/proxy/http/remap/RemapProcessor.cc
+++ b/proxy/http/remap/RemapProcessor.cc
@@ -87,8 +87,8 @@ RemapProcessor::setup_for_remap(HttpTransact::State *s)
   Debug("url_rewrite", "[lookup] attempting %s lookup", proxy_request ? "proxy" : "normal");
 
   if (rewrite_table->num_rules_forward_with_recv_port) {
-    Debug("url_rewrite", "[lookup] forward mappings with recv port found; Using recv port
%d", s->client_info.src_addr.port());
-    if (rewrite_table->forwardMappingWithRecvPortLookup(request_url, s->client_info.src_addr.host_order_port(),
request_host,
+    Debug("url_rewrite", "[lookup] forward mappings with recv port found; Using recv port
%d", s->client_info.dst_addr.port());
+    if (rewrite_table->forwardMappingWithRecvPortLookup(request_url, s->client_info.dst_addr.port(),
request_host,
                                                         request_host_len, s->url_map))
{
       Debug("url_rewrite", "Found forward mapping with recv port");
       mapping_found = true;


Mime
View raw message