# HG changeset patch # User one # Date 1354781723 -32400 # Node ID d2741b80399e9021cf4de11c28831cc391d3ff92 # Parent 20326a4b9d88f9fed79afefe0a6690a232e7c106 extract method and delete tempWorkingProtocol. diff -r 20326a4b9d88 -r d2741b80399e dist/tightvnc-jviewer-2.5.0/tightvnc-jviewer.jar Binary file dist/tightvnc-jviewer-2.5.0/tightvnc-jviewer.jar has changed diff -r 20326a4b9d88 -r d2741b80399e src/main/java/jp/ac/u_ryukyu/treevnc/server/VncProxyService.java --- a/src/main/java/jp/ac/u_ryukyu/treevnc/server/VncProxyService.java Tue Dec 04 17:56:39 2012 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/server/VncProxyService.java Thu Dec 06 17:15:23 2012 +0900 @@ -9,7 +9,6 @@ import java.util.logging.Logger; import jp.ac.u_ryukyu.treevnc.AcceptThread; -import jp.ac.u_ryukyu.treevnc.client.WaitReply; import jp.ac.u_ryukyu.treevnc.server.state.ChangeHost; import com.glavsoft.exceptions.AuthenticationFailedException; @@ -42,14 +41,23 @@ public MyRfbProtoProxy rfb; private ConnectionManager connectionManager; - private VncProxyService vps; - private CreateThread createThread; + private ConnectionParams connectionParams; + + boolean isClient = false; + public static final int DEFAULT_PORT = 5900; + public static Logger logger = Logger.getLogger("com.glavsoft"); + private boolean forceReconnection; + private String reconnectionReason; + private final ProtocolSettings settings; + private final UiSettings uiSettings; + private AcceptThread acceptThread; + private GetBroadCastProxy getCast; public AcceptClient aClient; public int opendPort; // public AcceptClient acc; - public VncProxyService(Parser parser) { - this(); + + private void initProxy(Parser parser) { aClient = new AcceptClient(); ParametersHandler.completeSettingsFromCLI(parser, connectionParams, settings, uiSettings); @@ -67,18 +75,6 @@ connectionParams.hostName = "localhost"; } - boolean isClient = false; - public static final int DEFAULT_PORT = 5900; - public static Logger logger = Logger.getLogger("com.glavsoft"); - private boolean forceReconnection; - private String reconnectionReason; - private ConnectionParams connectionParams; - private final ProtocolSettings settings; - private final UiSettings uiSettings; - private AcceptThread acceptThread; - private GetBroadCastProxy getCast; - - private Protocol tempWorkingProtocol; public static void main(String[] argv) { String[] mainArgs = argv; @@ -93,22 +89,31 @@ printUsage(parser.optionsUsage()); System.exit(0); } - VncProxyService vps = new VncProxyService(parser); + VncProxyService vps = new VncProxyService(); + vps.initProxy1(argv, mainArgs, parser); + } + + private void initProxy1(String[] argv, String[] mainArgs, + Parser parser) { + initProxy(parser); if (mainArgs.length != 0) { for (int i = 0; i < argv.length; i++) { - vps.setArguments(mainArgs); + setArguments(mainArgs); // write later } } else { // getHostData(); } - // SwingUtilities.invokeLater(myClient); - /* - * Thread th = new Thread(vps); th.start(); try { th.join(); } catch - * (InterruptedException e) { e.printStackTrace(); } - */ - vps.run(); - vps.createConnectionAndStart(); + run(); + createConnectionAndStart(); + getChangeScreenRequest(); // Should be used Client Socket. + try { + threadSetAndStart(); + } catch (UnknownHostException e) { + + } catch (IOException e) { + + } } private void setArguments(String[] mainArgs) { @@ -146,7 +151,6 @@ settings); workingProtocol.handshake(); rfb.setProtocolContext(workingProtocol); - threadSetAndStart(); // input into change parents ClipboardControllerImpl clipboardController = new ClipboardControllerImpl( workingProtocol, settings.getRemoteCharsetName()); @@ -225,24 +229,18 @@ printUsage(parser.optionsUsage()); System.exit(0); } - vps = new VncProxyService(parser); + initProxy(parser); if (mainArgs.length != 0) { for (int i = 0; i < argv.length; i++) { - vps.setArguments(mainArgs); + setArguments(mainArgs); // write later } } else { // getHostData(); } // SwingUtilities.invokeLater(myClient); - Thread th = new Thread(vps); - th.start(); - try { - th.join(); - } catch (InterruptedException e) { - e.printStackTrace(); - } - vps.createConnectionAndStart(); + run(); + createConnectionAndStart(); } @Override @@ -259,14 +257,11 @@ } private void threadSetAndStart() throws UnknownHostException, IOException { - // aClient = new AcceptClient(); - createThread = new CreateThread(aClient); + CreateThread createThread = new CreateThread(aClient); Thread thread = new Thread(createThread); thread.start(); - thread = new Thread(new ChangeHost(this, forceReconnection)); - thread.start(); - getChangeScreenRequest(); - // createSocketAndSend(aClient.getList(),String.valueOf(port)); + Thread thread2 = new Thread(new ChangeHost(this, forceReconnection)); + thread2.start(); } public void setConnectionManager(ConnectionManager _connectionManager) { @@ -277,21 +272,24 @@ Thread th = new Thread(new Runnable() { @Override public void run() { - try { - Socket clientSocket = null; - ServerSocket echoServer = new ServerSocket(10001); - while (true) { - clientSocket = echoServer.accept(); - BufferedReader is = new BufferedReader( - new InputStreamReader(clientSocket.getInputStream())); - String newHostName = is.readLine(); - // String screenSize = is.readLine(); - changeVNCServer(newHostName); - System.out.println("----------success----------"); - clientSocket.close(); + while (true) { + try { + Socket clientSocket = null; + ServerSocket echoServer = new ServerSocket(10001); + while (true) { + clientSocket = echoServer.accept(); + BufferedReader is = new BufferedReader( + new InputStreamReader( + clientSocket.getInputStream())); + String newHostName = is.readLine(); + // String screenSize = is.readLine(); + changeVNCServer(newHostName); + System.out.println("----------success----------"); + clientSocket.close(); + } + } catch (IOException e) { + continue; // log } - } catch (IOException e) { - e.printStackTrace(); } } }); diff -r 20326a4b9d88 -r d2741b80399e src/main/java/jp/ac/u_ryukyu/treevnc/server/state/ChangeHost.java --- a/src/main/java/jp/ac/u_ryukyu/treevnc/server/state/ChangeHost.java Tue Dec 04 17:56:39 2012 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/server/state/ChangeHost.java Thu Dec 06 17:15:23 2012 +0900 @@ -12,8 +12,6 @@ private VncProxyService vps; private ScreenChanges screenChange; - private LinkedList clientList; - private int port; public ChangeHost(VncProxyService _vps, boolean isApplet) { diff -r 20326a4b9d88 -r d2741b80399e src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java --- a/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java Tue Dec 04 17:56:39 2012 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java Thu Dec 06 17:15:23 2012 +0900 @@ -6,8 +6,6 @@ public class TreeViewer { private boolean treeProxy; private boolean viewer; - private String host; - private int port; public static void main(String[] args) { new TreeViewer().vncStart(args); @@ -34,13 +32,8 @@ } else if ("-v".equals(args[i])) { viewer = true; } else if ("-r".equals(args[i])) { - i++; - host = args[i]; - i++; - port = Integer.parseInt(args[i]); treeProxy = true; } else { - i++; System.out.println("(default) TreeVNCClient\n" + "-p TreeVNCProxy\n" + "-v VNCViewer\n" diff -r 20326a4b9d88 -r d2741b80399e src/viewer_swing/java/com/glavsoft/viewer/Viewer.java --- a/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java Tue Dec 04 17:56:39 2012 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java Thu Dec 06 17:15:23 2012 +0900 @@ -49,7 +49,6 @@ import java.io.IOException; import java.io.InputStream; import java.net.Socket; -import java.net.UnknownHostException; import java.util.LinkedList; import java.util.List; import java.util.jar.Attributes;