# HG changeset patch # User Taninari YU # Date 1344932088 -32400 # Node ID 1a30763734cf0f03f04417dd201bd5c6db7e3624 # Parent a096a009bbda54a7167387ad37b8641b4dd3c9ef temp commit diff -r a096a009bbda -r 1a30763734cf src/main/java/ac/ryukyu/treevnc/client/MyVncClient.java --- a/src/main/java/ac/ryukyu/treevnc/client/MyVncClient.java Mon Aug 13 09:09:36 2012 +0900 +++ b/src/main/java/ac/ryukyu/treevnc/client/MyVncClient.java Tue Aug 14 17:14:48 2012 +0900 @@ -1,13 +1,10 @@ package ac.ryukyu.treevnc.client; -import java.awt.Insets; import java.awt.event.WindowEvent; import java.awt.event.WindowListener; import java.io.IOException; -import java.net.Socket; import java.util.logging.Logger; -import javax.swing.SwingUtilities; import com.glavsoft.exceptions.AuthenticationFailedException; import com.glavsoft.exceptions.FatalException; @@ -22,7 +19,6 @@ import com.glavsoft.transport.Writer; import com.glavsoft.viewer.ConnectionManager; import com.glavsoft.viewer.Viewer; -import com.glavsoft.viewer.Viewer.PasswordChooser; import com.glavsoft.viewer.cli.Parser; import com.glavsoft.viewer.swing.ClipboardControllerImpl; import com.glavsoft.viewer.swing.ParametersHandler; @@ -38,31 +34,17 @@ * */ private static final long serialVersionUID = 1L; - private boolean inAnApplet = true; - private boolean inSeparateFrame = false; - private Socket clientSocket = null; - private String parent, treenum; - private String leaderflag; // private boolean runflag = false; - private boolean first = true; - private EchoClient echoValue; - private int echoPort; - private String pHost; - private TextBoxClient getHost; - private GetDataClient getBcast; - private Thread runBcast; - private GetHostClient bCast; boolean isClient = false; public static final int DEFAULT_PORT = 5900; public static Logger logger = Logger.getLogger("com.glavsoft"); - private static final Insets BUTTONS_MARGIN = new Insets(2, 2, 2, 2); - private boolean isZoomToFitSelected; private boolean forceReconnection; private String reconnectionReason; private ConnectionParams connectionParams; private final ProtocolSettings settings; private final UiSettings uiSettings; + private String[] arguments; public MyVncClient() { @@ -81,7 +63,7 @@ } public void treeVncClient(String[] argv) { - MyVncClient v = new MyVncClient(); + new MyVncClient(); //v.runClient(argv); } @@ -90,15 +72,7 @@ String[] mainArgs = argv; System.out.println(mainArgs.length); // input into arguments Decision - if (mainArgs.length != 0) { - for (int i = 0; i < argv.length; i++) { - if ("-c".equals(argv[i])) { - // write later - } - } - } else { - //getHostData(); - } + Parser parser = new Parser(); ParametersHandler.completeParserOptions(parser); @@ -108,6 +82,14 @@ System.exit(0); } MyVncClient myClient = new MyVncClient(parser); + if (mainArgs.length != 0) { + for (int i = 0; i < argv.length; i++) { + myClient.setArgments(mainArgs); + // write later + } + } else { + //getHostData(); + } //SwingUtilities.invokeLater(myClient); Thread th = new Thread(myClient); th.start(); @@ -123,6 +105,7 @@ } tryAgain = true; while (tryAgain) { + connectionParams.hostName = arguments[0]; // workingSocket = connectionManager.connectToTreeHost(connectionParams, settings); workingSocket = connectionManager.connectToTreeHost(connectionParams, settings); if (null == workingSocket) { @@ -181,7 +164,9 @@ } - + private void setArgments(String[] args) { + arguments = args; + } @Override diff -r a096a009bbda -r 1a30763734cf src/main/java/com/glavsoft/rfb/RfbCapabilityInfo.java --- a/src/main/java/com/glavsoft/rfb/RfbCapabilityInfo.java Mon Aug 13 09:09:36 2012 +0900 +++ b/src/main/java/com/glavsoft/rfb/RfbCapabilityInfo.java Tue Aug 14 17:14:48 2012 +0900 @@ -51,6 +51,7 @@ public static final String AUTHENTICATION_NO_AUTH = "NOAUTH__"; public static final String AUTHENTICATION_VNC_AUTH ="VNCAUTH_"; + public static final String AUTHENTICATION_REQ_AUTH ="REQAUTH_"; public static final String ENCODING_COPYRECT = "COPYRECT"; public static final String ENCODING_HEXTILE = "HEXTILE_"; diff -r a096a009bbda -r 1a30763734cf src/main/java/com/glavsoft/rfb/protocol/ProtocolSettings.java --- a/src/main/java/com/glavsoft/rfb/protocol/ProtocolSettings.java Mon Aug 13 09:09:36 2012 +0900 +++ b/src/main/java/com/glavsoft/rfb/protocol/ProtocolSettings.java Tue Aug 14 17:14:48 2012 +0900 @@ -154,6 +154,8 @@ RfbCapabilityInfo.VENDOR_STANDARD, RfbCapabilityInfo.AUTHENTICATION_NO_AUTH); cc.addEnabled(SecurityType.VNC_AUTHENTICATION.getId(), RfbCapabilityInfo.VENDOR_STANDARD, RfbCapabilityInfo.AUTHENTICATION_VNC_AUTH); + cc.addEnabled(SecurityType.REQUIRE_AUTHENTICATION.getId() + , RfbCapabilityInfo.VENDOR_STANDARD, RfbCapabilityInfo.AUTHENTICATION_REQ_AUTH); //cc.addEnabled( 19, "VENC", "VENCRYPT"); //cc.addEnabled( 20, "GTKV", "SASL____"); //cc.addEnabled(129, RfbCapabilityInfo.TIGHT_VNC_VENDOR, "ULGNAUTH"); diff -r a096a009bbda -r 1a30763734cf src/main/java/com/glavsoft/rfb/protocol/auth/SecurityType.java --- a/src/main/java/com/glavsoft/rfb/protocol/auth/SecurityType.java Mon Aug 13 09:09:36 2012 +0900 +++ b/src/main/java/com/glavsoft/rfb/protocol/auth/SecurityType.java Tue Aug 14 17:14:48 2012 +0900 @@ -37,11 +37,13 @@ VNC_AUTHENTICATION(2), // int RA2_AUTHENTICATION = 5; // int RA2NE_AUTHENTICATION = 6; - TIGHT_AUTHENTICATION(16); + TIGHT_AUTHENTICATION(16), + REQUIRE_AUTHENTICATION(32); // int ULTRA_AUTHENTICATION = 17; // int TLS_AUTHENTICATION = 18; // int VENCRYPT_AUTHENTICATION = 19; + private int id; private SecurityType(int id) { this.id = id; @@ -58,6 +60,7 @@ put(TIGHT_AUTHENTICATION.getId(), new TightAuthentication()); put(VNC_AUTHENTICATION.getId(), new VncAuthentication()); put(NONE_AUTHENTICATION.getId(), new NoneAuthentication()); + put(REQUIRE_AUTHENTICATION.getId(), new RequireAuthentication()); }}; public static AuthHandler getAuthHandlerById(int id) throws UnsupportedSecurityTypeException { diff -r a096a009bbda -r 1a30763734cf src/main/java/com/glavsoft/transport/Reader.java --- a/src/main/java/com/glavsoft/transport/Reader.java Mon Aug 13 09:09:36 2012 +0900 +++ b/src/main/java/com/glavsoft/transport/Reader.java Tue Aug 14 17:14:48 2012 +0900 @@ -128,5 +128,8 @@ throw new TransportException("Cannot read " + length + " bytes array", e); } } - + public byte[] readBytes(byte[]b) throws TransportException { + byte[] result = readBytes(b,0,b.length); + return result; + } } \ No newline at end of file diff -r a096a009bbda -r 1a30763734cf src/viewer_swing/java/com/glavsoft/viewer/ConnectionManager.java --- a/src/viewer_swing/java/com/glavsoft/viewer/ConnectionManager.java Mon Aug 13 09:09:36 2012 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/ConnectionManager.java Tue Aug 14 17:14:48 2012 +0900 @@ -89,15 +89,15 @@ Thread runBcast = new Thread(getBcast); runBcast.start(); getBcast.setStopFlag(true); - connectionParams.hostName = getBcast.textAddress(); + //connectionParams.hostName = getBcast.textAddress(); if("notFound".equals(connectionParams.hostName)) { getBcast.text.ipRegister(); connectionParams.hostName = getBcast.textAddress(); connectionParams.portNumber = Integer.parseInt(getBcast.textPort()); //connectionParams.portNumber = 5900; } else { - connectionParams.portNumber = Integer.parseInt(getBcast.textPort()); - //connectionParams.portNumber = 5900; + // connectionParams.portNumber = Integer.parseInt(getBcast.textPort()); + connectionParams.portNumber = 5900; } Viewer.logger.info("Connecting to host " + connectionParams.hostName + ":" + connectionParams.portNumber); try { diff -r a096a009bbda -r 1a30763734cf src/viewer_swing/java/com/glavsoft/viewer/Viewer.java --- a/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java Mon Aug 13 09:09:36 2012 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java Tue Aug 14 17:14:48 2012 +0900 @@ -63,8 +63,8 @@ public static Logger logger = Logger.getLogger("com.glavsoft"); private static final Insets BUTTONS_MARGIN = new Insets(2, 2, 2, 2); private boolean isZoomToFitSelected; - private boolean forceReconnection; - private String reconnectionReason; + protected boolean forceReconnection; + protected String reconnectionReason; private ContainerManager containerManager; public Protocol getWorkingProtocol() { @@ -146,7 +146,7 @@ } - private final ParametersHandler.ConnectionParams connectionParams; + protected final ParametersHandler.ConnectionParams connectionParams; protected String passwordFromParams; protected Socket workingSocket; protected Protocol workingProtocol;