changeset 99:084adee7699b

befor change
author Yu Taninari <you@cr.ie.u-ryukyu.ac.jp>
date Mon, 24 Oct 2011 23:06:02 +0900
parents 1d1bb77d871b
children 2f2f8da71d60
files src/myVncClient/MyRfbProto.java src/myVncClient/MyVncClient.java
diffstat 2 files changed, 6 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/myVncClient/MyRfbProto.java	Fri Oct 21 17:25:33 2011 +0900
+++ b/src/myVncClient/MyRfbProto.java	Mon Oct 24 23:06:02 2011 +0900
@@ -152,15 +152,12 @@
 	// over write
 	void writeVersionMsg() throws IOException {
 		clientMajor = 3;
-		if (serverMinor == 855) {
-			clientMinor = 855;
-			os.write(versionMsg_3_855.getBytes());
+		if (serverMinor >= 9) {
+			clientMinor = 9;
+			os.write(versionMsg_3_998.getBytes());
 		} else if (serverMajor > 3 || serverMinor >= 8) {
 			clientMinor = 8;
 			os.write(versionMsg_3_8.getBytes());
-		} else if (serverMinor >= 9) {
-			clientMinor = 9;
-			os.write(versionMsg_3_998.getBytes());
 		} else if (serverMinor >= 7) {
 			clientMinor = 7;
 			os.write(versionMsg_3_7.getBytes());
--- a/src/myVncClient/MyVncClient.java	Fri Oct 21 17:25:33 2011 +0900
+++ b/src/myVncClient/MyVncClient.java	Mon Oct 24 23:06:02 2011 +0900
@@ -47,9 +47,10 @@
 
 		if (mainArgs.length > 0)
 			pHost = mainArgs[0];
-		else
+		else {
 			getHost.ipRegister();
 			pHost = getHost.getAddress();
+		}
 			
 			
 			//pHost = "cls080.ie.u-ryukyu.ac.jp";
@@ -386,7 +387,7 @@
 				+ "." + rfb.clientMinor);
 
 
-		if(rfb.serverMinor == 998) {
+		if(rfb.serverMinor == 855) {
 			byte[] b = new byte[4];
 			b = rfb.readEchoPort();
 			echoPort = castByteInt(b);