changeset 132:84f167f9956a

node list
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Sat, 07 Jun 2014 01:57:58 +0900
parents 95f53663295c
children 70cbec526039
files src/main/java/jp/ac/u_ryukyu/treevnc/server/AcceptClient.java
diffstat 1 files changed, 22 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/server/AcceptClient.java	Sat Jun 07 00:39:46 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/server/AcceptClient.java	Sat Jun 07 01:57:58 2014 +0900
@@ -8,7 +8,7 @@
 
 public class AcceptClient {
 	private int nodeCounter = 0, parentnum = 0;
-	private LinkedList<String> ls = new LinkedList<String>();
+	private LinkedList<TreeVNCNode> nodeList = new LinkedList<TreeVNCNode>();
 	private boolean addrRegistor = true;
 	boolean runflag = false;
 	private final int treebranch = 2;
@@ -76,15 +76,15 @@
 	 *            parent value
 	 */
 	private synchronized void listupdate(String port) {
-		ls.remove(Integer.parseInt(port));
-		ls.add(Integer.parseInt(port), ls.getLast());
-		ls.removeLast();
+		nodeList.remove(Integer.parseInt(port));
+		nodeList.add(Integer.parseInt(port), nodeList.getLast());
+		nodeList.removeLast();
 	}
 
 	private synchronized void listupdate(String port, String myaddr) {
-		ls.remove(Integer.parseInt(port));
-		ls.add(Integer.parseInt(port), myaddr);
-		ls.removeLast();
+		nodeList.remove(Integer.parseInt(port));
+		nodeList.add(Integer.parseInt(port), new TreeVNCNode(myaddr));
+		nodeList.removeLast();
 	}
 
 	private void outputStream(PrintStream os, String request, String parentnum,
@@ -101,9 +101,9 @@
 		System.out.println("leaderflag=" + leaderflag + "\n");
 	}
 
-	private synchronized void addClientAdress(String line, LinkedList<String> ls) {
+	private synchronized void addClientAdress(String line, LinkedList<TreeVNCNode> nodeList2) {
 		if (line != null) {
-			ls.add(line);
+			nodeList2.add(new TreeVNCNode(line));
 		}
 		// displyLinkedList(ls);
 	}
@@ -124,19 +124,19 @@
 		} catch (UnknownHostException e) {
 			e.printStackTrace();
 		}
-		return new String(addr.getHostAddress());
+		return addr.getHostAddress();
 	}
 
 	private void replyNodeInformation(String port) {
 		parentnum = (Integer.parseInt(port) - 1) / treebranch;
-		newparent = ls.get(parentnum);
+		newparent = nodeList.get(parentnum).getHostname();
 		sendleaderflag = decisionLeader(Integer.parseInt(port), treebranch);
 	}
 
 	private synchronized void replyLeaderNode(PrintStream os, BufferedReader is, String port, int treeNumber) throws IOException,
 			InterruptedException {
-		String lastNode = ls.getLast();
-		String checkSameHost = ls.get(treeNumber);
+		String lastNode = nodeList.getLast().getHostname();
+		String checkSameHost = nodeList.get(treeNumber).getHostname();
 		if(lastNode != checkSameHost){
 			os.println(lastNode);
 		}
@@ -149,7 +149,7 @@
 			os.println(treeNumber);
 		}
 		leaderflag = decisionLeader(treeNumber, treebranch);
-		if(ls.size() > treeNumber +1)
+		if(nodeList.size() > treeNumber +1)
 			lostNodeConnection(treeNumber, lastNode, this.defaultVNCport);
 		Thread.sleep(intv_time);
 		is.close();
@@ -159,7 +159,7 @@
 	private void lostNodeConnection(int treeNum, String hostNode, String port)
 			throws UnknownHostException, IOException {
 		for (int i = 1; i < treebranch; i++) {
-			String host = ls.get(treeNum + i);
+			String host = nodeList.get(treeNum + i).getHostname();
 			if (host != hostNode) {
 				System.out.println("connection socket for-------------------- " + host);
 				Socket clients = new Socket(host, 10001);
@@ -178,12 +178,12 @@
 	private synchronized boolean replyCreateTree(PrintStream os, String port,
 			String line) throws InterruptedException {
 		if (addrRegistor == true) {
-			ls.add(myAddress);
+			nodeList.add(new TreeVNCNode(myAddress));
 			addrRegistor = false;
 		}
 
 		if (line != null) {
-			addClientAdress(line, ls);
+			addClientAdress(line, nodeList);
 			nodeCounter++;
 		} else {
 			return true;
@@ -192,7 +192,7 @@
 		if (nodeCounter >= treebranch + 1) {
 			leaderflag = decisionLeader(nodeCounter, treebranch);
 			parentnum = (nodeCounter - 1) / treebranch;
-			request = ls.get(parentnum);
+			request = nodeList.get(parentnum).getHostname();
 			System.out.println(parentnum);
 			outputStream(os, request, String.valueOf(parentnum),
 					String.valueOf(nodeCounter), leaderflag);
@@ -246,12 +246,12 @@
 	}
 
 
-	public LinkedList<String> getList() {
-		return ls;
+	public LinkedList<TreeVNCNode> getList() {
+		return nodeList;
 	}
 
-	public void setList(LinkedList<String> _ls) {
-		ls = _ls;
+	public void setList(LinkedList<TreeVNCNode> _ls) {
+		nodeList = _ls;
 	}
 
 	public int getTreeBranch() {