Azureus / Vuze

Update of /cvsroot/azureus/azureus2/org/gudy/azureus2/core3/tracker/server/impl/tcp
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv17365/org/gudy/azureus2/core3/tracker/server/impl/tcp

Modified Files:
	TRTrackerServerProcessorTCP.java TRTrackerServerTCP.java 
Log Message:
added access to localaddress

Index: TRTrackerServerTCP.java
===================================================================
RCS file: /cvsroot/azureus/azureus2/org/gudy/azureus2/core3/tracker/server/impl/tcp/TRTrackerServerTCP.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- TRTrackerServerTCP.java	1 Jul 2009 23:50:53 -0000	1.48
+++ TRTrackerServerTCP.java	28 Jul 2009 01:14:18 -0000	1.49
@@ -297,6 +297,7 @@
 	
 	protected boolean
 	handleExternalRequest(
+		final InetSocketAddress		local_address,
 		final InetSocketAddress		client_address,
 		final String				user,
 		final String				url,
@@ -332,6 +333,12 @@
 						return( client_address );
 					}
 					
+					public InetSocketAddress
+					getLocalAddress()
+					{
+						return( local_address );
+					}
+					
 					public String
 					getUser()
 					{

Index: TRTrackerServerProcessorTCP.java
===================================================================
RCS file: /cvsroot/azureus/azureus2/org/gudy/azureus2/core3/tracker/server/impl/tcp/TRTrackerServerProcessorTCP.java,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- TRTrackerServerProcessorTCP.java	1 Jul 2009 23:50:53 -0000	1.76
+++ TRTrackerServerProcessorTCP.java	28 Jul 2009 01:14:18 -0000	1.77
@@ -105,7 +105,8 @@
 		String				input_header,
 		String				lowercase_input_header,
 		String				url_path,
-		InetSocketAddress	client_address,
+		InetSocketAddress	local_address,
+		InetSocketAddress	remote_address,
 		boolean				announce_and_scrape_only,
 		boolean				keep_alive,
 		InputStream			is,
@@ -180,7 +181,7 @@
 						
 						boolean[] ka = new boolean[]{ keep_alive };
 						
-						if ( handleExternalRequest( client_address, user, str, input_header, is, os, async, ka )){
+						if ( handleExternalRequest( local_address, remote_address, user, str, input_header, is, os, async, ka )){
 						
 							return( ka[0] );
 						}
@@ -270,7 +271,7 @@
 				
 				DHTNetworkPosition	network_position = null;
 				
-				String		real_ip_address		= client_address.getAddress().getHostAddress();
+				String		real_ip_address		= remote_address.getAddress().getHostAddress();
 				String		client_ip_address	= real_ip_address;
 				
 				while(pos < str.length()){
@@ -456,7 +457,7 @@
 						if ( lhs.equals( "aznp" )){
 
 							try{
-								network_position = DHTNetworkPositionManager.deserialisePosition( client_address.getAddress(), Base32.decode( rhs ));
+								network_position = DHTNetworkPositionManager.deserialisePosition( remote_address.getAddress(), Base32.decode( rhs ));
 																
 							}catch( Throwable e ){
 								
@@ -928,7 +929,8 @@
 		
 	protected boolean
 	handleExternalRequest(
-		InetSocketAddress	client_address,
+		InetSocketAddress	local_address,
+		InetSocketAddress	remote_address,
 		String				user,
 		String				url,
 		String				header,
@@ -941,6 +943,6 @@
 	{
 		URL	absolute_url = new URL( server_url + (url.startsWith("/")?url:("/"+url)));
 			
-		return( server.handleExternalRequest(client_address,user,url,absolute_url,header, is, os, async, keep_alive ));
+		return( server.handleExternalRequest( local_address, remote_address, user,url,absolute_url,header, is, os, async, keep_alive ));
 	}
 }