Mercurial > hg > Members > nobuyasu > tightVNCProxy

changeset 76:347c153f74c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Yu Taninari <e085734@ie.u-ryukyu.ac.jp>
date Thu, 28 Jul 2011 17:59:39 +0900
parents 6e703f1000e7 (diff) bf5ac06df675 (current diff)
children fe5925bb9a7e
files bin/myVncProxy/acceptClient.class bin/myVncProxy/acceptThread.class bin/myVncProxy/sock.class src/myVncProxy/AcceptThread.java src/myVncProxy/MyRfbProto.java src/myVncProxy/VncProxyService.java
diffstat 7 files changed, 226 insertions(+), 245 deletions(-) [+]
line wrap: on
line diff
Binary file bin/myVncProxy/acceptClient.class has changed
Binary file bin/myVncProxy/acceptThread.class has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/myVncProxy/AcceptClient.java	Thu Jul 28 17:59:39 2011 +0900
@@ -0,0 +1,221 @@
+package myVncProxy;
+
+import java.net.Socket;
+import java.io.*;
+import java.net.*;
+import java.util.*;
+
+public class AcceptClient extends Thread {
+	int counter = 0 , parentnum = 0/*落ちたときの親の番号をカウントするためのもの*/;
+	LinkedList<String> ls = new LinkedList<String>();
+	boolean runflag =false;
+	private String name; 
+	boolean addrRegistor=true;
+
+	public AcceptClient(String _name) {
+		name = _name;
+	}
+	public AcceptClient() {
+		new CreateThread(this);
+	}
+	
+	public synchronized void gethost(BufferedReader is,PrintStream os) {
+		String line,port;
+		int intv_time = 100;
+		String request;
+		int treebranch = 2;//treeの子ノードの数
+		String leaderflag="0",sendleaderflag="0";//Socket send standardization String
+		
+		
+				// クライアントからのメッセージを待ち、受け取ったメッセージをそのまま返す
+		try {
+				while (true) {	
+					line = is.readLine();
+					port = is.readLine();
+					
+					System.out.println("データーを受信しましたlin="+line+"       port="+port);
+					//自分の IPADRESSを取得する
+					InetAddress addr = InetAddress.getLocalHost();
+					String add = new String(addr.getHostAddress());
+
+					if("1".equals(line)) {
+						System.out.println("親が落ちましたmessage" + port);	
+						os.println(ls.getLast());
+						parentnum = (Integer.parseInt(port) -1) / treebranch;
+						String hidenchild=ls.getLast();
+						String newparent=ls.get(parentnum);
+						listupdate(port);
+						counter--;
+						runflag = true;
+	
+						if((counter-1)%treebranch==1) { // children in most young treenum have leaderflag 1 other 0 
+							sendleaderflag = "1";
+						} else {
+							sendleaderflag = "0";
+						}
+
+						Child report = new Child();
+						
+						report.reportLastNode(hidenchild,newparent,port,String.valueOf(parentnum),
+								sendleaderflag,counter);
+						
+						os.println(port);	
+						Thread.sleep(intv_time);
+						is.close();
+						os.close();
+
+					} else if("2".equals(line)) {
+						parentnum = (Integer.parseInt(port) -1) / treebranch;
+						String newparent=ls.get(parentnum);
+						
+						outputStream(os,newparent,String.valueOf(parentnum),
+								String.valueOf(counter),leaderflag);
+						
+						os.close();
+						is.close();
+					} else if("3".equals(line)) {
+						System.out.println("落ちたのを確認しました");
+
+						os.println(ls.get(Integer.parseInt(port)));
+						os.println(port);
+						int g = 0;
+						for(String bs: ls){
+							System.out.println(g+"番目"+bs);
+							g++;
+						}
+						System.out.println("num4=" + ls.get(Integer.parseInt(port)));
+						line=null;
+						runflag = false;
+						is.close();
+						os.close();
+					} else {
+						if(addrRegistor==true){
+							ls.add(add);
+							addrRegistor = false;
+						}
+						System.out.println(parentnum);
+						if(line != null) {
+							arg(line,ls);
+							counter++;
+						} else {
+							break;
+						}
+
+						if(counter>=treebranch+1) {
+							if((counter-1)%treebranch==0) {
+								leaderflag = "1";
+							} else {
+								leaderflag = "0";
+							}
+					
+							parentnum = (counter - 1) / treebranch;
+							//			request = [p-1];
+							request = ls.get(parentnum);
+							
+							outputStream(os,request,String.valueOf(parentnum),
+									String.valueOf(counter),leaderflag);
+							
+							checkParameter(parentnum,counter,leaderflag);
+						} else {
+							//treeの親ノードに接続する人に接続する人を教える
+							outputStream(os,name,"0",String.valueOf(counter),
+									leaderflag);
+						}
+						Thread.sleep(intv_time);
+					}
+				}
+				
+			} catch (IOException e) {
+				System.out.println(e);
+			}
+			
+			catch(InterruptedException e) {
+				e.printStackTrace();			
+			}
+			/*
+			try{
+				echoServer.close();
+			}
+			catch (IOException e){
+				System.out.println(e);
+			}
+			*/
+		//} comment out while
+	}
+	
+	/**
+	 * @param port
+	 *   parent value
+	 */
+	void listupdate(String port) {
+		ls.remove(Integer.parseInt(port));
+		ls.add(Integer.parseInt(port),ls.getLast());
+		ls.removeLast();
+	}
+
+	void outputStream(PrintStream os,String request,String parentnum,String treenum,String leaderflag) {
+		os.println(request);
+		os.println(parentnum);
+		os.println(treenum);
+		os.println(leaderflag);
+	}
+	
+	void checkParameter(int parent,int counter,String leaderflag) {
+		System.out.println("pの値="+parentnum);
+		System.out.println("iの値="+counter);
+		System.out.println("leaderflag="+leaderflag + "\n");
+	}
+	
+	void arg(String line,LinkedList<String> ls) {
+		if(line != null){
+			ls.add(line);
+		}
+		int g=0;
+
+		for(String bs: ls){
+			System.out.println(g+"番目"+bs);
+			g++;
+		}
+	}
+	
+}
+
+/*
+class sock {
+	void arg(String line,LinkedList<String> ls) {
+		if(line != null){
+			ls.add(line);
+		}
+		int g=0;
+
+		for(String bs: ls){
+			System.out.println(g+"番目"+bs);
+			g++;
+		}
+	}
+}
+*/
+class Child{
+	
+	void reportLastNode(String hiddenchild,String newparent,String newtreenum,String newpnum,String newleaderflag,int i) throws IOException{
+		try {
+			Socket echoSocket;
+			System.out.println(hiddenchild + "に接続します");
+			echoSocket = new Socket(hiddenchild, 10001 + (i + 1));//i+1は実験中に同じマシーンを使っていたのでportを変えて対応、本番時には取り除く予定。	
+
+			DataOutputStream os = new DataOutputStream(echoSocket.getOutputStream());
+
+			os.writeBytes(newparent+"\n");
+			os.writeBytes(newpnum+"\n");
+			os.writeBytes(newtreenum+"\n");
+			os.writeBytes(newleaderflag+"\n");
+			
+			os.close();
+		} catch (UnknownHostException e) {
+			System.err.println("Don't know about host: localhost");
+		} catch (IOException e) {
+			System.err.println("Couldn't get I/O for the connection to: localhost");
+		}
+
+	}
+}
--- a/src/myVncProxy/AcceptThread.java	Thu Jul 28 13:29:21 2011 +0900
+++ b/src/myVncProxy/AcceptThread.java	Thu Jul 28 17:59:39 2011 +0900
@@ -1,5 +1,4 @@
 package myVncProxy;
