diff options
| -rw-r--r-- | java/com/tigervnc/rfb/CConnection.java | 2 | ||||
| -rw-r--r-- | java/com/tigervnc/rfb/CSecurityTLS.java | 7 | ||||
| -rw-r--r-- | java/com/tigervnc/rfb/CSecurityVeNCrypt.java | 2 | ||||
| -rw-r--r-- | java/com/tigervnc/rfb/TightDecoder.java | 1 | ||||
| -rw-r--r-- | java/com/tigervnc/vncviewer/CConn.java | 6 | ||||
| -rw-r--r-- | java/com/tigervnc/vncviewer/ServerDialog.java | 2 |
6 files changed, 9 insertions, 11 deletions
diff --git a/java/com/tigervnc/rfb/CConnection.java b/java/com/tigervnc/rfb/CConnection.java index 15e19896..8a477654 100644 --- a/java/com/tigervnc/rfb/CConnection.java +++ b/java/com/tigervnc/rfb/CConnection.java @@ -102,7 +102,7 @@ abstract public class CConnection extends CMsgHandler { int secType = Security.secTypeInvalid; List<Integer> secTypes = new ArrayList<Integer>(); - secTypes = security.GetEnabledSecTypes(); + secTypes = Security.GetEnabledSecTypes(); //for (Iterator i = secTypes.iterator(); i.hasNext(); ) // vlog.info(((Integer)i.next()).toString()); diff --git a/java/com/tigervnc/rfb/CSecurityTLS.java b/java/com/tigervnc/rfb/CSecurityTLS.java index c26a1986..2b8bf355 100644 --- a/java/com/tigervnc/rfb/CSecurityTLS.java +++ b/java/com/tigervnc/rfb/CSecurityTLS.java @@ -56,9 +56,9 @@ public class CSecurityTLS extends CSecurity { } sslfactory = ctx.getSocketFactory(); try { - ssl = (SSLSocket)sslfactory.createSocket(cc.sock, - cc.sock.getInetAddress().getHostName(), - cc.sock.getPort(), true); + ssl = (SSLSocket)sslfactory.createSocket(CConnection.sock, + CConnection.sock.getInetAddress().getHostName(), + CConnection.sock.getPort(), true); } catch (java.io.IOException e) { throw new Exception(e.toString()); } @@ -242,7 +242,6 @@ public class CSecurityTLS extends CSecurity { private SSLSession session; private String cafile, crlfile; private InStream is; - private OutStream os; private SSLSocket ssl; static LogWriter vlog = new LogWriter("CSecurityTLS"); diff --git a/java/com/tigervnc/rfb/CSecurityVeNCrypt.java b/java/com/tigervnc/rfb/CSecurityVeNCrypt.java index ae758e7f..75276c77 100644 --- a/java/com/tigervnc/rfb/CSecurityVeNCrypt.java +++ b/java/com/tigervnc/rfb/CSecurityVeNCrypt.java @@ -131,7 +131,7 @@ public class CSecurityVeNCrypt extends CSecurity { Iterator j; List<Integer> secTypes = new ArrayList<Integer>(); - secTypes = security.GetEnabledExtSecTypes(); + secTypes = Security.GetEnabledExtSecTypes(); /* Honor server's security type order */ for (i = 0; i < nAvailableTypes; i++) { diff --git a/java/com/tigervnc/rfb/TightDecoder.java b/java/com/tigervnc/rfb/TightDecoder.java index 5cce3a93..d01a8c3c 100644 --- a/java/com/tigervnc/rfb/TightDecoder.java +++ b/java/com/tigervnc/rfb/TightDecoder.java @@ -63,7 +63,6 @@ public class TightDecoder extends Decoder { int comp_ctl = is.readU8(); - int bytesPerPixel = handler.cp.pf().bpp / 8; boolean bigEndian = handler.cp.pf().bigEndian; // Flush zlib streams if we are told by the server to do so. diff --git a/java/com/tigervnc/vncviewer/CConn.java b/java/com/tigervnc/vncviewer/CConn.java index a375438b..d504eb16 100644 --- a/java/com/tigervnc/vncviewer/CConn.java +++ b/java/com/tigervnc/vncviewer/CConn.java @@ -208,7 +208,7 @@ public class CConn extends CConnection public boolean showMsgBox(int flags, String title, String text) { - StringBuffer titleText = new StringBuffer("VNC Viewer: "+title); + //StringBuffer titleText = new StringBuffer("VNC Viewer: "+title); return true; } @@ -744,7 +744,7 @@ public class CConn extends CConnection /* Process non-VeNCrypt sectypes */ java.util.List<Integer> secTypes = new ArrayList<Integer>(); - secTypes = security.GetEnabledSecTypes(); + secTypes = Security.GetEnabledSecTypes(); for (Iterator i = secTypes.iterator(); i.hasNext();) { switch ((Integer)i.next()) { case Security.secTypeVeNCrypt: @@ -764,7 +764,7 @@ public class CConn extends CConnection /* Process VeNCrypt subtypes */ if (options.secVeNCrypt.isSelected()) { java.util.List<Integer> secTypesExt = new ArrayList<Integer>(); - secTypesExt = security.GetEnabledExtSecTypes(); + secTypesExt = Security.GetEnabledExtSecTypes(); for (Iterator iext = secTypesExt.iterator(); iext.hasNext();) { switch ((Integer)iext.next()) { case Security.secTypePlain: diff --git a/java/com/tigervnc/vncviewer/ServerDialog.java b/java/com/tigervnc/vncviewer/ServerDialog.java index 55ad0d02..f5e56141 100644 --- a/java/com/tigervnc/vncviewer/ServerDialog.java +++ b/java/com/tigervnc/vncviewer/ServerDialog.java @@ -107,7 +107,7 @@ class ServerDialog extends Dialog implements } public void itemStateChanged(ItemEvent e) { - Object s = e.getSource(); + //Object s = e.getSource(); } public void actionPerformed(ActionEvent e) { |