# HG changeset patch # User oc # Date 1402519116 -32400 # Node ID 1fa40e04f0999e1338df7638bdf3324b0f4684ca # Parent ba30010d0dd148c00f8749b7cd6605e129e4f3cc minor fix diff -r ba30010d0dd1 -r 1fa40e04f099 src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java --- a/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java Wed Jun 11 18:07:20 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java Thu Jun 12 05:38:36 2014 +0900 @@ -20,14 +20,8 @@ public void findTreeVncRoot() throws InterruptedException { FindRoot getBcast = new FindRoot(rfb.acceptPort,this); getBcast.findRoot(); - // wait for RootSelection - Thread runBcast = new Thread (getBcast, "TreeVNC-root-finder"); - runBcast.start(); - hostName = getBcast.textAddress(); - portNumber = Integer.parseInt(getBcast.textPort()); - getBcast.interrupt(); - + wait(); } /** diff -r ba30010d0dd1 -r 1fa40e04f099 src/main/java/jp/ac/u_ryukyu/treevnc/client/FindRoot.java --- a/src/main/java/jp/ac/u_ryukyu/treevnc/client/FindRoot.java Wed Jun 11 18:07:20 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/client/FindRoot.java Thu Jun 12 05:38:36 2014 +0900 @@ -25,7 +25,6 @@ private ServerSocket server = null; private BufferedReader is; private int port; - private int port_server_socket = ConnectionParams.DEFAULT_VNC_FIND_ROOT_REPLY; private boolean stopFlag; private TreeVncRootSelectionPanel rootSelectionPanel = new TreeVncRootSelectionPanel(); private String proxyAddr; @@ -44,7 +43,6 @@ public void createSocket() { try { - server = new ServerSocket(port_server_socket); mAddr = InetAddress.getByName(TreeRootFinderListener.McastAddr); soc = new MulticastSocket(); soc.setTimeToLive(1); diff -r ba30010d0dd1 -r 1fa40e04f099 src/viewer_swing/java/com/glavsoft/viewer/swing/ConnectionParams.java --- a/src/viewer_swing/java/com/glavsoft/viewer/swing/ConnectionParams.java Wed Jun 11 18:07:20 2014 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/ConnectionParams.java Thu Jun 12 05:38:36 2014 +0900 @@ -35,7 +35,6 @@ public static final int DEFAULT_RFB_PORT = 5900; public static final int DEFAULT_VNC_ROOT = 5950; public static final int DEFAULT_VNC_ROOT_FINDER = DEFAULT_RFB_PORT; - public static final int DEFAULT_VNC_FIND_ROOT_REPLY = 5940; public String hostName;