-
 import java.net.Socket;
 import java.io.IOException;
 import java.io.InputStream;
@@ -28,4 +27,4 @@
                         }
                 }
         }
-}
\ No newline at end of file
+}
--- a/src/myVncProxy/CreateThread.java	Thu Jul 28 13:29:21 2011 +0900
+++ b/src/myVncProxy/CreateThread.java	Thu Jul 28 17:59:39 2011 +0900
@@ -11,10 +11,10 @@
 
 public class CreateThread implements Runnable {
 	ServerSocket echoServer;
-	acceptClient acceptClient;
+	AcceptClient acceptClient;
 	
 
-	public CreateThread(acceptClient _acc){
+	public CreateThread(AcceptClient _acc){
 		acceptClient = _acc;
 	}
 	
--- a/src/myVncProxy/VncProxyService.java	Thu Jul 28 13:29:21 2011 +0900
+++ b/src/myVncProxy/VncProxyService.java	Thu Jul 28 17:59:39 2011 +0900
@@ -28,7 +28,7 @@
 	Thread accThread;
 	Thread clientThread;
     CreateThread geth;
-    acceptClient acc;
+    AcceptClient acc;
 
 	Frame vncFrame;
 	Container vncContainer;
@@ -198,7 +198,7 @@
 	//
 
 	void connectAndAuthenticate() throws Exception {
-	    acc = new acceptClient(mainArgs[0]);
+	    acc = new AcceptClient(mainArgs[0]);
 	    geth = new CreateThread(acc);
 	    Thread thread = new Thread(geth);
 	    thread.start();
--- a/src/myVncProxy/acceptClient.java	Thu Jul 28 13:29:21 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,239 +0,0 @@
-package myVncProxy;
-
-import java.net.Socket;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-public class acceptClient extends Thread {
-	int counter = 0 , parentnum = 0,t = 0/*落ちたときの親の番号をカウントするためのもの*/;
-	LinkedList<String> ls = new LinkedList<String>();
-	boolean runflag =false;
-	private String name; 
-	boolean addrRegistor=true;
-
-	public acceptClient(String _name) {
-		name = _name;
-	}
-	public acceptClient() {
-		new CreateThread(this);
-	}
-	
-	public synchronized void gethost(BufferedReader is,PrintStream os) {
-		String line,port,handover;
-		int intv_time = 100;
-		String request;
-		int treebranch = 2;//treeの子ノードの数
-		String leaderflag="0",sendleaderflag="0";//Socket send standardization String
-		
-		
-				// クライアントからのメッセージを待ち、受け取ったメッセージをそのまま返す
-		try {
-				while (true){	
-					line = is.readLine();
-					port = is.readLine();
-					
-					System.out.println("データーを受信しましたlin="+line+"       port="+port);
-					//自分の IPADRESSを取得する
-					InetAddress addr = InetAddress.getLocalHost();
-					String add = new String(addr.getHostAddress());
-
-					if("1".equals(line)){
-						System.out.println("親が落ちましたmessage" + port);	
-						os.println(ls.getLast());
-						handover = String.valueOf((Integer.parseInt(port) - 1) / treebranch);
-						String hidenchild=ls.getLast();
-						String newparent=ls.get(Integer.parseInt(handover));
-						listupdate(port);
-						/*
-						ls.remove(Integer.parseInt(port));
-						ls.add(Integer.parseInt(port),ls.getLast());
-						ls.remove(Integer.parseInt(port));
-						*/
-						counter--;
-						t++;
-						runflag = true;
-						/*
-						if(t % treebranch == 0){
-							parentnum--;
-						}
-						*/
-						parentnum = (Integer.parseInt(port) -1) / treebranch;
-						
-						if((counter-1)%treebranch==1){ // children in most young treenum have leaderflag 1 other 0 
-							sendleaderflag = "1";
-						}else{
-							sendleaderflag = "0";
-						}
-
-						child child = new child();
-						child.clost(hidenchild,newparent,port,handover,sendleaderflag,counter);
-						os.println(port);	
-						Thread.sleep(intv_time);
-						is.close();
-						os.close();
-
-					}else if("2".equals(line)){
-						System.out.println("子供が落ちましたmessage" + port);
-						//exit シグナルを送る
-						Thread.sleep(intv_time);
-					}else if("3".equals(line)){
-						System.out.println("落ちたのを確認しました");
-
-						os.println(ls.get(Integer.parseInt(port)));
-						os.println(port);
-						int g = 0;
-						for(String bs: ls){
-							System.out.println(g+"番目"+bs);
-							g++;
-						}
-						System.out.println("num4=" + ls.get(Integer.parseInt(port)));
-						line=null;
-						runflag = false;
-						is.close();
-						os.close();
-					}else{
-						if(addrRegistor==true){
-							ls.add(add);
-							addrRegistor = false;
-						}
-						System.out.println(parentnum);
-						if(line != null){
-							arg(line,ls);
-							counter++;
-						}else{
-							break;
-						}
-
-						if(counter>=treebranch+1){
-							if((counter-1)%treebranch==0){
-								leaderflag = "1";
-							}else{
-								leaderflag = "0";
-							}
-							/*
-							if((counter-1)%treebranch==0){
-								parentnum++;
-							}
-							*/
-							parentnum = (counter - 1) / treebranch;
-							//			request = [p-1];
-							request = ls.get(parentnum);
-							/*
-							os.println(request);
-							os.println(String.valueOf(parentnum));
-							os.println(String.valueOf(counter));
-							os.println(leaderflag);
-							*/
-							outputStream(os,request,String.valueOf(parentnum),String.valueOf(counter),leaderflag);
-							checkParameter(parentnum,counter,leaderflag);
-						}else{
-							//treeの親ノードに接続する人に接続する人を教える
-							outputStream(os,name,"0",String.valueOf(counter),leaderflag);
-							/*
-							os.println(name);//あとで渡されたmainArgs[1]（現在はname）を渡す予定,addに変更
-							os.println("0");
-							os.println(String.valueOf(counter));
-							os.println(leaderflag);
-							*/
-						}
-						Thread.sleep(intv_time);
-					}
-				}
-				
-			} catch (IOException e){
-				System.out.println(e);
-			}
-			
-			catch(InterruptedException e){
-				e.printStackTrace();			
-			}
-			/*
-			try{
-				echoServer.close();
-			}
-			catch (IOException e){
-				System.out.println(e);
-			}
-			*/
-		//} comment out while
-	}
-	
-	/**
-	 * @param port
-	 *   parent value
-	 */
-	void listupdate(String port) {
-		ls.remove(Integer.parseInt(port));
-		ls.add(Integer.parseInt(port),ls.getLast());
-		ls.removeLast();
-	}
-
-	void outputStream(PrintStream os,String request,String parentnum,String counter,String leaderflag) {
-		os.println(request);
-		os.println(parentnum);
-		os.println(counter);
-		os.println(leaderflag);
-	}
-	
-	void checkParameter(int parent,int counter,String leaderflag) {
-		System.out.println("pの値="+parentnum);
-		System.out.println("iの値="+counter);
-		System.out.println("leaderflag="+leaderflag + "\n");
-	}
-	
-	void arg(String line,LinkedList<String> ls) {
-		if(line != null){
-			ls.add(line);
-		}
-		int g=0;
-
-		for(String bs: ls){
-			System.out.println(g+"番目"+bs);
-			g++;
-		}
-	}
-	
-}
-
-/*
-class sock {
-	void arg(String line,LinkedList<String> ls) {
-		if(line != null){
-			ls.add(line);
-		}
-		int g=0;
-
-		for(String bs: ls){
-			System.out.println(g+"番目"+bs);
-			g++;
-		}
-	}
-}
-*/
-class child{
-	Socket echoSocket;
-	DataOutputStream os = null;
-	BufferedReader is = null;
-	void clost(String hiddenchild,String newparent,String newtreenum,String newpnum,String newleaderflag,int i) throws IOException{
-		try {
-
-			System.out.println(hiddenchild + "に接続します");
-			echoSocket = new Socket(hiddenchild, 10001 + (i + 1));//i+1は実験中に同じマシーンを使っていたのでportを変えて対応、本番時には取り除く予定。	
-
-			os = new DataOutputStream(echoSocket.getOutputStream());
-			is = new BufferedReader(new InputStreamReader(echoSocket.getInputStream()));
-
-			os.writeBytes(newparent+"\n");
-			os.writeBytes(newpnum+"\n");
-			os.writeBytes(newtreenum+"\n");
-			os.writeBytes(newleaderflag+"\n");
-			
-		} catch (UnknownHostException e) {
-			System.err.println("Don't know about host: localhost");
-		} catch (IOException e) {
-			System.err.println("Couldn't get I/O for the connection to: localhost");
-		}
-
-	}
-}