svn commit: r959404 - in /trafficserver/traffic/trunk/proxy: InkAPI.cc api/ts/ts.h

[an...@apache.org]

Author: andrewhsu
Date: Wed Jun 30 18:44:28 2010
New Revision: 959404

URL: http://svn.apache.org/viewvc?rev=959404&view=rev
Log:
TS-18 revert r958062

This reverts commit "TS-18 added INKHttpTxnClientSockAddrGet()":
http://svn.apache.org/viewvc?view=rev&rev=958062

The reverted changes will be moved to a branch called 'ipv6'.

Modified:
    trafficserver/traffic/trunk/proxy/InkAPI.cc
    trafficserver/traffic/trunk/proxy/api/ts/ts.h

Modified: trafficserver/traffic/trunk/proxy/InkAPI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPI.cc?rev=959404&r1=959403&r2=959404&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPI.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkAPI.cc Wed Jun 30 18:44:28 2010
@@ -5815,16 +5815,6 @@ INKHttpTxnTransformRespGet(INKHttpTxn tx
   }
 }
 
-const struct sockaddr_storage *
-INKHttpTxnClientSockAddrGet (INKHttpTxn txnp)
-{
-  if (sdk_sanity_check_txn(txnp)!=INK_SUCCESS) {
-    return 0;
-  }
-  HttpSM *sm = (HttpSM*) txnp;
-  return &sm->t_state.client_info.addr;
-}
-
 unsigned int
 INKHttpTxnClientIPGet(INKHttpTxn txnp)
 {

Modified: trafficserver/traffic/trunk/proxy/api/ts/ts.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/api/ts/ts.h?rev=959404&r1=959403&r2=959404&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/api/ts/ts.h (original)
+++ trafficserver/traffic/trunk/proxy/api/ts/ts.h Wed Jun 30 18:44:28 2010
@@ -32,7 +32,6 @@
 
 #include <sys/types.h>
 #include <stdint.h>
-#include <sys/socket.h>
 
 #define inkapi
 #define inkexp
@@ -1969,24 +1968,6 @@ extern "C"
   inkapi INKReturnCode INKHttpTxnCacheLookupStatusGet(INKHttpTxn txnp, int *lookup_status);
 
   inkapi int INKHttpTxnTransformRespGet(INKHttpTxn txnp, INKMBuffer * bufp, INKMLoc * offset);
-
-  /**
-      Retrieves the socket address of the remote client that has
-      connected to Traffic Server for the current transaction. The
-      return structure is the generic socket address storage in
-      order to be address-family agnostic. The user of this function
-      can then go on to do the approriate thing with the type
-      specified in the ss_family field of the structure whether
-      that be for IPv4, IPv6, or any other address family.
-
-      @sa socket.h for description of struct sockaddr_storage
-
-      @param txnp HTTP transaction of the connection.
-      @return generic socket address storage.
-
-   */
-  inkapi const struct sockaddr_storage * INKHttpTxnClientSockAddrGet(INKHttpTxn txnp);
-
   inkapi unsigned int INKHttpTxnClientIPGet(INKHttpTxn txnp);
   inkapi int INKHttpTxnClientFdGet(INKHttpTxn txnp);
   inkapi INKReturnCode INKHttpTxnClientRemotePortGet(INKHttpTxn txnp, int *port);