Mercurial > hg > Applications > TreeVNC

changeset 568:44920845d4e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix write data position
author riono
date Wed, 05 Feb 2020 16:37:02 +0900
parents ac8fd355b8bb
children 6f95d475906b
files src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEDecoder.java src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java
diffstat 3 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEDecoder.java	Wed Feb 05 10:17:00 2020 +0900
+++ b/src/main/java/com/glavsoft/rfb/encoding/decoder/ZRLEDecoder.java	Wed Feb 05 16:37:02 2020 +0900
@@ -88,7 +88,7 @@
 			deflater = rfb.deflater;
 			c1rect = new FramebufferUpdateRectangle(rect.x, rect.y, 0, 0);
 			newMulticastPacket(rfb, rect);
-			c1.put(header.get(0));
+			//c1.put(header.get(0));
 			if (!blocking) {
 				deflater.setInput(bytes, 0, prevoffset);
 				deflater.deflate(c1);
--- a/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java	Wed Feb 05 10:17:00 2020 +0900
+++ b/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java	Wed Feb 05 16:37:02 2020 +0900
@@ -377,7 +377,7 @@
         FramebufferUpdateRectangle rect = new FramebufferUpdateRectangle();
         Reader in = new Reader(new ByteArrayInputStream(c1.array()));
         try {
-            if (in.readByte() != FRAMEBUFFER_UPDATE) {
+            if (getMessageId(in) != FRAMEBUFFER_UPDATE) {
                 ;
             }
             in.readByte();
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java	Wed Feb 05 10:17:00 2020 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java	Wed Feb 05 16:37:02 2020 +0900
@@ -81,7 +81,7 @@
     private boolean stopBroadcast;
     // multicastBlocking is an internal test flag
     //   perform blocking on TCP connection
-    public boolean multicastBlocking = false;
+    public boolean multicastBlocking = true;
 
     public TreeRFBProto(boolean isTreeManager, ViewerInterface viewer) {
         nets.setMyRfb(this);
@@ -904,7 +904,7 @@
         setProtocolContext(workingProtocol);
         this.connectionPresenter = connectionPresenter;
         connectionPresenter.viewer.setConnectionPresenter(connectionPresenter);
-        // if (connectionPresenter.isUseMulticast()) multicastBlocking = true;
+        if (connectionPresenter.isUseMulticast()) multicastBlocking = true;
         connectionPresenter.addModel("ConnectionParamsModel", connectionPresenter.getConnectionParams());
         if (previousContext != null && isTreeManager() && hasParent()) {
             Reader previousReader = previousContext.getReader();