Mercurial > hg > Members > nobuyasu > tightVNCClient

changeset 46:da5d82180bc2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
modify accetptThread.java
author e085711
date Sat, 09 Jul 2011 14:32:04 +0900
parents 413df87d6f8f
children 9f6b211d0d1e
files src/myVncClient/MyRfbProto.java src/myVncClient/MyVncClient.java src/myVncClient/acceptThread.java
diffstat 3 files changed, 12 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/src/myVncClient/MyRfbProto.java	Sat Jul 09 14:09:19 2011 +0900
+++ b/src/myVncClient/MyRfbProto.java	Sat Jul 09 14:32:04 2011 +0900
@@ -309,7 +309,7 @@
 	
 	void regiFramebufferUpdate() throws IOException {
 		mark(20);
-		messageType = readU8();
+
 		skipBytes(1);
 		rectangles = readU16();
 		rectX = readU16();
@@ -335,7 +335,7 @@
 			break;
 		default:
 			dataLen = 1000000;
-			mark(1000000);
+			mark(dataLen);
 		}
 		return dataLen;
 	}
--- a/src/myVncClient/MyVncClient.java	Sat Jul 09 14:09:19 2011 +0900
+++ b/src/myVncClient/MyVncClient.java	Sat Jul 09 14:32:04 2011 +0900
@@ -692,11 +692,11 @@
 		 * 
 		 * port = readIntParameter("PORT", 5550);
 		 */
-		String pHost;
-		if (mainArgs.length > 0) pHost = mainArgs[0];
-		else pHost = "cls080.ie.u-ryukyu.ac.jp";
+		if (value == null) {
+			String pHost;
+			if (mainArgs.length > 0) pHost = mainArgs[0];
+			else pHost = "cls080.ie.u-ryukyu.ac.jp";
 
-		if (value == null) {
 			if (clientSocket == null) {
 				echo = new echoClient(pHost);
 				echo.openport();
--- a/src/myVncClient/acceptThread.java	Sat Jul 09 14:09:19 2011 +0900
+++ b/src/myVncClient/acceptThread.java	Sat Jul 09 14:32:04 2011 +0900
@@ -4,6 +4,8 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import myVncClient.MyRfbProto;
+
 public class acceptThread implements Runnable {
 	MyRfbProto rfb;
 	byte[] imageBytes;
@@ -16,22 +18,14 @@
 		while (true) {
 			try {
 				Socket newCli = rfb.accept();
+				
 				OutputStream os = newCli.getOutputStream();
 				InputStream is = newCli.getInputStream();
-				rfb.sendRfbVersion(os);
-				rfb.readVersionMsg(is);
-				rfb.sendSecurityType(os);
-				rfb.readSecType(is);
-				rfb.sendSecResult(os);
-				rfb.readClientInit(is);
-				rfb.sendInitData(os);
-				rfb.createBimgFlag = true;
-//				rfb.addSockTmp(newCli);
-				rfb.addSock(newCli);
-			} catch (IOException e) {
+				rfb.newClient(this, newCli, os, is);
+				} catch (IOException e) {
 				e.printStackTrace();
 				System.out.println(e);
 			}
 		}
 	}
-}
+}
\ No newline at end of file