# HG changeset patch
# User Yu Taninari <you@cr.ie.u-ryukyu.ac.jp>
# Date 1319466872 -32400
# Node ID 2f2f8da71d6078490577f14d76b8750677119422
# Parent  961a5915834ff7fcc3776484ce55fe0611b2e374# Parent  084adee7699bdd8aeb644eef4ae64060aa43ece3
merge

diff -r 961a5915834f -r 2f2f8da71d60 src/myVncClient/EchoClient.java
diff -r 961a5915834f -r 2f2f8da71d60 src/myVncClient/MyRfbProto.java
diff -r 961a5915834f -r 2f2f8da71d60 src/myVncClient/MyVncClient.java
--- a/src/myVncClient/MyVncClient.java	Mon Oct 24 23:31:34 2011 +0900
+++ b/src/myVncClient/MyVncClient.java	Mon Oct 24 23:34:32 2011 +0900
@@ -27,6 +27,7 @@
 	EchoClient echoValue;
 	int echoPort;
 	String pHost;
+	TextBox getHost;	
 
 	//
 	// main() is called when run as a java program from the command line.
@@ -43,14 +44,21 @@
 		mainArgs = argv;
 		inAnApplet = false;
 		inSeparateFrame = true;
+		getHost = new TextBox();
 
 		if (mainArgs.length > 0)
 			pHost = mainArgs[0];
-		else
-			pHost = "cls080.ie.u-ryukyu.ac.jp";
+		else {
+			getHost.ipRegister();
+			pHost = getHost.getAddress();
+		}
+			
+			
+			//pHost = "cls080.ie.u-ryukyu.ac.jp";
 		if (mainArgs.length > 1)
 			port = Integer.parseInt(mainArgs[1]);
 		else
+
 			port = 5999;
 
 		init();
@@ -133,8 +141,8 @@
 			} else {
 				System.out.println("reConnectAndAuthenticate() ");
 				reConnectAndAuthenticate();
-				accThread = new Thread(new AcceptThread(rfb, 5999));
-				accThread.start();
+				//accThread = new Thread(new AcceptThread(rfb, 5999));
+				//accThread.start();
 			}
 
 			doProtocolInitialisation();
@@ -154,7 +162,7 @@
 			System.out.println("Socket error");
 			// parent no find
 			Random rnd = new Random();
-			long ran = rnd.nextInt(5000) + 5000;
+			long ran = rnd.nextInt(3000) + 3000;
 			System.out.println(ran);
 			// 親がいない場合の処理はここに書く！！！！
 			/**
@@ -179,7 +187,7 @@
 					e1.printStackTrace();
 				}
 
-				if (counter >= 4) {
+				if (counter >= 6) {
 					echoValue.openport();
 					echoValue.notfoundParent();
 				}
@@ -390,6 +398,7 @@
 				b = rfb.readEchoPort();
 				echoPort = castByteInt(b);
 
+
 				InetAddress addr = InetAddress.getByName(pHost);
 				String h = new String(addr.getHostAddress());
 
diff -r 961a5915834f -r 2f2f8da71d60 src/myVncClient/RfbProto.java
--- a/src/myVncClient/RfbProto.java	Mon Oct 24 23:31:34 2011 +0900
+++ b/src/myVncClient/RfbProto.java	Mon Oct 24 23:34:32 2011 +0900
@@ -33,7 +33,7 @@
 class RfbProto {
 
 	final static String versionMsg_3_3 = "RFB 003.003\n",
-			versionMsg_3_7 = "RFB 003.007\n", versionMsg_3_8 = "RFB 003.008\n";
+			versionMsg_3_7 = "RFB 003.007\n", versionMsg_3_8 = "RFB 003.008\n",versionMsg_3_855 = "RFB 003.855\n";
 
 
 	// Vendor signatures: standard VNC/RealVNC, TridiaVNC, and TightVNC
diff -r 961a5915834f -r 2f2f8da71d60 src/myVncClient/WaitReply.java