# HG changeset patch
# User oc
# Date 1412757879 -32400
# Node ID 0e0e6744432cc98308a132a6bf7ff3c9f23e90e9
# Parent  f4ea9ff0474131d691b33c65bc901841b5b4e598
get new nodeList for checkDelay.

diff -r f4ea9ff04741 -r 0e0e6744432c src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java
--- a/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java	Mon Oct 06 21:10:31 2014 +0900
+++ b/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java	Wed Oct 08 17:44:39 2014 +0900
@@ -44,14 +44,12 @@
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.io.UnsupportedEncodingException;
-import java.nio.ByteBuffer;
-import java.util.LinkedList;
 import java.util.logging.Logger;
 
 import jp.ac.u_ryukyu.treevnc.CheckDelayReply;
 import jp.ac.u_ryukyu.treevnc.TreeRFBProto;
 import jp.ac.u_ryukyu.treevnc.TreeVncProtocol;
-import jp.ac.u_ryukyu.treevnc.UpdateRectangleMessage;
+
 
 public class ReceiverTask implements Runnable {
     private static final byte FRAMEBUFFER_UPDATE = 0;
@@ -268,6 +266,8 @@
                 readCheckDelay(reader);
                 int length = reader.readInt32();
                 reader.reset();
+
+               
                 rfb.readSendData(length + 24, reader, null);
 //                System.out.println("rect.time=" + rect.time);
                 sendCheckDelayReply(rect.time);
diff -r f4ea9ff04741 -r 0e0e6744432c src/main/java/jp/ac/u_ryukyu/treevnc/TreeManagement.java
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeManagement.java	Mon Oct 06 21:10:31 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeManagement.java	Wed Oct 08 17:44:39 2014 +0900
@@ -7,7 +7,7 @@
 
 public class TreeManagement {
 
-    private LinkedList<TreeVNCNode> nodeList = new LinkedList<TreeVNCNode>();
+    public LinkedList<TreeVNCNode> nodeList = new LinkedList<TreeVNCNode>();
     boolean runflag = false;
     private final int treebranch = 2;
     private boolean showTreeNode = false;
diff -r f4ea9ff04741 -r 0e0e6744432c src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java	Mon Oct 06 21:10:31 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java	Wed Oct 08 17:44:39 2014 +0900
@@ -27,6 +27,7 @@
 
 
 public class TreeRFBProto {
+
     final static int FramebufferUpdateRequest = 3;
     final static int CheckDelay = 11;
     protected final static int FramebufferUpdate = 0;
@@ -42,7 +43,6 @@
     public ServerSocket servSock;
     private boolean permitChangeScreen = true;
     private static final int INFLATE_BUFSIZE = 1024 * 100;
-
     private Inflater inflater = new Inflater();
     private Deflater deflater = new Deflater();
     ViewerInterface viewer;
@@ -57,12 +57,13 @@
     private boolean reconnecting;
     private short reconnectingId;  // Change Server Request to id's node VNC server
     private TreeVNCNetwork nets = new TreeVNCNetwork();
-
     private boolean normalTermination;
     private TreeVncRootSelectionPanel rootSelectionPanel;
     private boolean isTreeManager;
     private String vncInterface;
     private int i;
+    public LinkedList<TreeVNCNode> nodeList;
+
 
     public TreeRFBProto(boolean isTreeManager) {
         rThread = new RequestScreenThread(this);
@@ -191,7 +192,7 @@
                             };
                             ByteBuffer buf = ByteBuffer.wrap(b);
                             buf.order(ByteOrder.BIG_ENDIAN);
-                            Long time = buf.getLong(2);
+                            Long time = buf.getLong(2); // 確認用
                             context.sendMessage(checkDelayReply);
                         }
                         // System.out.println("client read "+c);
@@ -561,7 +562,7 @@
             int encoding = header.getInt(12);
             
             
-            if (i == 1) {
+            if (i%20 == 0) {
                 LinkedList<ByteBuffer> checkdelay = new LinkedList<ByteBuffer>();
                 long time = System.currentTimeMillis();
                 checkdelay.add(new UpdateRectangleMessage(0, 0, 0, 0, time, EncodingType.CHECK_DELAY).getMessage());
@@ -662,7 +663,9 @@
     }
 
     public TreeManagement getTreeManager(String intf) {
-        return nets.getTreeManager(intf);
+        TreeManagement tm = nets.getTreeManager(intf);
+        this.nodeList = tm.getList();
+        return tm;
     }
 
     /**
@@ -745,5 +748,4 @@
         showTreeNode  = showTree;
     }
 
-
 }
diff -r f4ea9ff04741 -r 0e0e6744432c src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommand.java
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommand.java	Mon Oct 06 21:10:31 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommand.java	Wed Oct 08 17:44:39 2014 +0900
@@ -19,7 +19,7 @@
     private TreeCommand command ;
     private Socket connection;
     private short value;
-    private String intf;
+    public String intf;
 
     public TreeVncCommand(TreeRFBProto rfb,String myHostName, TreeCommand command, int port, String hostname, String intf, short value) {
         this.rfb = rfb;
diff -r f4ea9ff04741 -r 0e0e6744432c src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java	Mon Oct 06 21:10:31 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java	Wed Oct 08 17:44:39 2014 +0900
@@ -17,6 +17,7 @@
 import com.glavsoft.transport.Reader;
 import com.glavsoft.transport.Writer;
 
+
 public class TreeVncCommandChannelListener implements Runnable {
     public TreeRFBProto rfb = null;
     byte[] imageBytes;
@@ -70,6 +71,7 @@
         }
     }
 
+
     public TreeVncCommand newClientHandler (final Socket newCli, final Writer os, final Reader is) {
         TreeVncCommand cmd = null;
         try {