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

[am...@apache.org]

Author: amc
Date: Thu May 26 01:23:36 2011
New Revision: 1127747

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

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=1127747&r1=1127746&r2=1127747&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPI.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkAPI.cc Thu May 26 01:23:36 2011
@@ -5125,6 +5125,10 @@ TSHttpTxnServerAddrGet(TSHttpTxn txnp)
   sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
 
   HttpSM *sm = reinterpret_cast<HttpSM *>(txnp);
+  ink_inet_ip4_set(&sm->t_state.server_info.addr,
+    sm->t_state.server_info.ip,
+    sm->t_state.server_info.port
+  );
   return ink_inet_sa_cast(&sm->t_state.server_info.addr);
 }
 

Modified: trafficserver/traffic/trunk/proxy/InkAPITest.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPITest.cc?rev=1127747&r1=1127746&r2=1127747&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPITest.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkAPITest.cc Thu May 26 01:23:36 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");
+    SDK_RPRINT(test->regtest, "TSHttpTxnClientIPGet", "TestCase1", TC_PASS, "ok [%08x]", ip);
   } else {
     test->test_client_ip_get = false;
-    SDK_RPRINT(test->regtest, "TSHttpTxnClientIPGet", "TestCase1", TC_FAIL, "Value's Mismatch");
+    SDK_RPRINT(test->regtest, "TSHttpTxnClientIPGet", "TestCase1", TC_FAIL, "Value's Mismatch [expected %08x got %08x]", 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");
+    SDK_RPRINT(test->regtest, "TSHttpTxnNextHopIPGet", "TestCase1", TC_FAIL, "Value's Mismatch [expected %08x got %08x]", actual_ip, nexthopip);
   }
 
   return TS_EVENT_CONTINUE;
@@ -2258,7 +2258,7 @@ checkHttpTxnClientIncomingPortGet(Socket
   port = ink_inet_port_cast(ptr);
 
   if (TSMgmtIntGet("proxy.config.http.server_port", &port_from_config_file) != TS_SUCCESS) {
-    port_from_config_file = 8080;
+    port_from_config_file = htons(8080);
   }
 
   TSDebug(UTDBG_TAG, "TS HTTP port = %x, Txn incoming client port %x", (int) port_from_config_file, port);
@@ -2296,7 +2296,7 @@ checkHttpTxnClientRemotePortGet(SocketTe
   port = ink_inet_port_cast(ptr);
   TSDebug(UTDBG_TAG, "Browser port = %x, Txn remote port = %x", browser_port, port);
 
-  if (ntohs(port) == browser_port) {
+  if (port == browser_port) {
     SDK_RPRINT(test->regtest, "TSHttpTxnClientRemotePortGet", "TestCase1", TC_PASS, "ok");
     test->test_client_remote_port_get = true;
   } else {