Code normalized.

Created a interface for sock impl.

Author: Jose Damico

java-socks-proxy-server/src/org/jdamico/socks/server/commons/Constants.java

@@ -25,4 +25,6 @@ public interface Constants {
 	public static	final	byte	SC_CONNECT	= 0x01;
 	public static	final	byte	SC_BIND		= 0x02;
 	public static	final	byte	SC_UDP		= 0x03;	
+	
+	public static	final	int		MAX_ADDR_LEN	= 255;
 }

java-socks-proxy-server/src/org/jdamico/socks/server/commons/DebugLog.java

@@ -4,9 +4,8 @@
 
 
 
-import	java.net.Socket;
-import	java.net.DatagramPacket;
-import	java.net.InetAddress;
+import java.net.DatagramPacket;
+import java.net.Socket;
 
 import org.jdamico.socks.server.StartProxy;
 
@@ -49,21 +48,13 @@ public	void	error( Exception e )	{
 		e.printStackTrace();
 	}
 
-	/////////////////////////////////////////////////
-	
-	public	String	iP2Str( InetAddress IP )	{
-		if( IP == null )	return "NA/NA";
-		
-		return	IP.getHostName()+"/"+IP.getHostAddress();
-	}
-	
-	/////////////////////////////////////////////////
+
 
 	public	String	getSocketInfo( Socket sock )	{
 
 		if( sock == null )	return "<NA/NA:0>";
 
-		return	"<"+iP2Str( sock.getInetAddress() )+":"+
+		return	"<"+Utils.getInstance().iP2Str( sock.getInetAddress() )+":"+
 				sock.getPort() + ">";
 	}
 
@@ -73,7 +64,7 @@ public	String	getSocketInfo( DatagramPacket DGP )	{
 
 		if( DGP == null )	return "<NA/NA:0>";
 
-		return	"<"+iP2Str( DGP.getAddress() )+":"+
+		return	"<"+Utils.getInstance().iP2Str( DGP.getAddress() )+":"+
 				DGP.getPort() + ">";
 	}
 

java-socks-proxy-server/src/org/jdamico/socks/server/commons/Utils.java

@@ -0,0 +1,61 @@
+package org.jdamico.socks.server.commons;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+public class Utils {
+	
+	private static Utils INSTANCE = null;
+	private Utils() {}
+	
+	public static Utils getInstance(){
+		if(INSTANCE == null) INSTANCE = new Utils();
+		return INSTANCE;
+	}
+
+	
+	public	InetAddress	calcInetAddress( byte[] addr )	{
+		InetAddress	IA  = null;
+		String		sIA = "";		
+		
+		if( addr.length < 4 )	{
+			DebugLog.getInstance().error( "calcInetAddress() - Invalid length of IP v4 - "+addr.length+" bytes" );	
+			return null;
+		}
+		
+		// IP v4 Address Type
+		for( int i=0; i<4; i++ )	{
+			sIA += byte2int( addr[i] );
+			if( i<3 )	sIA += ".";
+		}
+		
+		try	{
+			IA = InetAddress.getByName( sIA );
+		}
+		catch( UnknownHostException e )	{
+			return null;
+		}
+		
+		return	IA; // IP Address
+	}
+	
+	public	int	byte2int( byte b )	{
+		int	res = b;
+		if( res < 0 ) res = (int)( 0x100 + res );
+		return	res;
+	}
+
+	
+	public	int	calcPort( byte Hi, byte Lo )	{
+		
+		return ( (byte2int( Hi ) << 8) | byte2int( Lo ) );	
+	}
+	
+	
+	public	String	iP2Str( InetAddress IP )	{
+		if( IP == null )	return "NA/NA";
+		
+		return	IP.getHostName()+"/"+IP.getHostAddress();
+	}
+
+}

java-socks-proxy-server/src/org/jdamico/socks/server/impl/ProxyHandler.java

@@ -230,19 +230,19 @@ public	void processRelay()	{
 			}
 			DebugLog.getInstance().println( "Accepted SOCKS "+SOCKS_Version+" Request." );
 
-			comm.Authenticate( SOCKS_Version );
-			comm.GetClientCommand();
+			comm.authenticate( SOCKS_Version );
+			comm.getClientCommand();
 
-			switch ( comm.Command )	{
-			case Constants.SC_CONNECT	:	comm.Connect();
+			switch ( comm.socksCommand )	{
+			case Constants.SC_CONNECT	:	comm.connect();
 										relay();
 										break;
 
-			case Constants.SC_BIND	:	comm.Bind();
+			case Constants.SC_BIND	:	comm.bind();
 										relay();
 										break;
 
-			case Constants.SC_UDP		:	comm.UDP();
+			case Constants.SC_UDP		:	comm.udp();
 										break;
 			}
 		}