Mercurial > 510Connectbot

diff src/ch/ethz/ssh2/packets/Packets.java @ 308:42b15aaa7ac7 ganymed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Carl Byington <carl@five-ten-sg.com>
date Wed, 30 Jul 2014 14:21:50 -0700
parents 071eccdff8ea
children
line wrap: on
line diff
--- a/src/ch/ethz/ssh2/packets/Packets.java	Wed Jul 30 13:38:04 2014 -0700
+++ b/src/ch/ethz/ssh2/packets/Packets.java	Wed Jul 30 14:21:50 2014 -0700
@@ -6,131 +6,121 @@
 
 /**
  * Packets.
- * 
+ *
  * @author Christian Plattner
  * @version 2.50, 03/15/10
  */
-public final class Packets
-{
-	public static final int SSH_MSG_DISCONNECT = 1;
-	public static final int SSH_MSG_IGNORE = 2;
-	public static final int SSH_MSG_UNIMPLEMENTED = 3;
-	public static final int SSH_MSG_DEBUG = 4;
-	public static final int SSH_MSG_SERVICE_REQUEST = 5;
-	public static final int SSH_MSG_SERVICE_ACCEPT = 6;
-
-	public static final int SSH_MSG_KEXINIT = 20;
-	public static final int SSH_MSG_NEWKEYS = 21;
+public final class Packets {
+    public static final int SSH_MSG_DISCONNECT = 1;
+    public static final int SSH_MSG_IGNORE = 2;
+    public static final int SSH_MSG_UNIMPLEMENTED = 3;
+    public static final int SSH_MSG_DEBUG = 4;
+    public static final int SSH_MSG_SERVICE_REQUEST = 5;
+    public static final int SSH_MSG_SERVICE_ACCEPT = 6;
 
-	public static final int SSH_MSG_KEXDH_INIT = 30;
-	public static final int SSH_MSG_KEXDH_REPLY = 31;
+    public static final int SSH_MSG_KEXINIT = 20;
+    public static final int SSH_MSG_NEWKEYS = 21;
+
+    public static final int SSH_MSG_KEXDH_INIT = 30;
+    public static final int SSH_MSG_KEXDH_REPLY = 31;
 
-	public static final int SSH_MSG_KEX_DH_GEX_REQUEST_OLD = 30;
-	public static final int SSH_MSG_KEX_DH_GEX_REQUEST = 34;
-	public static final int SSH_MSG_KEX_DH_GEX_GROUP = 31;
-	public static final int SSH_MSG_KEX_DH_GEX_INIT = 32;
-	public static final int SSH_MSG_KEX_DH_GEX_REPLY = 33;
-
-	public static final int SSH_MSG_USERAUTH_REQUEST = 50;
-	public static final int SSH_MSG_USERAUTH_FAILURE = 51;
-	public static final int SSH_MSG_USERAUTH_SUCCESS = 52;
-	public static final int SSH_MSG_USERAUTH_BANNER = 53;
-	public static final int SSH_MSG_USERAUTH_INFO_REQUEST = 60;
-	public static final int SSH_MSG_USERAUTH_INFO_RESPONSE = 61;
+    public static final int SSH_MSG_KEX_DH_GEX_REQUEST_OLD = 30;
+    public static final int SSH_MSG_KEX_DH_GEX_REQUEST = 34;
+    public static final int SSH_MSG_KEX_DH_GEX_GROUP = 31;
+    public static final int SSH_MSG_KEX_DH_GEX_INIT = 32;
+    public static final int SSH_MSG_KEX_DH_GEX_REPLY = 33;
 
-	public static final int SSH_MSG_GLOBAL_REQUEST = 80;
-	public static final int SSH_MSG_REQUEST_SUCCESS = 81;
-	public static final int SSH_MSG_REQUEST_FAILURE = 82;
+    public static final int SSH_MSG_USERAUTH_REQUEST = 50;
+    public static final int SSH_MSG_USERAUTH_FAILURE = 51;
+    public static final int SSH_MSG_USERAUTH_SUCCESS = 52;
+    public static final int SSH_MSG_USERAUTH_BANNER = 53;
+    public static final int SSH_MSG_USERAUTH_INFO_REQUEST = 60;
+    public static final int SSH_MSG_USERAUTH_INFO_RESPONSE = 61;
 
-	public static final int SSH_MSG_CHANNEL_OPEN = 90;
-	public static final int SSH_MSG_CHANNEL_OPEN_CONFIRMATION = 91;
-	public static final int SSH_MSG_CHANNEL_OPEN_FAILURE = 92;
-	public static final int SSH_MSG_CHANNEL_WINDOW_ADJUST = 93;
-	public static final int SSH_MSG_CHANNEL_DATA = 94;
-	public static final int SSH_MSG_CHANNEL_EXTENDED_DATA = 95;
-	public static final int SSH_MSG_CHANNEL_EOF = 96;
-	public static final int SSH_MSG_CHANNEL_CLOSE = 97;
-	public static final int SSH_MSG_CHANNEL_REQUEST = 98;
-	public static final int SSH_MSG_CHANNEL_SUCCESS = 99;
-	public static final int SSH_MSG_CHANNEL_FAILURE = 100;
+    public static final int SSH_MSG_GLOBAL_REQUEST = 80;
+    public static final int SSH_MSG_REQUEST_SUCCESS = 81;
+    public static final int SSH_MSG_REQUEST_FAILURE = 82;
 
-	public static final int SSH_EXTENDED_DATA_STDERR = 1;
-
-	public static final int SSH_OPEN_ADMINISTRATIVELY_PROHIBITED = 1;
-	public static final int SSH_OPEN_CONNECT_FAILED = 2;
-	public static final int SSH_OPEN_UNKNOWN_CHANNEL_TYPE = 3;
-	public static final int SSH_OPEN_RESOURCE_SHORTAGE = 4;
-
-	private static final String[] reverseNames = new String[101];
+    public static final int SSH_MSG_CHANNEL_OPEN = 90;
+    public static final int SSH_MSG_CHANNEL_OPEN_CONFIRMATION = 91;
+    public static final int SSH_MSG_CHANNEL_OPEN_FAILURE = 92;
+    public static final int SSH_MSG_CHANNEL_WINDOW_ADJUST = 93;
+    public static final int SSH_MSG_CHANNEL_DATA = 94;
+    public static final int SSH_MSG_CHANNEL_EXTENDED_DATA = 95;
+    public static final int SSH_MSG_CHANNEL_EOF = 96;
+    public static final int SSH_MSG_CHANNEL_CLOSE = 97;
+    public static final int SSH_MSG_CHANNEL_REQUEST = 98;
+    public static final int SSH_MSG_CHANNEL_SUCCESS = 99;
+    public static final int SSH_MSG_CHANNEL_FAILURE = 100;
 
-	static
-	{
-		reverseNames[1] = "SSH_MSG_DISCONNECT";
-		reverseNames[2] = "SSH_MSG_IGNORE";
-		reverseNames[3] = "SSH_MSG_UNIMPLEMENTED";
-		reverseNames[4] = "SSH_MSG_DEBUG";
-		reverseNames[5] = "SSH_MSG_SERVICE_REQUEST";
-		reverseNames[6] = "SSH_MSG_SERVICE_ACCEPT";
+    public static final int SSH_EXTENDED_DATA_STDERR = 1;
+
+    public static final int SSH_OPEN_ADMINISTRATIVELY_PROHIBITED = 1;
+    public static final int SSH_OPEN_CONNECT_FAILED = 2;
+    public static final int SSH_OPEN_UNKNOWN_CHANNEL_TYPE = 3;
+    public static final int SSH_OPEN_RESOURCE_SHORTAGE = 4;
+
+    private static final String[] reverseNames = new String[101];
 
-		reverseNames[20] = "SSH_MSG_KEXINIT";
-		reverseNames[21] = "SSH_MSG_NEWKEYS";
-
-		reverseNames[30] = "SSH_MSG_KEXDH_INIT";
-		reverseNames[31] = "SSH_MSG_KEXDH_REPLY/SSH_MSG_KEX_DH_GEX_GROUP";
-		reverseNames[32] = "SSH_MSG_KEX_DH_GEX_INIT";
-		reverseNames[33] = "SSH_MSG_KEX_DH_GEX_REPLY";
-		reverseNames[34] = "SSH_MSG_KEX_DH_GEX_REQUEST";
-
-		reverseNames[50] = "SSH_MSG_USERAUTH_REQUEST";
-		reverseNames[51] = "SSH_MSG_USERAUTH_FAILURE";
-		reverseNames[52] = "SSH_MSG_USERAUTH_SUCCESS";
-		reverseNames[53] = "SSH_MSG_USERAUTH_BANNER";
-
-		reverseNames[60] = "SSH_MSG_USERAUTH_INFO_REQUEST";
-		reverseNames[61] = "SSH_MSG_USERAUTH_INFO_RESPONSE";
-
-		reverseNames[80] = "SSH_MSG_GLOBAL_REQUEST";
-		reverseNames[81] = "SSH_MSG_REQUEST_SUCCESS";
-		reverseNames[82] = "SSH_MSG_REQUEST_FAILURE";
+    static {
+        reverseNames[1] = "SSH_MSG_DISCONNECT";
+        reverseNames[2] = "SSH_MSG_IGNORE";
+        reverseNames[3] = "SSH_MSG_UNIMPLEMENTED";
+        reverseNames[4] = "SSH_MSG_DEBUG";
+        reverseNames[5] = "SSH_MSG_SERVICE_REQUEST";
+        reverseNames[6] = "SSH_MSG_SERVICE_ACCEPT";
+        reverseNames[20] = "SSH_MSG_KEXINIT";
+        reverseNames[21] = "SSH_MSG_NEWKEYS";
+        reverseNames[30] = "SSH_MSG_KEXDH_INIT";
+        reverseNames[31] = "SSH_MSG_KEXDH_REPLY/SSH_MSG_KEX_DH_GEX_GROUP";
+        reverseNames[32] = "SSH_MSG_KEX_DH_GEX_INIT";
+        reverseNames[33] = "SSH_MSG_KEX_DH_GEX_REPLY";
+        reverseNames[34] = "SSH_MSG_KEX_DH_GEX_REQUEST";
+        reverseNames[50] = "SSH_MSG_USERAUTH_REQUEST";
+        reverseNames[51] = "SSH_MSG_USERAUTH_FAILURE";
+        reverseNames[52] = "SSH_MSG_USERAUTH_SUCCESS";
+        reverseNames[53] = "SSH_MSG_USERAUTH_BANNER";
+        reverseNames[60] = "SSH_MSG_USERAUTH_INFO_REQUEST";
+        reverseNames[61] = "SSH_MSG_USERAUTH_INFO_RESPONSE";
+        reverseNames[80] = "SSH_MSG_GLOBAL_REQUEST";
+        reverseNames[81] = "SSH_MSG_REQUEST_SUCCESS";
+        reverseNames[82] = "SSH_MSG_REQUEST_FAILURE";
+        reverseNames[90] = "SSH_MSG_CHANNEL_OPEN";
+        reverseNames[91] = "SSH_MSG_CHANNEL_OPEN_CONFIRMATION";
+        reverseNames[92] = "SSH_MSG_CHANNEL_OPEN_FAILURE";
+        reverseNames[93] = "SSH_MSG_CHANNEL_WINDOW_ADJUST";
+        reverseNames[94] = "SSH_MSG_CHANNEL_DATA";
+        reverseNames[95] = "SSH_MSG_CHANNEL_EXTENDED_DATA";
+        reverseNames[96] = "SSH_MSG_CHANNEL_EOF";
+        reverseNames[97] = "SSH_MSG_CHANNEL_CLOSE";
+        reverseNames[98] = "SSH_MSG_CHANNEL_REQUEST";
+        reverseNames[99] = "SSH_MSG_CHANNEL_SUCCESS";
+        reverseNames[100] = "SSH_MSG_CHANNEL_FAILURE";
+    }
 
-		reverseNames[90] = "SSH_MSG_CHANNEL_OPEN";
-		reverseNames[91] = "SSH_MSG_CHANNEL_OPEN_CONFIRMATION";
-		reverseNames[92] = "SSH_MSG_CHANNEL_OPEN_FAILURE";
-		reverseNames[93] = "SSH_MSG_CHANNEL_WINDOW_ADJUST";
-		reverseNames[94] = "SSH_MSG_CHANNEL_DATA";
-		reverseNames[95] = "SSH_MSG_CHANNEL_EXTENDED_DATA";
-		reverseNames[96] = "SSH_MSG_CHANNEL_EOF";
-		reverseNames[97] = "SSH_MSG_CHANNEL_CLOSE";
-		reverseNames[98] = "SSH_MSG_CHANNEL_REQUEST";
-		reverseNames[99] = "SSH_MSG_CHANNEL_SUCCESS";
-		reverseNames[100] = "SSH_MSG_CHANNEL_FAILURE";
-	}
+    public static final String getMessageName(int type) {
+        String res = null;
 
-	public static final String getMessageName(int type)
-	{
-		String res = null;
+        if ((type >= 0) && (type < reverseNames.length)) {
+            res = reverseNames[type];
+        }
+
+        return (res == null) ? ("UNKNOWN MSG " + type) : res;
+    }
 
-		if ((type >= 0) && (type < reverseNames.length))
-		{
-			res = reverseNames[type];
-		}
-
-		return (res == null) ? ("UNKNOWN MSG " + type) : res;
-	}
-
-	//	public static final void debug(String tag, byte[] msg)
-	//	{
-	//		System.err.println(tag + " Type: " + msg[0] + ", LEN: " + msg.length);
-	//
-	//		for (int i = 0; i < msg.length; i++)
-	//		{
-	//			if (((msg[i] >= 'a') && (msg[i] <= 'z')) || ((msg[i] >= 'A') && (msg[i] <= 'Z'))
-	//					|| ((msg[i] >= '0') && (msg[i] <= '9')) || (msg[i] == ' '))
-	//				System.err.print((char) msg[i]);
-	//			else
-	//				System.err.print(".");
-	//		}
-	//		System.err.println();
-	//		System.err.flush();
-	//	}
+    //  public static final void debug(String tag, byte[] msg)
+    //  {
+    //      System.err.println(tag + " Type: " + msg[0] + ", LEN: " + msg.length);
+    //
+    //      for (int i = 0; i < msg.length; i++)
+    //      {
+    //          if (((msg[i] >= 'a') && (msg[i] <= 'z')) || ((msg[i] >= 'A') && (msg[i] <= 'Z'))
+    //                  || ((msg[i] >= '0') && (msg[i] <= '9')) || (msg[i] == ' '))
+    //              System.err.print((char) msg[i]);
+    //          else
+    //              System.err.print(".");
+    //      }
+    //      System.err.println();
+    //      System.err.flush();
+    //  }
 }