Mercurial > hg > Members > riono > TreeVNC_ja_comment

changeset 146:5be1d92e7835

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
not working yet
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Fri, 13 Jun 2014 01:19:08 +0900
parents 649794dfb9d5
children 703db66138b5
files src/main/java/jp/ac/u_ryukyu/treevnc/MyRfbProto.java src/main/java/jp/ac/u_ryukyu/treevnc/client/MyRfbProtoClient.java src/main/java/jp/ac/u_ryukyu/treevnc/server/AcceptClient.java src/main/java/jp/ac/u_ryukyu/treevnc/server/TreeVNCNode.java
diffstat 4 files changed, 8 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/MyRfbProto.java	Thu Jun 12 22:01:05 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/MyRfbProto.java	Fri Jun 13 01:19:08 2014 +0900
@@ -13,6 +13,7 @@
 import java.util.zip.Deflater;
 import java.util.zip.Inflater;
 
+import sun.rmi.runtime.Log;
 import jp.ac.u_ryukyu.treevnc.client.TreeVncProtocol;
 import jp.ac.u_ryukyu.treevnc.server.RequestScreenThread;
 import jp.ac.u_ryukyu.treevnc.server.VncProxyService;
@@ -104,9 +105,12 @@
             }
         } catch (Exception e) {
             try {
+                System.out.println("new client faild");
                 newCli.close();
+                return;
             } catch (IOException e1) {
-                // log
+                System.out.println("new client close faild");
+                return;
             }
         }
 			
@@ -674,7 +678,7 @@
                     blen.flip();
                     bufs.addFirst(blen);
                     bufs.addFirst(header);
-                    this.addSerialNumber(bufs);
+                    addSerialNumber(bufs);
                     multicastqueue.put(bufs);
                     if (!isRoot()) reader.reset();
                 } catch (DataFormatException e) {
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/client/MyRfbProtoClient.java	Thu Jun 12 22:01:05 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/client/MyRfbProtoClient.java	Fri Jun 13 01:19:08 2014 +0900
@@ -32,14 +32,6 @@
     public boolean isRoot() {
         return false;
     }
-    
-	public boolean readProxyFlag() throws TransportException {
-		int flag = reader.readUInt8();
-		if (flag == 1)
-			return true;
-		else
-			return false;
-	}
 
 
 	void sendInitData(OutputStream os) throws IOException {
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/server/AcceptClient.java	Thu Jun 12 22:01:05 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/server/AcceptClient.java	Fri Jun 13 01:19:08 2014 +0900
@@ -5,7 +5,6 @@
 import java.net.*;
 import java.util.*;
 
-import jp.ac.u_ryukyu.treevnc.MyRfbProto;
 import jp.ac.u_ryukyu.treevnc.client.TreeVncProtocol;
 
 public class AcceptClient {
@@ -13,7 +12,6 @@
 	boolean runflag = false;
 	private final int treebranch = 2;
 	//  private final int intv_time = 100;    avoid too frequent reconnection
-    private MyRfbProto rfb;
 
 	public AcceptClient(String hostName, int vncport) {
 		TreeVNCNode me = new TreeVNCNode(hostName, vncport);
@@ -132,7 +130,7 @@
 	            treeProtocol.connectTo(parent.getHostname(),parent.getPort(),isLeader(node));
 	        } else {
 	            // connect to me
-	            treeProtocol.connectTo(rfb.getMyAddress(),rfb.getAcceptPort(),isLeader(node));
+	            treeProtocol.connectTo(nodeList.getFirst().getHostname(),nodeList.getFirst().getPort(),isLeader(node));
 	        }
 	    } catch (IOException e) {
 	        // log
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/server/TreeVNCNode.java	Thu Jun 12 22:01:05 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/server/TreeVNCNode.java	Fri Jun 13 01:19:08 2014 +0900
@@ -1,19 +1,10 @@
 package jp.ac.u_ryukyu.treevnc.server;
 
-import com.glavsoft.viewer.swing.ConnectionParams;
-
-
-
 public class TreeVNCNode {
     String hostname;
     int port;
     int treeNum;
-    
-
-    public TreeVNCNode(String myaddr) {
-        hostname = myaddr;
-        port = ConnectionParams.DEFAULT_VNC_ROOT;
-    }
+    // String myAddress;    // Do we need local socket address?  
 
     public TreeVNCNode(String hostname, int port) {
         this.hostname = hostname;