Mercurial > hg > Members > nobuyasu > tightVNCProxy

diff src/myVncProxy/MyRfbProto.java @ 149:f68f63c298d0

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 Fri, 09 Sep 2011 23:22:58 +0900
parents 0d9a824dd12f c1d7d4fbcfb9
children fb1a62154851
line wrap: on
line diff
--- a/src/myVncProxy/MyRfbProto.java	Fri Sep 09 23:12:37 2011 +0900
+++ b/src/myVncProxy/MyRfbProto.java	Fri Sep 09 23:22:58 2011 +0900
@@ -26,7 +26,6 @@
 import myVncProxy.MulticastQueue.Client;
 
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.zip.DataFormatException;
 import java.util.zip.Deflater;
@@ -55,7 +54,7 @@
 	private boolean clicomp = false;
 
 	private ServerSocket servSock;
-	private int acceptPort;
+	protected int acceptPort;
 	private byte initData[];
 	private LinkedList<Socket> cliListTmp;
 	private LinkedList<Socket> cliList;
@@ -119,6 +118,7 @@
 
 	// 5999を開けるが、開いてないなら+1のポートを開ける。
 	void selectPort(int p) {
+		if(servSock != null ) return ;
 		int port = p;
 		while (true) {
 			try {
@@ -230,7 +230,7 @@
 
 		if (serverMajor < 3) {
 			throw new IOException(
-					"RFB server does not support protocol version 3");
+			"RFB server does not support protocol version 3");
 		}
 
 		if (serverMinor == 998) {