Revision: 4902
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4902&view=rev
Author: bphinz
Date: 2012-04-26 00:03:16 +0000 (Thu, 26 Apr 2012)
Log Message:
-----------
Fix Socket methods for querying the socket endpoints. Fix the address displayed
in the info dialog for redirected connections.
Modified Paths:
--------------
trunk/java/com/tigervnc/network/Socket.java
trunk/java/com/tigervnc/network/TcpSocket.java
trunk/java/com/tigervnc/vncviewer/CConn.java
Modified: trunk/java/com/tigervnc/network/Socket.java
===================================================================
--- trunk/java/com/tigervnc/network/Socket.java 2012-04-25 21:20:24 UTC (rev
4901)
+++ trunk/java/com/tigervnc/network/Socket.java 2012-04-26 00:03:16 UTC (rev
4902)
@@ -51,6 +51,7 @@
// information about the remote end of the socket
abstract public String getPeerAddress(); // a string e.g. "192.168.0.1"
+ abstract public String getPeerName();
abstract public int getPeerPort();
abstract public String getPeerEndpoint(); // <address>::<port>
Modified: trunk/java/com/tigervnc/network/TcpSocket.java
===================================================================
--- trunk/java/com/tigervnc/network/TcpSocket.java 2012-04-25 21:20:24 UTC
(rev 4901)
+++ trunk/java/com/tigervnc/network/TcpSocket.java 2012-04-26 00:03:16 UTC
(rev 4902)
@@ -118,15 +118,22 @@
}
public String getPeerAddress() {
- SocketAddress peer =
((SocketDescriptor)getFd()).socket().getRemoteSocketAddress();
+ InetAddress peer = ((SocketDescriptor)getFd()).socket().getInetAddress();
if (peer != null)
- return peer.toString();
+ return peer.getHostAddress();
return "";
}
+ public String getPeerName() {
+ InetAddress peer = ((SocketDescriptor)getFd()).socket().getInetAddress();
+ if (peer != null)
+ return peer.getHostName();
+ return "";
+ }
+
public int getPeerPort() {
- SocketAddress address =
((SocketDescriptor)getFd()).socket().getRemoteSocketAddress();
- return ((InetSocketAddress)address).getPort();
+ int port = ((SocketDescriptor)getFd()).socket().getPort();
+ return port;
}
public String getPeerEndpoint() {
Modified: trunk/java/com/tigervnc/vncviewer/CConn.java
===================================================================
--- trunk/java/com/tigervnc/vncviewer/CConn.java 2012-04-25 21:20:24 UTC
(rev 4901)
+++ trunk/java/com/tigervnc/vncviewer/CConn.java 2012-04-26 00:03:16 UTC
(rev 4902)
@@ -821,7 +821,7 @@
void showInfo() {
JOptionPane.showMessageDialog(viewport,
"Desktop name: "+cp.name()+"\n"
- +"Host: "+serverHost+":"+serverPort+"\n"
+ +"Host: "+sock.getPeerName()+":"+sock.getPeerPort()+"\n"
+"Size: "+cp.width+"x"+cp.height+"\n"
+"Pixel format: "+desktop.getPF().print()+"\n"
+"(server default "+serverPF.print()+")\n"
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Tigervnc-commits mailing list
Tigervnc-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
