From 86b15b23fc83de52255db2ea9d7e621e5bd22706 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Sat, 8 Nov 2008 10:19:17 +0000 Subject: * Delete unused methods in JSOCKS library. * Replace keyboard picture with JPEG. --- res/drawable/keyboard.jpg | Bin 0 -> 20844 bytes res/drawable/keyboard.png | Bin 152330 -> 0 bytes src/net/sourceforge/jsocks/Socks5DatagramSocket.java | 7 ------- src/net/sourceforge/jsocks/SocksServerSocket.java | 15 --------------- src/net/sourceforge/jsocks/SocksSocket.java | 14 -------------- 5 files changed, 36 deletions(-) create mode 100644 res/drawable/keyboard.jpg delete mode 100644 res/drawable/keyboard.png diff --git a/res/drawable/keyboard.jpg b/res/drawable/keyboard.jpg new file mode 100644 index 0000000..4083577 Binary files /dev/null and b/res/drawable/keyboard.jpg differ diff --git a/res/drawable/keyboard.png b/res/drawable/keyboard.png deleted file mode 100644 index a62e9dd..0000000 Binary files a/res/drawable/keyboard.png and /dev/null differ diff --git a/src/net/sourceforge/jsocks/Socks5DatagramSocket.java b/src/net/sourceforge/jsocks/Socks5DatagramSocket.java index c1bda57..bb73ccd 100644 --- a/src/net/sourceforge/jsocks/Socks5DatagramSocket.java +++ b/src/net/sourceforge/jsocks/Socks5DatagramSocket.java @@ -344,13 +344,6 @@ public class Socks5DatagramSocket extends DatagramSocket{ } - private byte[] formHeader(String host,int port){ - Socks5Message request = new Socks5Message(0,host,port); - request.data[0] = 0; - return request.data; - } - - /*====================================================================== //Mainly Test functions diff --git a/src/net/sourceforge/jsocks/SocksServerSocket.java b/src/net/sourceforge/jsocks/SocksServerSocket.java index 3095b28..739251d 100644 --- a/src/net/sourceforge/jsocks/SocksServerSocket.java +++ b/src/net/sourceforge/jsocks/SocksServerSocket.java @@ -154,21 +154,6 @@ public class SocksServerSocket extends ServerSocket{ //Private Methods ////////////////// - private void processReply(ProxyMessage reply)throws SocksException{ - localPort = reply.port; - /* - * If the server have assigned same host as it was contacted on - * it might return an address of all zeros - */ - if(reply.host.equals("0.0.0.0")){ - localIP = proxy.proxyIP; - localHost = localIP.getHostName(); - }else{ - localHost = reply.host; - localIP = reply.ip; - } - } - private void doDirect(){ doing_direct = true; localPort = super.getLocalPort(); diff --git a/src/net/sourceforge/jsocks/SocksSocket.java b/src/net/sourceforge/jsocks/SocksSocket.java index 5263bb6..95a7e42 100644 --- a/src/net/sourceforge/jsocks/SocksSocket.java +++ b/src/net/sourceforge/jsocks/SocksSocket.java @@ -273,20 +273,6 @@ public class SocksSocket extends Socket{ //Private Methods ////////////////// - private void processReply(ProxyMessage reply)throws SocksException{ - localPort = reply.port; - /* - * If the server have assigned same host as it was contacted on - * it might return an address of all zeros - */ - if(reply.host.equals("0.0.0.0")){ - localIP = proxy.proxyIP; - localHost = localIP.getHostName(); - }else{ - localHost = reply.host; - localIP = reply.ip; - } - } private void doDirect()throws SocksException{ try{ //System.out.println("IP:"+remoteIP+":"+remotePort); -- cgit v1.2.3