Fix getSockPort methods in java TcpSocket

Although not actually used anywhere, the getSockPort method was
actually returning the the remote socket's port number.

Also simplified some of the other socket methods.

diff --git a/java/com/tigervnc/network/TcpListener.java b/java/com/tigervnc/network/TcpListener.java
index 6170a6021cbf83e9e76423c656fb1cef549614dc..45ee8a4dd4473d417a5d55a78d5f408b12d5da6d 100644 (file)
--- a/java/com/tigervnc/network/TcpListener.java
+++ b/java/com/tigervnc/network/TcpListener.java
@@ -144,9 +144,9 @@ public class TcpListener extends SocketListener  {
     return s;
   }
 
-  //public int getMyPort() {
-  //  return TcpSocket.getSockPort();
-  //}
+  public int getMyPort() {
+    return ((SocketDescriptor)getFd()).socket().getLocalPort();
+  }
 
   private boolean closeFd;
   private ServerSocketChannel channel;

diff --git a/java/com/tigervnc/network/TcpSocket.java b/java/com/tigervnc/network/TcpSocket.java
index 051a9d82392c1e0d91a80e3f68d08599cd51be15..43787e4d3cfd004e55b7ee9ec85fc542e78f6f6b 100644 (file)
--- a/java/com/tigervnc/network/TcpSocket.java
+++ b/java/com/tigervnc/network/TcpSocket.java
@@ -113,8 +113,7 @@ public class TcpSocket extends Socket {
   }
 
   public int getMyPort() {
-    SocketAddress address = ((SocketDescriptor)getFd()).socket().getLocalSocketAddress();
-    return ((InetSocketAddress)address).getPort();
+    return getSockPort();
   }
 
   public String getPeerAddress() {
@@ -184,7 +183,7 @@ public class TcpSocket extends Socket {
   }
 
   public int getSockPort() {
-    return ((InetSocketAddress)((SocketDescriptor)getFd()).socket().getRemoteSocketAddress()).getPort();
+    return ((SocketDescriptor)getFd()).socket().getLocalPort();
   }
 
   /* Tunnelling support. */