# HG changeset patch # User one # Date 1479977094 -32400 # Node ID f0bd5f2c4ba3b98526b869f61a3120b6914aad74 # Parent 37b1e8cbc6bbb70740952b1385c8e79ffc041713 unique node id is now static. prevent dupricate rootStart on direct mode diff -r 37b1e8cbc6bb -r f0bd5f2c4ba3 src/main/java/com/glavsoft/rfb/protocol/ProtocolContext.java --- a/src/main/java/com/glavsoft/rfb/protocol/ProtocolContext.java Thu Nov 24 16:40:16 2016 +0900 +++ b/src/main/java/com/glavsoft/rfb/protocol/ProtocolContext.java Thu Nov 24 17:44:54 2016 +0900 @@ -80,6 +80,10 @@ TreeRFBProto getRfb(); + final int MAX_UNIQUE_NODE_ID = 20000; + + final int MAX_RANDAM_NODE_ID = 30000; + /** * TreeVNC expension command (server to client) * 0 : command byte diff -r 37b1e8cbc6bb -r f0bd5f2c4ba3 src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java --- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java Thu Nov 24 16:40:16 2016 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java Thu Nov 24 17:44:54 2016 +0900 @@ -71,7 +71,7 @@ private DatagramSocket socket = null; private byte[] originalInitData = null; private boolean childrenMulticast = true; - private int uniqueNodeId = 0; // uniquenodeid in all trees + private static int uniqueNodeId = 0; // uniquenodeid in all trees (less than MAX_UNIQUE_NODE_ID) public TreeRFBProto(boolean isTreeManager, ViewerInterface viewer) { nets.setMyRfb(this); diff -r 37b1e8cbc6bb -r f0bd5f2c4ba3 src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java --- a/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java Thu Nov 24 16:40:16 2016 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java Thu Nov 24 17:44:54 2016 +0900 @@ -61,6 +61,7 @@ if (hostName != null) { if (direct) { rootStart(args, new VncProxyService()); + return; } else { // send whereToConnect v.startTreeViewer(hostName, cui, addSerialNum);