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.

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;

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. */