svn commit: r1127751 - in /trafficserver/traffic/trunk/proxy: InkAPI.cc InkAPITest.cc

[am...@apache.org]

Author: amc
Date: Thu May 26 01:58:27 2011
New Revision: 1127751

URL: http://svn.apache.org/viewvc?rev=1127751&view=rev
Log:
Testing for TS-679 repair v2

Modified:
    trafficserver/traffic/trunk/proxy/InkAPI.cc
    trafficserver/traffic/trunk/proxy/InkAPITest.cc

Modified: trafficserver/traffic/trunk/proxy/InkAPI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPI.cc?rev=1127751&r1=1127750&r2=1127751&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPI.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkAPI.cc Thu May 26 01:58:27 2011
@@ -5081,9 +5081,16 @@ sockaddr const*
 TSHttpTxnClientAddrGet(TSHttpTxn txnp)
 {
   sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
+ 
+  TSHttpSsn ssnp = TSHttpTxnSsnGet(txnp);
+  HttpClientSession *cs = reinterpret_cast<HttpClientSession *>(ssnp);
 
-  HttpSM *sm = (HttpSM*) txnp;
-  return ink_inet_sa_cast(&sm->t_state.client_info.addr);
+  if (cs == NULL) return 0;
+
+  NetVConnection *vc = cs->get_netvc();
+  if (vc == NULL) return 0;
+
+  return ink_inet_sa_cast(vc->get_remote_addr());
 }
 
 unsigned int
@@ -5100,7 +5107,7 @@ TSHttpTxnIncomingAddrGet(TSHttpTxn txnp)
   sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
  
   TSHttpSsn ssnp = TSHttpTxnSsnGet(txnp);
-  HttpClientSession *cs = (HttpClientSession *) ssnp;
+  HttpClientSession *cs = reinterpret_cast<HttpClientSession *>(ssnp);
 
   if (cs == NULL) return 0;
 

Modified: trafficserver/traffic/trunk/proxy/InkAPITest.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPITest.cc?rev=1127751&r1=1127750&r2=1127751&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPITest.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkAPITest.cc Thu May 26 01:58:27 2011
@@ -2173,10 +2173,10 @@ checkHttpTxnClientIPGet(SocketTest * tes
 
   if (ntohl(ip) == actual_ip) {
     test->test_client_ip_get = true;
-    SDK_RPRINT(test->regtest, "TSHttpTxnClientIPGet", "TestCase1", TC_PASS, "ok [%08x]", ip);
+    SDK_RPRINT(test->regtest, "TSHttpTxnClientIPGet", "TestCase1", TC_PASS, "ok [%0.8x]", ip);
   } else {
     test->test_client_ip_get = false;
-    SDK_RPRINT(test->regtest, "TSHttpTxnClientIPGet", "TestCase1", TC_FAIL, "Value's Mismatch [expected %08x got %08x]", actual_ip, ip);
+    SDK_RPRINT(test->regtest, "TSHttpTxnClientIPGet", "TestCase1", TC_FAIL, "Value's Mismatch [expected %0.8x got %0.8x]", actual_ip, ip);
   }
   return TS_EVENT_CONTINUE;
 
@@ -2203,7 +2203,7 @@ checkHttpTxnNextHopIPGet(SocketTest * te
     SDK_RPRINT(test->regtest, "TSHttpTxnNextHopIPGet", "TestCase1", TC_PASS, "ok");
   } else {
     test->test_next_hop_ip_get = false;
-    SDK_RPRINT(test->regtest, "TSHttpTxnNextHopIPGet", "TestCase1", TC_FAIL, "Value's Mismatch [expected %08x got %08x]", actual_ip, nexthopip);
+    SDK_RPRINT(test->regtest, "TSHttpTxnNextHopIPGet", "TestCase1", TC_FAIL, "Value's Mismatch [expected %0.8x got %0.8x]", actual_ip, nexthopip);
   }
 
   return TS_EVENT_CONTINUE;
@@ -2255,10 +2255,10 @@ checkHttpTxnClientIncomingPortGet(Socket
     test->test_client_incoming_port_get = false;
     return TS_EVENT_CONTINUE;
   }
-  port = ink_inet_port_cast(ptr);
+  port = ntohs(ink_inet_port_cast(ptr));
 
   if (TSMgmtIntGet("proxy.config.http.server_port", &port_from_config_file) != TS_SUCCESS) {
-    port_from_config_file = htons(8080);
+    port_from_config_file = 8080;
   }
 
   TSDebug(UTDBG_TAG, "TS HTTP port = %x, Txn incoming client port %x", (int) port_from_config_file, port);