Use consistent indentation & whitespace;

Reformat some lines.

svn path=/trunk/; revision=41679

1 files changed, 784 insertions, 770 deletions

diff --git a/epan/dissectors/packet-telnet.c b/epan/dissectors/packet-telnet.c
index c07e14a41f..fcd106ea50 100644
--- a/epan/dissectors/packet-telnet.c
+++ b/epan/dissectors/packet-telnet.c
@@ -103,7 +103,7 @@ static dissector_handle_t tn5250_handle;
 
 /* Some defines for Telnet */
 
-#define TCP_PORT_TELNET			23
+#define TCP_PORT_TELNET 23
 
 #define TN_IAC   255
 #define TN_DONT  254
@@ -125,40 +125,41 @@ static dissector_handle_t tn5250_handle;
 #define TN_ABORT 238
 #define TN_SUSP  237
 #define TN_EOF   236
-#define TN_ARE   1
+#define TN_ARE     1
 
 
 typedef enum {
-  NO_LENGTH,		/* option has no data, hence no length */
-  FIXED_LENGTH,		/* option always has the same length */
-  VARIABLE_LENGTH	/* option is variable-length - optlen is minimum */
+  NO_LENGTH,            /* option has no data, hence no length */
+  FIXED_LENGTH,         /* option always has the same length */
+  VARIABLE_LENGTH       /* option is variable-length - optlen is minimum */
 } tn_opt_len_type;
 
 /* Member of table of IP or TCP options. */
 typedef struct tn_opt {
-  const char  *name;		/* name of option */
-  gint  *subtree_index;		/* pointer to subtree index for option */
-  tn_opt_len_type len_type;	/* type of option length field */
-  int	optlen;			/* value length should be (minimum if VARIABLE) */
-  void	(*dissect)(packet_info *pinfo, const char *, tvbuff_t *, int, int, proto_tree *);
-				/* routine to dissect option */
+  const char      *name;          /* name of option */
+  gint            *subtree_index; /* pointer to subtree index for option */
+  tn_opt_len_type  len_type;      /* type of option length field */
+  int              optlen;        /* value length should be (minimum if VARIABLE) */
+  void  (*dissect)(packet_info *pinfo, const char *, tvbuff_t *, int, int, proto_tree *);
+                                  /* routine to dissect option */
 } tn_opt;
 
 static void
 check_tn3270_model(packet_info *pinfo _U_, const char *terminaltype)
 {
-  int model;
+  int  model;
   char str_model[2];
+
   if ((strcmp(terminaltype,"IBM-3278-2-E") == 0) || (strcmp(terminaltype,"IBM-3278-2") == 0) ||
       (strcmp(terminaltype,"IBM-3278-3") == 0) || (strcmp(terminaltype,"IBM-3278-4") == 0) ||
       (strcmp(terminaltype,"IBM-3278-5") == 0) || (strcmp(terminaltype,"IBM-3277-2") == 0) ||
       (strcmp(terminaltype,"IBM-3279-3") == 0) || (strcmp(terminaltype,"IBM-3279-4") == 0) ||
       (strcmp(terminaltype,"IBM-3279-2-E") == 0) || (strcmp(terminaltype,"IBM-3279-2") == 0) ||
       (strcmp(terminaltype,"IBM-3279-4-E") == 0)) {
-      str_model[0] = terminaltype[9];
-      str_model[1] = '\0';
-      model = atoi(str_model);
-      add_tn3270_conversation(pinfo, 0, model);
+    str_model[0] = terminaltype[9];
+    str_model[1] = '\0';
+    model = atoi(str_model);
+    add_tn3270_conversation(pinfo, 0, model);
   }
 }
 
@@ -166,7 +167,7 @@ static void
 check_for_tn3270(packet_info *pinfo _U_, const char *optname, const char *terminaltype)
 {
   if (strcmp(optname,"Terminal Type") != 0) {
-      return;
+    return;
   }
   check_tn3270_model(pinfo, terminaltype);
 
@@ -179,8 +180,8 @@ check_for_tn3270(packet_info *pinfo _U_, const char *optname, const char *termin
       (strcmp(terminaltype,"IBM-3196-A1") == 0) ||  /* 24 x 80 monochrome display*/
       (strcmp(terminaltype,"IBM-5292-2") == 0) ||   /* 24 x 80 color display*/
       (strcmp(terminaltype,"IBM-5291-1") == 0) ||   /* 24 x 80 monochrome display*/
-      (strcmp(terminaltype,"IBM-5251-11") == 0))  /* 24 x 80 monochrome display*/
-      add_tn5250_conversation(pinfo, 0);
+      (strcmp(terminaltype,"IBM-5251-11") == 0))    /* 24 x 80 monochrome display*/
+    add_tn5250_conversation(pinfo, 0);
 }
 
 static void
@@ -192,7 +193,7 @@ dissect_string_subopt(packet_info *pinfo _U_, const char *optname, tvbuff_t *tvb
   cmd = tvb_get_guint8(tvb, offset);
   switch (cmd) {
 
-  case 0:	/* IS */
+  case 0:       /* IS */
     proto_tree_add_text(tree, tvb, offset, 1, "Here's my %s", optname);
     offset++;
     len--;
@@ -203,7 +204,7 @@ dissect_string_subopt(packet_info *pinfo _U_, const char *optname, tvbuff_t *tvb
     check_for_tn3270(pinfo, optname, tvb_format_text(tvb, offset, len));
     break;
 
-  case 1:	/* SEND */
+  case 1:       /* SEND */
     proto_tree_add_text(tree, tvb, offset, 1, "Send your %s", optname);
     offset++;
     len--;
@@ -229,27 +230,27 @@ dissect_tn3270_regime_subopt(packet_info *pinfo _U_, const char *optname _U_, tv
 #define TN3270_REGIME_ARE          0x01
 #define TN3270_REGIME_IS           0x00
 
-
   guint8 cmd;
+
   while (len > 0) {
     cmd = tvb_get_guint8(tvb, offset);
     switch (cmd) {
-      case TN3270_REGIME_ARE:
-      case TN3270_REGIME_IS:
-        if (cmd == TN3270_REGIME_ARE) {
-            proto_tree_add_text(tree, tvb, offset, 1, "ARE");
-            add_tn3270_conversation(pinfo, 0, 0);
-        } else {
-            proto_tree_add_text(tree, tvb, offset, 1, "IS");
-        }
-        proto_tree_add_text(tree, tvb, offset + 1, len - 1, "%s",
-                tvb_format_text(tvb, offset + 1, len - 1));
-        offset += len;
-        len -= len;
-        return;
-      default:
-        proto_tree_add_text(tree, tvb, offset, 1, "Bogus value: %u", cmd);
-        break;
+    case TN3270_REGIME_ARE:
+    case TN3270_REGIME_IS:
+      if (cmd == TN3270_REGIME_ARE) {
+        proto_tree_add_text(tree, tvb, offset, 1, "ARE");
+        add_tn3270_conversation(pinfo, 0, 0);
+      } else {
+        proto_tree_add_text(tree, tvb, offset, 1, "IS");
+      }
+      proto_tree_add_text(tree, tvb, offset + 1, len - 1, "%s",
+                          tvb_format_text(tvb, offset + 1, len - 1));
+      offset += len;
+      len -= len;
+      return;
+    default:
+      proto_tree_add_text(tree, tvb, offset, 1, "Bogus value: %u", cmd);
+      break;
     }
     offset++;
     len --;
@@ -288,10 +289,11 @@ dissect_tn3270e_subopt(packet_info *pinfo _U_, const char *optname _U_, tvbuff_t
 {
 
   guint8 cmd;
-  int datalen;
-  int connect_offset = 0;
-  int device_type = 0;
-  int rsn = 0;
+  int    datalen;
+  int    connect_offset = 0;
+  int    device_type    = 0;
+  int    rsn            = 0;
+
   while (len > 0) {
     cmd = tvb_get_guint8(tvb, offset);
     switch (cmd) {
@@ -423,17 +425,17 @@ dissect_outmark_subopt(packet_info *pinfo _U_, const char *optname _U_, tvbuff_t
                        int len, proto_tree *tree)
 {
   guint8 cmd;
-  int gs_offset, datalen;
+  int    gs_offset, datalen;
 
   while (len > 0) {
     cmd = tvb_get_guint8(tvb, offset);
     switch (cmd) {
 
-    case 6:	/* ACK */
+    case 6:     /* ACK */
       proto_tree_add_text(tree, tvb, offset, 1, "ACK");
       break;
 
-    case 21:	/* NAK */
+    case 21:    /* NAK */
       proto_tree_add_text(tree, tvb, offset, 1, "NAK");
       break;
 
@@ -490,13 +492,13 @@ dissect_htstops_subopt(packet_info *pinfo _U_, const char *optname, tvbuff_t *tv
   cmd = tvb_get_guint8(tvb, offset);
   switch (cmd) {
 
-  case 0:	/* IS */
+  case 0:       /* IS */
     proto_tree_add_text(tree, tvb, offset, 1, "Here's my %s", optname);
     offset++;
     len--;
     break;
 
-  case 1:	/* SEND */
+  case 1:       /* SEND */
     proto_tree_add_text(tree, tvb, offset, 1, "Send your %s", optname);
     offset++;
     len--;
@@ -558,26 +560,27 @@ dissect_naws_subopt(packet_info *pinfo _U_, const char *optname _U_, tvbuff_t *t
 
 /* BEGIN RFC-2217 (COM Port Control) Definitions */
 
-#define TNCOMPORT_SIGNATURE		0
-#define TNCOMPORT_SETBAUDRATE		1
-#define TNCOMPORT_SETDATASIZE		2
-#define TNCOMPORT_SETPARITY		3
-#define TNCOMPORT_SETSTOPSIZE		4
-#define TNCOMPORT_SETCONTROL		5
-#define TNCOMPORT_NOTIFYLINESTATE	6
-#define TNCOMPORT_NOTIFYMODEMSTATE	7
-#define TNCOMPORT_FLOWCONTROLSUSPEND	8
+#define TNCOMPORT_SIGNATURE             0
+#define TNCOMPORT_SETBAUDRATE           1
+#define TNCOMPORT_SETDATASIZE           2
+#define TNCOMPORT_SETPARITY             3
+#define TNCOMPORT_SETSTOPSIZE           4
+#define TNCOMPORT_SETCONTROL            5
+#define TNCOMPORT_NOTIFYLINESTATE       6
+#define TNCOMPORT_NOTIFYMODEMSTATE      7
+#define TNCOMPORT_FLOWCONTROLSUSPEND    8
 #define TNCOMPORT_FLOWCONTROLRESUME      9
-#define TNCOMPORT_SETLINESTATEMASK	10
-#define TNCOMPORT_SETMODEMSTATEMASK	11
-#define TNCOMPORT_PURGEDATA		12
+#define TNCOMPORT_SETLINESTATEMASK      10
+#define TNCOMPORT_SETMODEMSTATEMASK     11
+#define TNCOMPORT_PURGEDATA             12
 
 /* END RFC-2217 (COM Port Control) Definitions */
 
 static void
 dissect_comport_subopt(packet_info *pinfo _U_, const char *optname, tvbuff_t *tvb, int offset, int len,
                        proto_tree *tree)
-{static const char *datasizes[] = {
+{
+  static const char *datasizes[] = {
     "Request",
     "<invalid>",
     "<invalid>",
@@ -587,22 +590,22 @@ dissect_comport_subopt(packet_info *pinfo _U_, const char *optname, tvbuff_t *tv
     "6",
     "7",
     "8"
- };
- static const char *parities[] = {
+  };
+  static const char *parities[] = {
     "Request",
     "None",
     "Odd",
     "Even",
     "Mark",
     "Space"
- };
- static const char *stops[] = {
+  };
+  static const char *stops[] = {
     "Request",
     "1",
     "2",
     "1.5"
- };
- static const char *control[] = {
+  };
+  static const char *control[] = {
     "Output Flow Control Request",
     "Output Flow: None",
     "Output Flow: XON/XOFF",
@@ -623,8 +626,8 @@ dissect_comport_subopt(packet_info *pinfo _U_, const char *optname, tvbuff_t *tv
     "Output Flow: DCD",
     "Input Flow: DTR",
     "Output Flow: DSR"
- };
- static const char *linestate_bits[] = {
+  };
+  static const char *linestate_bits[] = {
     "Data Ready",
     "Overrun Error",
     "Parity Error",
@@ -633,23 +636,23 @@ dissect_comport_subopt(packet_info *pinfo _U_, const char *optname, tvbuff_t *tv
     "Transfer Holding Register Empty",
     "Transfer Shift Register Empty",
     "Timeout Error"
- };
- static const char *modemstate_bits[] = {
-     "DCTS",
-     "DDSR",
-     "TERI",
-     "DDCD",
-     "CTS",
-     "DSR",
-     "RI",
-     "DCD"
- };
- static const char *purges[] = {
-     "Purge None",
-     "Purge RX",
-     "Purge TX",
-     "Purge RX/TX"
- };
+  };
+  static const char *modemstate_bits[] = {
+    "DCTS",
+    "DDSR",
+    "TERI",
+    "DDCD",
+    "CTS",
+    "DSR",
+    "RI",
+    "DCD"
+  };
+  static const char *purges[] = {
+    "Purge None",
+    "Purge RX",
+    "Purge TX",
+    "Purge RX/TX"
+  };
 
   guint8 cmd;
   guint8 isservercmd;
@@ -664,68 +667,68 @@ dissect_comport_subopt(packet_info *pinfo _U_, const char *optname, tvbuff_t *tv
   case TNCOMPORT_SIGNATURE:
     len--;
     if (len == 0) {
-        proto_tree_add_text(tree, tvb, offset, 1, "%s Requests Signature",source);
+      proto_tree_add_text(tree, tvb, offset, 1, "%s Requests Signature",source);
     } else {
-        guint8 *sig = tvb_get_ephemeral_string(tvb, offset + 1, len);
-        proto_tree_add_text(tree, tvb, offset, 1 + len, "%s Signature: %s",source, sig);
+      guint8 *sig = tvb_get_ephemeral_string(tvb, offset + 1, len);
+      proto_tree_add_text(tree, tvb, offset, 1 + len, "%s Signature: %s",source, sig);
     }
     break;
 
   case TNCOMPORT_SETBAUDRATE:
     len--;
     if (len >= 4) {
-  	guint32 baud = tvb_get_ntohl(tvb, offset+1);
-        if (baud == 0) {
-            proto_tree_add_text(tree, tvb, offset, 5, "%s Requests Baud Rate",source);
-        } else {
-            proto_tree_add_text(tree, tvb, offset, 5, "%s Baud Rate: %d",source,baud);
-        }
+      guint32 baud = tvb_get_ntohl(tvb, offset+1);
+      if (baud == 0) {
+        proto_tree_add_text(tree, tvb, offset, 5, "%s Requests Baud Rate",source);
+      } else {
+        proto_tree_add_text(tree, tvb, offset, 5, "%s Baud Rate: %d",source,baud);
+      }
     } else {
-        proto_tree_add_text(tree, tvb, offset, 1 + len, "%s <Invalid Baud Rate Packet>",source);
+      proto_tree_add_text(tree, tvb, offset, 1 + len, "%s <Invalid Baud Rate Packet>",source);
     }
     break;
 
   case TNCOMPORT_SETDATASIZE:
     len--;
     if (len >= 1) {
-  	guint8 datasize = tvb_get_guint8(tvb, offset+1);
-        const char *ds = (datasize > 8) ? "<invalid>" : datasizes[datasize];
-        proto_tree_add_text(tree, tvb, offset, 2, "%s Data Size: %s",source,ds);
+      guint8 datasize = tvb_get_guint8(tvb, offset+1);
+      const char *ds = (datasize > 8) ? "<invalid>" : datasizes[datasize];
+      proto_tree_add_text(tree, tvb, offset, 2, "%s Data Size: %s",source,ds);
     } else {
-        proto_tree_add_text(tree, tvb, offset, 1 + len, "%s <Invalid Data Size Packet>",source);
+      proto_tree_add_text(tree, tvb, offset, 1 + len, "%s <Invalid Data Size Packet>",source);
     }
     break;
 
   case TNCOMPORT_SETPARITY:
     len--;
     if (len >= 1) {
-  	guint8 parity = tvb_get_guint8(tvb, offset+1);
-        const char *pr = (parity > 5) ? "<invalid>" : parities[parity];
-        proto_tree_add_text(tree, tvb, offset, 2, "%s Parity: %s",source,pr);
+      guint8 parity = tvb_get_guint8(tvb, offset+1);
+      const char *pr = (parity > 5) ? "<invalid>" : parities[parity];
+      proto_tree_add_text(tree, tvb, offset, 2, "%s Parity: %s",source,pr);
     } else {
-        proto_tree_add_text(tree, tvb, offset, 1 + len, "%s <Invalid Parity Packet>",source);
+      proto_tree_add_text(tree, tvb, offset, 1 + len, "%s <Invalid Parity Packet>",source);
     }
     break;
 
   case TNCOMPORT_SETSTOPSIZE:
     len--;
     if (len >= 1) {
-  	guint8 stop = tvb_get_guint8(tvb, offset+1);
-        const char *st = (stop > 3) ? "<invalid>" : stops[stop];
-        proto_tree_add_text(tree, tvb, offset, 2, "%s Stop: %s",source,st);
+      guint8 stop = tvb_get_guint8(tvb, offset+1);
+      const char *st = (stop > 3) ? "<invalid>" : stops[stop];
+      proto_tree_add_text(tree, tvb, offset, 2, "%s Stop: %s",source,st);
     } else {
-        proto_tree_add_text(tree, tvb, offset, 1 + len, "%s <Invalid Stop Packet>",source);
+      proto_tree_add_text(tree, tvb, offset, 1 + len, "%s <Invalid Stop Packet>",source);
     }
     break;
 
   case TNCOMPORT_SETCONTROL:
     len--;
     if (len >= 1) {
-  	guint8 crt = tvb_get_guint8(tvb, offset+1);
-        const char *c = (crt > 19) ? "Control: <invalid>" : control[crt];
-        proto_tree_add_text(tree, tvb, offset, 2, "%s %s",source,c);
+      guint8 crt = tvb_get_guint8(tvb, offset+1);
+      const char *c = (crt > 19) ? "Control: <invalid>" : control[crt];
+      proto_tree_add_text(tree, tvb, offset, 2, "%s %s",source,c);
     } else {
-        proto_tree_add_text(tree, tvb, offset, 1 + len, "%s <Invalid Control Packet>",source);
+      proto_tree_add_text(tree, tvb, offset, 1 + len, "%s <Invalid Control Packet>",source);
     }
     break;
 
@@ -733,29 +736,29 @@ dissect_comport_subopt(packet_info *pinfo _U_, const char *optname, tvbuff_t *tv
   case TNCOMPORT_NOTIFYLINESTATE:
     len--;
     if (len >= 1) {
-        const char *print_pattern = (cmd == TNCOMPORT_SETLINESTATEMASK) ?
-                                        "%s Set Linestate Mask: %s" : "%s Linestate: %s";
-        char ls_buffer[512];
-  	guint8 ls = tvb_get_guint8(tvb, offset+1);
-        int print_count = 0;
-        int idx;
-        ls_buffer[0] = '\0';
-        for (idx = 0; idx < 8; idx++) {
-            int bit = ls & 1;
-            if (bit) {
-                if (print_count != 0) {
-                    g_strlcat(ls_buffer,", ",512);
-                }
-                g_strlcat(ls_buffer,linestate_bits[idx], 512);
-                print_count++;
-            }
-            ls = ls >> 1;
+      const char *print_pattern = (cmd == TNCOMPORT_SETLINESTATEMASK) ?
+        "%s Set Linestate Mask: %s" : "%s Linestate: %s";
+      char ls_buffer[512];
+      guint8 ls = tvb_get_guint8(tvb, offset+1);
+      int print_count = 0;
+      int idx;
+      ls_buffer[0] = '\0';
+      for (idx = 0; idx < 8; idx++) {
+        int bit = ls & 1;
+        if (bit) {
+          if (print_count != 0) {
+            g_strlcat(ls_buffer,", ",512);
+          }
+          g_strlcat(ls_buffer,linestate_bits[idx], 512);
+          print_count++;
         }
-        proto_tree_add_text(tree, tvb, offset, 2, print_pattern, source, ls_buffer);
+        ls = ls >> 1;
+      }
+      proto_tree_add_text(tree, tvb, offset, 2, print_pattern, source, ls_buffer);
     } else {
-        const char *print_pattern = (cmd == TNCOMPORT_SETLINESTATEMASK) ?
-                                        "%s <Invalid Linestate Mask>" : "%s <Invalid Linestate Packet>";
-        proto_tree_add_text(tree, tvb, offset, 1 + len, print_pattern, source);
+      const char *print_pattern = (cmd == TNCOMPORT_SETLINESTATEMASK) ?
+        "%s <Invalid Linestate Mask>" : "%s <Invalid Linestate Packet>";
+      proto_tree_add_text(tree, tvb, offset, 1 + len, print_pattern, source);
     }
     break;
 
@@ -763,29 +766,29 @@ dissect_comport_subopt(packet_info *pinfo _U_, const char *optname, tvbuff_t *tv
   case TNCOMPORT_NOTIFYMODEMSTATE:
     len--;
     if (len >= 1) {
-        const char *print_pattern = (cmd == TNCOMPORT_SETMODEMSTATEMASK) ?
-                                        "%s Set Modemstate Mask: %s" : "%s Modemstate: %s";
-        char ms_buffer[256];
-  	    guint8 ms = tvb_get_guint8(tvb, offset+1);
-        int print_count = 0;
-        int idx;
-        ms_buffer[0] = '\0';
-        for (idx = 0; idx < 8; idx++) {
-            int bit = ms & 1;
-            if (bit) {
-                if (print_count != 0) {
-                    g_strlcat(ms_buffer,", ",256);
-                }
-                g_strlcat(ms_buffer,modemstate_bits[idx],256);
-                print_count++;
-            }
-            ms = ms >> 1;
+      const char *print_pattern = (cmd == TNCOMPORT_SETMODEMSTATEMASK) ?
+        "%s Set Modemstate Mask: %s" : "%s Modemstate: %s";
+      char ms_buffer[256];
+      guint8 ms = tvb_get_guint8(tvb, offset+1);
+      int print_count = 0;
+      int idx;
+      ms_buffer[0] = '\0';
+      for (idx = 0; idx < 8; idx++) {
+        int bit = ms & 1;
+        if (bit) {
+          if (print_count != 0) {
+            g_strlcat(ms_buffer,", ",256);
+          }
+          g_strlcat(ms_buffer,modemstate_bits[idx],256);
+          print_count++;
         }
-        proto_tree_add_text(tree, tvb, offset, 2, print_pattern, source, ms_buffer);
+        ms = ms >> 1;
+      }
+      proto_tree_add_text(tree, tvb, offset, 2, print_pattern, source, ms_buffer);
     } else {
-        const char *print_pattern = (cmd == TNCOMPORT_SETMODEMSTATEMASK) ?
-                                         "%s <Invalid Modemstate Mask>" : "%s <Invalid Modemstate Packet>";
-        proto_tree_add_text(tree, tvb, offset, 1 + len, print_pattern, source);
+      const char *print_pattern = (cmd == TNCOMPORT_SETMODEMSTATEMASK) ?
+        "%s <Invalid Modemstate Mask>" : "%s <Invalid Modemstate Packet>";
+      proto_tree_add_text(tree, tvb, offset, 1 + len, print_pattern, source);
     }
     break;
 
@@ -802,11 +805,11 @@ dissect_comport_subopt(packet_info *pinfo _U_, const char *optname, tvbuff_t *tv
   case TNCOMPORT_PURGEDATA:
     len--;
     if (len >= 1) {
-  	    guint8 purge = tvb_get_guint8(tvb, offset+1);
-        const char *p = (purge > 3) ? "<Purge invalid>" : purges[purge];
-        proto_tree_add_text(tree, tvb, offset, 2, "%s %s",source,p);
+      guint8 purge = tvb_get_guint8(tvb, offset+1);
+      const char *p = (purge > 3) ? "<Purge invalid>" : purges[purge];
+      proto_tree_add_text(tree, tvb, offset, 2, "%s %s",source,p);
     } else {
-        proto_tree_add_text(tree, tvb, offset, 1 + len, "%s <Invalid Purge Packet>",source);
+      proto_tree_add_text(tree, tvb, offset, 1 + len, "%s <Invalid Purge Packet>",source);
     }
     break;
 
@@ -823,11 +826,11 @@ dissect_comport_subopt(packet_info *pinfo _U_, const char *optname, tvbuff_t *tv
 }
 
 static const value_string rfc_opt_vals[] = {
-	{ 0, "OFF" },
-	{ 1, "ON" },
-	{ 2, "RESTART-ANY" },
-	{ 3, "RESTART-XON" },
-	{ 0, NULL }
+  { 0, "OFF" },
+  { 1, "ON" },
+  { 2, "RESTART-ANY" },
+  { 3, "RESTART-XON" },
+  { 0, NULL }
 };
 
 static void
@@ -841,185 +844,185 @@ dissect_rfc_subopt(packet_info *pinfo _U_, const char *optname _U_, tvbuff_t *tv
                       val_to_str(cmd, rfc_opt_vals, "Unknown (%u)"));
 }
 
-#define TN_ENC_IS		0
-#define TN_ENC_SUPPORT		1
-#define TN_ENC_REPLY		2
-#define TN_ENC_START		3
-#define TN_ENC_END		4
-#define TN_ENC_REQUEST_START	5
-#define TN_ENC_REQUEST_END	6
-#define TN_ENC_ENC_KEYID	7
-#define TN_ENC_DEC_KEYID	8
+#define TN_ENC_IS               0
+#define TN_ENC_SUPPORT          1
+#define TN_ENC_REPLY            2
+#define TN_ENC_START            3
+#define TN_ENC_END              4
+#define TN_ENC_REQUEST_START    5
+#define TN_ENC_REQUEST_END      6
+#define TN_ENC_ENC_KEYID        7
+#define TN_ENC_DEC_KEYID        8
 static const value_string enc_cmd_vals[] = {
-	{ TN_ENC_IS,		"IS" },
-	{ TN_ENC_SUPPORT,	"SUPPORT" },
-	{ TN_ENC_REPLY,		"REPLY" },
-	{ TN_ENC_START,		"START" },
-	{ TN_ENC_END,		"END" },
-	{ TN_ENC_REQUEST_START,	"REQUEST-START" },
-	{ TN_ENC_REQUEST_END,	"REQUEST-END" },
-	{ TN_ENC_ENC_KEYID,	"ENC_KEYID" },
-	{ TN_ENC_DEC_KEYID,	"DEC_KEYID" },
-	{ 0, NULL }
+  { TN_ENC_IS,            "IS" },
+  { TN_ENC_SUPPORT,       "SUPPORT" },
+  { TN_ENC_REPLY,         "REPLY" },
+  { TN_ENC_START,         "START" },
+  { TN_ENC_END,           "END" },
+  { TN_ENC_REQUEST_START, "REQUEST-START" },
+  { TN_ENC_REQUEST_END,   "REQUEST-END" },
+  { TN_ENC_ENC_KEYID,     "ENC_KEYID" },
+  { TN_ENC_DEC_KEYID,     "DEC_KEYID" },
+  { 0, NULL }
 };
 
-#define TN_ENCTYPE_NULL			0
-#define TN_ENCTYPE_DES_CFB64		1
-#define TN_ENCTYPE_DES_OFB64		2
-#define TN_ENCTYPE_DES3_CFB64		3
-#define TN_ENCTYPE_DES3_OFB64		4
-#define TN_ENCTYPE_CAST5_40_CFB64	8
-#define TN_ENCTYPE_CAST5_40_OFB64	9
-#define TN_ENCTYPE_CAST128_CFB64	10
-#define TN_ENCTYPE_CAST128_OFB64	11
+#define TN_ENCTYPE_NULL                 0
+#define TN_ENCTYPE_DES_CFB64            1
+#define TN_ENCTYPE_DES_OFB64            2
+#define TN_ENCTYPE_DES3_CFB64           3
+#define TN_ENCTYPE_DES3_OFB64           4
+#define TN_ENCTYPE_CAST5_40_CFB64       8
+#define TN_ENCTYPE_CAST5_40_OFB64       9
+#define TN_ENCTYPE_CAST128_CFB64        10
+#define TN_ENCTYPE_CAST128_OFB64        11
 static const value_string enc_type_vals[] = {
-    { TN_ENCTYPE_NULL,			"NULL" },
-    { TN_ENCTYPE_DES_CFB64,		"DES_CFB64" },
-    { TN_ENCTYPE_DES_OFB64,		"DES_OFB64" },
-    { TN_ENCTYPE_DES3_CFB64,		"DES3_CFB64" },
-    { TN_ENCTYPE_DES3_OFB64,		"DES3_OFB64" },
-    { TN_ENCTYPE_CAST5_40_CFB64,	"CAST5_40_CFB64" },
-    { TN_ENCTYPE_CAST5_40_OFB64,	"CAST5_40_OFB64" },
-    { TN_ENCTYPE_CAST128_CFB64,		"CAST128_CFB64" },
-    { TN_ENCTYPE_CAST128_OFB64,		"CAST128_OFB64" },
-    { 0, NULL }
+  { TN_ENCTYPE_NULL,                  "NULL" },
+  { TN_ENCTYPE_DES_CFB64,             "DES_CFB64" },
+  { TN_ENCTYPE_DES_OFB64,             "DES_OFB64" },
+  { TN_ENCTYPE_DES3_CFB64,            "DES3_CFB64" },
+  { TN_ENCTYPE_DES3_OFB64,            "DES3_OFB64" },
+  { TN_ENCTYPE_CAST5_40_CFB64,        "CAST5_40_CFB64" },
+  { TN_ENCTYPE_CAST5_40_OFB64,        "CAST5_40_OFB64" },
+  { TN_ENCTYPE_CAST128_CFB64,         "CAST128_CFB64" },
+  { TN_ENCTYPE_CAST128_OFB64,         "CAST128_OFB64" },
+  { 0, NULL }
 };
 
 
-#define TN_AC_IS	0
-#define TN_AC_SEND	1
-#define TN_AC_REPLY	2
-#define TN_AC_NAME	3
+#define TN_AC_IS        0
+#define TN_AC_SEND      1
+#define TN_AC_REPLY     2
+#define TN_AC_NAME      3
 static const value_string auth_cmd_vals[] = {
-	{ TN_AC_IS,	"IS" },
-	{ TN_AC_SEND,	"SEND" },
-	{ TN_AC_REPLY,	"REPLY" },
-	{ TN_AC_NAME,	"NAME" },
-	{ 0, NULL }
+  { TN_AC_IS,     "IS" },
+  { TN_AC_SEND,   "SEND" },
+  { TN_AC_REPLY,  "REPLY" },
+  { TN_AC_NAME,   "NAME" },
+  { 0, NULL }
 };
 
-#define TN_AT_NULL	0
-#define TN_AT_KRB4	1
-#define TN_AT_KRB5	2
-#define TN_AT_SPX	3
-#define TN_AT_MINK	4
-#define TN_AT_SRP	5
-#define TN_AT_RSA	6
-#define TN_AT_SSL	7
-#define TN_AT_LOKI	10
-#define TN_AT_SSA	11
-#define TN_AT_KEA_SJ	12
-#define TN_AT_KEA_SJ_INTEG	13
-#define TN_AT_DSS	14
-#define TN_AT_NTLM	15
+#define TN_AT_NULL           0
+#define TN_AT_KRB4           1
+#define TN_AT_KRB5           2
+#define TN_AT_SPX            3
+#define TN_AT_MINK           4
+#define TN_AT_SRP            5
+#define TN_AT_RSA            6
+#define TN_AT_SSL            7
+#define TN_AT_LOKI          10
+#define TN_AT_SSA           11
+#define TN_AT_KEA_SJ        12
+#define TN_AT_KEA_SJ_INTEG  13
+#define TN_AT_DSS           14
+#define TN_AT_NTLM          15
 static const value_string auth_type_vals[] = {
-	{ TN_AT_NULL,	"NULL" },
-	{ TN_AT_KRB4,	"Kerberos v4" },
-	{ TN_AT_KRB5,	"Kerberos v5" },
-	{ TN_AT_SPX,	"SPX" },
-	{ TN_AT_MINK,	"MINK" },
-	{ TN_AT_SRP,	"SRP" },
-	{ TN_AT_RSA,	"RSA" },
-	{ TN_AT_SSL,	"SSL" },
-	{ TN_AT_LOKI,	"LOKI" },
-	{ TN_AT_SSA,	"SSA" },
-	{ TN_AT_KEA_SJ,	"KEA_SJ" },
-	{ TN_AT_KEA_SJ_INTEG, "KEA_SJ_INTEG" },
-	{ TN_AT_DSS,	"DSS" },
-	{ TN_AT_NTLM,	"NTLM" },
-	{ 0, NULL }
+  { TN_AT_NULL,         "NULL" },
+  { TN_AT_KRB4,         "Kerberos v4" },
+  { TN_AT_KRB5,         "Kerberos v5" },
+  { TN_AT_SPX,          "SPX" },
+  { TN_AT_MINK,         "MINK" },
+  { TN_AT_SRP,          "SRP" },
+  { TN_AT_RSA,          "RSA" },
+  { TN_AT_SSL,          "SSL" },
+  { TN_AT_LOKI,         "LOKI" },
+  { TN_AT_SSA,          "SSA" },
+  { TN_AT_KEA_SJ,       "KEA_SJ" },
+  { TN_AT_KEA_SJ_INTEG, "KEA_SJ_INTEG" },
+  { TN_AT_DSS,          "DSS" },
+  { TN_AT_NTLM,         "NTLM" },
+  { 0, NULL }
 };
 static const true_false_string auth_mod_cred_fwd = {
-	"Client WILL forward auth creds",
-	"Client will NOT forward auth creds"
+  "Client WILL forward auth creds",
+  "Client will NOT forward auth creds"
 };
 static const true_false_string auth_mod_who = {
-	"Mask server to client",
-	"Mask client to server"
+  "Mask server to client",
+  "Mask client to server"
 };
 static const true_false_string auth_mod_how = {
-	"MUTUAL authentication",
-	"One Way authentication"
+  "MUTUAL authentication",
+  "One Way authentication"
 };
-#define TN_AM_OFF		0x00
-#define TN_AM_USING_TELOPT	0x01
-#define TN_AM_AFTER_EXCHANGE	0x02
-#define TN_AM_RESERVED		0x04
+#define TN_AM_OFF               0x00
+#define TN_AM_USING_TELOPT      0x01
+#define TN_AM_AFTER_EXCHANGE    0x02
+#define TN_AM_RESERVED          0x04
 static const value_string auth_mod_enc[] = {
-	{ TN_AM_OFF,		"Off" },
-	{ TN_AM_USING_TELOPT,	"Telnet Options" },
-	{ TN_AM_AFTER_EXCHANGE, "After Exchange" },
-	{ TN_AM_RESERVED,	"Reserved" },
-	{ 0, NULL }
+  { TN_AM_OFF,            "Off" },
+  { TN_AM_USING_TELOPT,   "Telnet Options" },
+  { TN_AM_AFTER_EXCHANGE, "After Exchange" },
+  { TN_AM_RESERVED,       "Reserved" },
+  { 0, NULL }
 };
-#define TN_KRB5_TYPE_AUTH		0
-#define TN_KRB5_TYPE_REJECT		1
-#define TN_KRB5_TYPE_ACCEPT		2
-#define TN_KRB5_TYPE_RESPONSE		3
-#define TN_KRB5_TYPE_FORWARD		4
-#define TN_KRB5_TYPE_FORWARD_ACCEPT	5
-#define TN_KRB5_TYPE_FORWARD_REJECT	6
+#define TN_KRB5_TYPE_AUTH               0
+#define TN_KRB5_TYPE_REJECT             1
+#define TN_KRB5_TYPE_ACCEPT             2
+#define TN_KRB5_TYPE_RESPONSE           3
+#define TN_KRB5_TYPE_FORWARD            4
+#define TN_KRB5_TYPE_FORWARD_ACCEPT     5
+#define TN_KRB5_TYPE_FORWARD_REJECT     6
 static const value_string auth_krb5_types[] = {
-	{ TN_KRB5_TYPE_AUTH,		"Auth" },
-	{ TN_KRB5_TYPE_REJECT,		"Reject" },
-	{ TN_KRB5_TYPE_ACCEPT,		"Accept" },
-	{ TN_KRB5_TYPE_RESPONSE,	"Response" },
-	{ TN_KRB5_TYPE_FORWARD,		"Forward" },
-	{ TN_KRB5_TYPE_FORWARD_ACCEPT,	"Forward Accept" },
-	{ TN_KRB5_TYPE_FORWARD_REJECT,	"Forward Reject" },
-	{ 0, NULL }
+  { TN_KRB5_TYPE_AUTH,            "Auth" },
+  { TN_KRB5_TYPE_REJECT,          "Reject" },
+  { TN_KRB5_TYPE_ACCEPT,          "Accept" },
+  { TN_KRB5_TYPE_RESPONSE,        "Response" },
+  { TN_KRB5_TYPE_FORWARD,         "Forward" },
+  { TN_KRB5_TYPE_FORWARD_ACCEPT,  "Forward Accept" },
+  { TN_KRB5_TYPE_FORWARD_REJECT,  "Forward Reject" },
+  { 0, NULL }
 };
 static void
 dissect_authentication_type_pair(packet_info *pinfo _U_, tvbuff_t *tvb, int offset, proto_tree *tree)
 {
-	guint8 type, mod;
+  guint8 type, mod;
 
-	type=tvb_get_guint8(tvb, offset);
-	proto_tree_add_uint(tree, hf_telnet_auth_type, tvb, offset, 1, type);
+  type=tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(tree, hf_telnet_auth_type, tvb, offset, 1, type);
 
-	mod=tvb_get_guint8(tvb, offset+1);
-	proto_tree_add_uint(tree, hf_telnet_auth_mod_enc, tvb, offset+1, 1, mod);
-	proto_tree_add_boolean(tree, hf_telnet_auth_mod_cred_fwd, tvb, offset+1, 1, mod);
-	proto_tree_add_boolean(tree, hf_telnet_auth_mod_how, tvb, offset+1, 1, mod);
-	proto_tree_add_boolean(tree, hf_telnet_auth_mod_who, tvb, offset+1, 1, mod);
+  mod=tvb_get_guint8(tvb, offset+1);
+  proto_tree_add_uint(tree, hf_telnet_auth_mod_enc, tvb, offset+1, 1, mod);
+  proto_tree_add_boolean(tree, hf_telnet_auth_mod_cred_fwd, tvb, offset+1, 1, mod);
+  proto_tree_add_boolean(tree, hf_telnet_auth_mod_how, tvb, offset+1, 1, mod);
+  proto_tree_add_boolean(tree, hf_telnet_auth_mod_who, tvb, offset+1, 1, mod);
 }
 
 /* no kerberos blobs are ever >10kb ? (arbitrary limit) */
-#define MAX_KRB5_BLOB_LEN	10240
+#define MAX_KRB5_BLOB_LEN 10240
 
 static tvbuff_t *
 unescape_and_tvbuffify_telnet_option(packet_info *pinfo, tvbuff_t *tvb, int offset, int len)
 {
-	tvbuff_t *krb5_tvb;
-	guint8 *buf;
-	const guint8 *spos;
-	guint8 *dpos;
-	int skip, l;
-
-	if(len>=MAX_KRB5_BLOB_LEN)
-		return NULL;
-
-	spos=tvb_get_ptr(tvb, offset, len);
-	buf=g_malloc(len);
-	dpos=buf;
-	skip=0;
-	l=len;
-	while(l>0){
-		if((spos[0]==0xff) && (spos[1]==0xff)){
-			skip++;
-			l-=2;
-			*(dpos++)=0xff;
-			spos+=2;
-			continue;
-		}
-		*(dpos++)=*(spos++);
-		l--;
-	}
-	krb5_tvb = tvb_new_child_real_data(tvb, buf, len-skip, len-skip);
-	tvb_set_free_cb(krb5_tvb, g_free);
-	add_new_data_source(pinfo, krb5_tvb, "Unpacked Telnet Option");
-
-	return krb5_tvb;
+  tvbuff_t     *krb5_tvb;
+  guint8       *buf;
+  const guint8 *spos;
+  guint8       *dpos;
+  int           skip, l;
+
+  if(len>=MAX_KRB5_BLOB_LEN)
+    return NULL;
+
+  spos=tvb_get_ptr(tvb, offset, len);
+  buf=g_malloc(len);
+  dpos=buf;
+  skip=0;
+  l=len;
+  while(l>0){
+    if((spos[0]==0xff) && (spos[1]==0xff)){
+      skip++;
+      l-=2;
+      *(dpos++)=0xff;
+      spos+=2;
+      continue;
+    }
+    *(dpos++)=*(spos++);
+    l--;
+  }
+  krb5_tvb = tvb_new_child_real_data(tvb, buf, len-skip, len-skip);
+  tvb_set_free_cb(krb5_tvb, g_free);
+  add_new_data_source(pinfo, krb5_tvb, "Unpacked Telnet Option");
+
+  return krb5_tvb;
 }
 
 
@@ -1027,490 +1030,490 @@ unescape_and_tvbuffify_telnet_option(packet_info *pinfo, tvbuff_t *tvb, int offs
 static void
 dissect_krb5_authentication_data(packet_info *pinfo, tvbuff_t *tvb, int offset, int len, proto_tree *tree, guint8 acmd)
 {
-	tvbuff_t *krb5_tvb;
-	guint8 krb5_cmd;
-
-	dissect_authentication_type_pair(pinfo, tvb, offset, tree);
-	offset+=2;
-	len-=2;
+  tvbuff_t *krb5_tvb;
+  guint8    krb5_cmd;
 
+  dissect_authentication_type_pair(pinfo, tvb, offset, tree);
+  offset+=2;
+  len-=2;
 
-	krb5_cmd=tvb_get_guint8(tvb, offset);
-	proto_tree_add_uint(tree, hf_telnet_auth_krb5_type, tvb, offset, 1, krb5_cmd);
-	offset++;
-	len--;
 
-
-	/* IAC SB AUTHENTICATION IS <authentication-type-pair> AUTH <Kerberos V5 KRB_AP_REQ message> IAC SE */
-	if((acmd==TN_AC_IS)&&(krb5_cmd==TN_KRB5_TYPE_AUTH)){
-		if(len){
-			krb5_tvb=unescape_and_tvbuffify_telnet_option(pinfo, tvb, offset, len);
-			if(krb5_tvb)
-				dissect_kerberos_main(krb5_tvb, pinfo, tree, FALSE, NULL);
-			else
-				proto_tree_add_text(tree, tvb, offset, len, "Kerberos blob (too long to dissect - length %u > %u",
-				    len, MAX_KRB5_BLOB_LEN);
-		}
-	}
+  krb5_cmd=tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(tree, hf_telnet_auth_krb5_type, tvb, offset, 1, krb5_cmd);
+  offset++;
+  len--;
+
+
+  /* IAC SB AUTHENTICATION IS <authentication-type-pair> AUTH <Kerberos V5 KRB_AP_REQ message> IAC SE */
+  if((acmd==TN_AC_IS)&&(krb5_cmd==TN_KRB5_TYPE_AUTH)){
+    if(len){
+      krb5_tvb=unescape_and_tvbuffify_telnet_option(pinfo, tvb, offset, len);
+      if(krb5_tvb)
+        dissect_kerberos_main(krb5_tvb, pinfo, tree, FALSE, NULL);
+      else
+        proto_tree_add_text(tree, tvb, offset, len, "Kerberos blob (too long to dissect - length %u > %u",
+                            len, MAX_KRB5_BLOB_LEN);
+    }
+  }
 
 
 
-	/* IAC SB AUTHENTICATION REPLY <authentication-type-pair> ACCEPT IAC SE */
-	/* nothing more to dissect */
+  /* IAC SB AUTHENTICATION REPLY <authentication-type-pair> ACCEPT IAC SE */
+  /* nothing more to dissect */
 
 
 
-	/* IAC SB AUTHENTICATION REPLY <authentication-type-pair> REJECT <optional reason for rejection> IAC SE*/
+  /* IAC SB AUTHENTICATION REPLY <authentication-type-pair> REJECT <optional reason for rejection> IAC SE*/
 /*qqq*/
 
 
-	/* IAC SB AUTHENTICATION REPLY <authentication-type-pair> RESPONSE <KRB_AP_REP message> IAC SE */
-	if((acmd==TN_AC_REPLY)&&(krb5_cmd==TN_KRB5_TYPE_RESPONSE)){
-		if(len){
-			krb5_tvb=unescape_and_tvbuffify_telnet_option(pinfo, tvb, offset, len);
-			dissect_kerberos_main(krb5_tvb, pinfo, tree, FALSE, NULL);
-		}
-	}
+  /* IAC SB AUTHENTICATION REPLY <authentication-type-pair> RESPONSE <KRB_AP_REP message> IAC SE */
+  if((acmd==TN_AC_REPLY)&&(krb5_cmd==TN_KRB5_TYPE_RESPONSE)){
+    if(len){
+      krb5_tvb=unescape_and_tvbuffify_telnet_option(pinfo, tvb, offset, len);
+      dissect_kerberos_main(krb5_tvb, pinfo, tree, FALSE, NULL);
+    }
+  }
 
 
-	/* IAC SB AUTHENTICATION <authentication-type-pair> FORWARD <KRB_CRED message> IAC SE */
-	/* XXX unclear what this one looks like */
+  /* IAC SB AUTHENTICATION <authentication-type-pair> FORWARD <KRB_CRED message> IAC SE */
+  /* XXX unclear what this one looks like */
 
 
-	/* IAC SB AUTHENTICATION <authentication-type-pair> FORWARD_ACCEPT IAC SE */
-	/* nothing more to dissect */
+  /* IAC SB AUTHENTICATION <authentication-type-pair> FORWARD_ACCEPT IAC SE */
+  /* nothing more to dissect */
 
 
 
-	/* IAC SB AUTHENTICATION <authentication-type-pair> FORWARD_REJECT */
-	/* nothing more to dissect */
+  /* IAC SB AUTHENTICATION <authentication-type-pair> FORWARD_REJECT */
+  /* nothing more to dissect */
 }
 
 static void
 dissect_authentication_subopt(packet_info *pinfo, const char *optname _U_, tvbuff_t *tvb, int offset, int len, proto_tree *tree)
 {
-	guint8 acmd;
-	char *name;
+  guint8  acmd;
+  char   *name;
 
 /* XXX here we should really split it up in a conversation struct keeping
-       track of what method we actually use and not just assume it is always
-       kerberos v5
+   track of what method we actually use and not just assume it is always
+   kerberos v5
 */
-	acmd=tvb_get_guint8(tvb, offset);
-	proto_tree_add_uint(tree, hf_telnet_auth_cmd, tvb, offset, 1, acmd);
-	offset++;
-	len--;
-
-	switch(acmd){
-	case TN_AC_REPLY:
-	case TN_AC_IS:
-		/* XXX here we shouldnt just assume it is krb5 */
-		dissect_krb5_authentication_data(pinfo, tvb, offset, len, tree, acmd);
-		break;
-	case TN_AC_SEND:
-		while(len>0){
-			dissect_authentication_type_pair(pinfo, tvb, offset, tree);
-			offset+=2;
-			len-=2;
-		}
-		break;
-	case TN_AC_NAME:
-		if(len<255){
-			name=ep_alloc(256);
-			tvb_memcpy(tvb, (guint8*)name, offset, len);
-			name[len]=0;
-		} else {
-			name="<...name too long...>";
-		}
-		proto_tree_add_string(tree, hf_telnet_auth_name, tvb, offset, len, name);
-		break;
-	}
+  acmd=tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(tree, hf_telnet_auth_cmd, tvb, offset, 1, acmd);
+  offset++;
+  len--;
+
+  switch(acmd){
+  case TN_AC_REPLY:
+  case TN_AC_IS:
+    /* XXX here we shouldnt just assume it is krb5 */
+    dissect_krb5_authentication_data(pinfo, tvb, offset, len, tree, acmd);
+    break;
+  case TN_AC_SEND:
+    while(len>0){
+      dissect_authentication_type_pair(pinfo, tvb, offset, tree);
+      offset+=2;
+      len-=2;
+    }
+    break;
+  case TN_AC_NAME:
+    if(len<255){
+      name=ep_alloc(256);
+      tvb_memcpy(tvb, (guint8*)name, offset, len);
+      name[len]=0;
+    } else {
+      name="<...name too long...>";
+    }
+    proto_tree_add_string(tree, hf_telnet_auth_name, tvb, offset, len, name);
+    break;
+  }
 }
 
 /* This function only uses the octet in the buffer at 'offset' */
 static void dissect_encryption_type(tvbuff_t *tvb, int offset, proto_tree *tree) {
-	guint8 etype;
-	etype = tvb_get_guint8(tvb, offset);
-	proto_tree_add_uint(tree, hf_telnet_enc_type, tvb, offset, 1, etype);
+  guint8 etype;
+  etype = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(tree, hf_telnet_enc_type, tvb, offset, 1, etype);
 }
 
 static void
 dissect_encryption_subopt(packet_info *pinfo _U_, const char *optname _U_, tvbuff_t *tvb, int offset, int len, proto_tree *tree)
 {
-	guint8 ecmd, key_first_octet;
-
-	ecmd = tvb_get_guint8(tvb, offset);
-	proto_tree_add_uint(tree, hf_telnet_enc_cmd, tvb, offset, 1, ecmd);
-
-	offset++;
-	len--;
-
-	switch(ecmd) {
-	case TN_ENC_IS:
-	case TN_ENC_REPLY:
-		/* encryption type, type-specific data ... */
-		if (len > 0) {
-			dissect_encryption_type(tvb, offset, tree);
-			offset++;
-			len--;
-			proto_tree_add_text(tree, tvb, offset, len, "Type-specific data");
-		}
-		break;
-
-	case TN_ENC_SUPPORT:
-		/* list of encryption types ... */
-		while (len > 0) {
-			dissect_encryption_type(tvb, offset, tree);
-			offset++;
-			len--;
-		}
-		break;
-
-	case TN_ENC_START:
-		/* keyid ... */
-		if (len > 0) {
-			key_first_octet = tvb_get_guint8(tvb, offset);
-			proto_tree_add_text(tree, tvb, offset, len, (key_first_octet == 0) ? "Default key" : "Key ID");
-		}
-		break;
-
-	case TN_ENC_END:
-		/* no data */
-		break;
-
-	case TN_ENC_REQUEST_START:
-		/* (optional) keyid */
-		if (len > 0)
-			proto_tree_add_text(tree, tvb, offset, len, "Key ID (advisory)");
-		break;
-
-	case TN_ENC_REQUEST_END:
-		/* no data */
-		break;
-
-	case TN_ENC_ENC_KEYID:
-	case TN_ENC_DEC_KEYID:
-		/* (optional) keyid - if not supplied, there are no more known keys */
-		if (len > 0)
-			proto_tree_add_text(tree, tvb, offset, len, "Key ID");
-		break;
-
-	default:
-		proto_tree_add_text(tree, tvb, offset, len, "Unknown command");
-	}
+  guint8 ecmd, key_first_octet;
+
+  ecmd = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(tree, hf_telnet_enc_cmd, tvb, offset, 1, ecmd);
+
+  offset++;
+  len--;
+
+  switch(ecmd) {
+  case TN_ENC_IS:
+  case TN_ENC_REPLY:
+    /* encryption type, type-specific data ... */
+    if (len > 0) {
+      dissect_encryption_type(tvb, offset, tree);
+      offset++;
+      len--;
+      proto_tree_add_text(tree, tvb, offset, len, "Type-specific data");
+    }
+    break;
+
+  case TN_ENC_SUPPORT:
+    /* list of encryption types ... */
+    while (len > 0) {
+      dissect_encryption_type(tvb, offset, tree);
+      offset++;
+      len--;
+    }
+    break;
+
+  case TN_ENC_START:
+    /* keyid ... */
+    if (len > 0) {
+      key_first_octet = tvb_get_guint8(tvb, offset);
+      proto_tree_add_text(tree, tvb, offset, len, (key_first_octet == 0) ? "Default key" : "Key ID");
+    }
+    break;
+
+  case TN_ENC_END:
+    /* no data */
+    break;
+
+  case TN_ENC_REQUEST_START:
+    /* (optional) keyid */
+    if (len > 0)
+      proto_tree_add_text(tree, tvb, offset, len, "Key ID (advisory)");
+    break;
+
+  case TN_ENC_REQUEST_END:
+    /* no data */
+    break;
+
+  case TN_ENC_ENC_KEYID:
+  case TN_ENC_DEC_KEYID:
+    /* (optional) keyid - if not supplied, there are no more known keys */
+    if (len > 0)
+      proto_tree_add_text(tree, tvb, offset, len, "Key ID");
+    break;
+
+  default:
+    proto_tree_add_text(tree, tvb, offset, len, "Unknown command");
+  }
 }
 
 static tn_opt options[] = {
   {
-    "Binary Transmission",			/* RFC 856 */
-    NULL,					/* no suboption negotiation */
+    "Binary Transmission",                      /* RFC 856 */
+    NULL,                                       /* no suboption negotiation */
     NO_LENGTH,
     0,
     NULL
   },
   {
-    "Echo",					/* RFC 857 */
-    NULL,					/* no suboption negotiation */
+    "Echo",                                     /* RFC 857 */
+    NULL,                                       /* no suboption negotiation */
     NO_LENGTH,
     0,
     NULL
   },
   {
-    "Reconnection",				/* DOD Protocol Handbook */
+    "Reconnection",                             /* DOD Protocol Handbook */
     NULL,
     NO_LENGTH,
     0,
     NULL
   },
   {
-    "Suppress Go Ahead",			/* RFC 858 */
-    NULL,					/* no suboption negotiation */
+    "Suppress Go Ahead",                        /* RFC 858 */
+    NULL,                                       /* no suboption negotiation */
     NO_LENGTH,
     0,
     NULL
   },
   {
-    "Approx Message Size Negotiation",		/* Ethernet spec(!) */
+    "Approx Message Size Negotiation",          /* Ethernet spec(!) */
     NULL,
     NO_LENGTH,
     0,
     NULL
   },
   {
-    "Status",					/* RFC 859 */
+    "Status",                                   /* RFC 859 */
     &ett_status_subopt,
     VARIABLE_LENGTH,
     1,
-    NULL					/* XXX - fill me in */
+    NULL                                        /* XXX - fill me in */
   },
   {
-    "Timing Mark",				/* RFC 860 */
-    NULL,					/* no suboption negotiation */
+    "Timing Mark",                              /* RFC 860 */
+    NULL,                                       /* no suboption negotiation */
     NO_LENGTH,
     0,
     NULL
   },
   {
-    "Remote Controlled Trans and Echo",		/* RFC 726 */
+    "Remote Controlled Trans and Echo",         /* RFC 726 */
     &ett_rcte_subopt,
     VARIABLE_LENGTH,
     1,
-    NULL					/* XXX - fill me in */
+    NULL                                        /* XXX - fill me in */
   },
   {
-    "Output Line Width",			/* DOD Protocol Handbook */
+    "Output Line Width",                        /* DOD Protocol Handbook */
     &ett_olw_subopt,
-    VARIABLE_LENGTH,				/* XXX - fill me in */
-    0,						/* XXX - fill me in */
-    NULL					/* XXX - fill me in */
+    VARIABLE_LENGTH,                            /* XXX - fill me in */
+    0,                                          /* XXX - fill me in */
+    NULL                                        /* XXX - fill me in */
   },
   {
-    "Output Page Size",				/* DOD Protocol Handbook */
+    "Output Page Size",                         /* DOD Protocol Handbook */
     &ett_ops_subopt,
-    VARIABLE_LENGTH,				/* XXX - fill me in */
-    0,						/* XXX - fill me in */
-    NULL					/* XXX - fill me in */
+    VARIABLE_LENGTH,                            /* XXX - fill me in */
+    0,                                          /* XXX - fill me in */
+    NULL                                        /* XXX - fill me in */
   },
   {
-    "Output Carriage-Return Disposition",	/* RFC 652 */
+    "Output Carriage-Return Disposition",       /* RFC 652 */
     &ett_crdisp_subopt,
     FIXED_LENGTH,
     2,
-    NULL					/* XXX - fill me in */
+    NULL                                        /* XXX - fill me in */
   },
   {
-    "Output Horizontal Tab Stops",		/* RFC 653 */
+    "Output Horizontal Tab Stops",              /* RFC 653 */
     &ett_htstops_subopt,
     VARIABLE_LENGTH,
     1,
     dissect_htstops_subopt
   },
   {
-    "Output Horizontal Tab Disposition",	/* RFC 654 */
+    "Output Horizontal Tab Disposition",        /* RFC 654 */
     &ett_htdisp_subopt,
     FIXED_LENGTH,
     2,
-    NULL					/* XXX - fill me in */
+    NULL                                        /* XXX - fill me in */
   },
   {
-    "Output Formfeed Disposition",		/* RFC 655 */
+    "Output Formfeed Disposition",              /* RFC 655 */
     &ett_ffdisp_subopt,
     FIXED_LENGTH,
     2,
-    NULL					/* XXX - fill me in */
+    NULL                                        /* XXX - fill me in */
   },
   {
-    "Output Vertical Tabstops",			/* RFC 656 */
+    "Output Vertical Tabstops",                 /* RFC 656 */
     &ett_vtstops_subopt,
     VARIABLE_LENGTH,
     1,
-    NULL					/* XXX - fill me in */
+    NULL                                        /* XXX - fill me in */
   },
   {
-    "Output Vertical Tab Disposition",		/* RFC 657 */
+    "Output Vertical Tab Disposition",          /* RFC 657 */
     &ett_vtdisp_subopt,
     FIXED_LENGTH,
     2,
-    NULL					/* XXX - fill me in */
+    NULL                                        /* XXX - fill me in */
   },
   {
-    "Output Linefeed Disposition",		/* RFC 658 */
+    "Output Linefeed Disposition",              /* RFC 658 */
     &ett_lfdisp_subopt,
     FIXED_LENGTH,
     2,
-    NULL					/* XXX - fill me in */
+    NULL                                        /* XXX - fill me in */
   },
   {
-    "Extended ASCII",				/* RFC 698 */
+    "Extended ASCII",                           /* RFC 698 */
     &ett_extasc_subopt,
     FIXED_LENGTH,
     2,
-    NULL					/* XXX - fill me in */
+    NULL                                        /* XXX - fill me in */
   },
   {
-    "Logout",					/* RFC 727 */
-    NULL,					/* no suboption negotiation */
+    "Logout",                                   /* RFC 727 */
+    NULL,                                       /* no suboption negotiation */
     NO_LENGTH,
     0,
     NULL
   },
   {
-    "Byte Macro",				/* RFC 735 */
+    "Byte Macro",                               /* RFC 735 */
     &ett_bytemacro_subopt,
     VARIABLE_LENGTH,
     2,
-    NULL					/* XXX - fill me in */
+    NULL                                        /* XXX - fill me in */
   },
   {
-    "Data Entry Terminal",			/* RFC 732, RFC 1043 */
+    "Data Entry Terminal",                      /* RFC 732, RFC 1043 */
     &ett_det_subopt,
     VARIABLE_LENGTH,
     2,
-    NULL					/* XXX - fill me in */
+    NULL                                        /* XXX - fill me in */
   },
   {
-    "SUPDUP",					/* RFC 734, RFC 736 */
-    NULL,					/* no suboption negotiation */
+    "SUPDUP",                                   /* RFC 734, RFC 736 */
+    NULL,                                       /* no suboption negotiation */
     NO_LENGTH,
     0,
     NULL
   },
   {
-    "SUPDUP Output",				/* RFC 749 */
+    "SUPDUP Output",                            /* RFC 749 */
     &ett_supdupout_subopt,
     VARIABLE_LENGTH,
     1,
-    NULL					/* XXX - fill me in */
+    NULL                                        /* XXX - fill me in */
   },
   {
-    "Send Location",				/* RFC 779 */
+    "Send Location",                            /* RFC 779 */
     &ett_sendloc_subopt,
     VARIABLE_LENGTH,
     0,
-    NULL					/* XXX - fill me in */
+    NULL                                        /* XXX - fill me in */
   },
   {
-    "Terminal Type",				/* RFC 1091 */
+    "Terminal Type",                            /* RFC 1091 */
     &ett_termtype_subopt,
     VARIABLE_LENGTH,
     1,
     dissect_string_subopt
   },
   {
-    "End of Record",				/* RFC 885 */
-    NULL,					/* no suboption negotiation */
+    "End of Record",                            /* RFC 885 */
+    NULL,                                       /* no suboption negotiation */
     NO_LENGTH,
     0,
     NULL
   },
   {
-    "TACACS User Identification",		/* RFC 927 */
+    "TACACS User Identification",               /* RFC 927 */
     &ett_tacacsui_subopt,
     FIXED_LENGTH,
     4,
-    NULL					/* XXX - fill me in */
+    NULL                                        /* XXX - fill me in */
   },
   {
-    "Output Marking",				/* RFC 933 */
+    "Output Marking",                           /* RFC 933 */
     &ett_outmark_subopt,
     VARIABLE_LENGTH,
     1,
     dissect_outmark_subopt,
   },
   {
-    "Terminal Location Number",			/* RFC 946 */
+    "Terminal Location Number",                 /* RFC 946 */
     &ett_tlocnum_subopt,
     VARIABLE_LENGTH,
     1,
-    NULL					/* XXX - fill me in */
+    NULL                                        /* XXX - fill me in */
   },
   {
-    "Telnet 3270 Regime",			/* RFC 1041 */
+    "Telnet 3270 Regime",                       /* RFC 1041 */
     &ett_tn3270reg_subopt,
     VARIABLE_LENGTH,
     1,
     dissect_tn3270_regime_subopt
   },
   {
-    "X.3 PAD",					/* RFC 1053 */
+    "X.3 PAD",                                  /* RFC 1053 */
     &ett_x3pad_subopt,
     VARIABLE_LENGTH,
     1,
-    NULL					/* XXX - fill me in */
+    NULL                                        /* XXX - fill me in */
   },
   {
-    "Negotiate About Window Size",		/* RFC 1073, DW183 */
+    "Negotiate About Window Size",              /* RFC 1073, DW183 */
     &ett_naws_subopt,
     FIXED_LENGTH,
     4,
     dissect_naws_subopt
   },
   {
-    "Terminal Speed",				/* RFC 1079 */
+    "Terminal Speed",                           /* RFC 1079 */
     &ett_tspeed_subopt,
     VARIABLE_LENGTH,
     1,
-    NULL					/* XXX - fill me in */
+    NULL                                        /* XXX - fill me in */
   },
   {
-    "Remote Flow Control",			/* RFC 1372 */
+    "Remote Flow Control",                      /* RFC 1372 */
     &ett_rfc_subopt,
     FIXED_LENGTH,
     1,
     dissect_rfc_subopt
   },
   {
-    "Linemode",					/* RFC 1184 */
+    "Linemode",                                 /* RFC 1184 */
     &ett_linemode_subopt,
     VARIABLE_LENGTH,
     1,
-    NULL					/* XXX - fill me in */
+    NULL                                        /* XXX - fill me in */
   },
   {
-    "X Display Location",			/* RFC 1096 */
+    "X Display Location",                       /* RFC 1096 */
     &ett_xdpyloc_subopt,
     VARIABLE_LENGTH,
     1,
     dissect_string_subopt
   },
   {
-    "Environment Option",			/* RFC 1408, RFC 1571 */
+    "Environment Option",                       /* RFC 1408, RFC 1571 */
     &ett_env_subopt,
     VARIABLE_LENGTH,
     1,
-    NULL					/* XXX - fill me in */
+    NULL                                        /* XXX - fill me in */
   },
   {
-    "Authentication Option",			/* RFC 2941 */
+    "Authentication Option",                    /* RFC 2941 */
     &ett_auth_subopt,
     VARIABLE_LENGTH,
     1,
     dissect_authentication_subopt
   },
   {
-    "Encryption Option",			/* RFC 2946 */
+    "Encryption Option",                        /* RFC 2946 */
     &ett_enc_subopt,
     VARIABLE_LENGTH,
     1,
     dissect_encryption_subopt
   },
   {
-    "New Environment Option",			/* RFC 1572 */
+    "New Environment Option",                   /* RFC 1572 */
     &ett_newenv_subopt,
     VARIABLE_LENGTH,
     1,
-    NULL					/* XXX - fill me in */
+    NULL                                        /* XXX - fill me in */
   },
   {
-    "TN3270E",					/* RFC 1647 */
+    "TN3270E",                                  /* RFC 1647 */
     &ett_tn3270e_subopt,
     VARIABLE_LENGTH,
     1,
     dissect_tn3270e_subopt
   },
   {
-    "XAUTH",					/* XAUTH  */
+    "XAUTH",                                    /* XAUTH  */
     &ett_xauth_subopt,
     VARIABLE_LENGTH,
     1,
-    NULL					/* XXX - fill me in */
+    NULL                                        /* XXX - fill me in */
   },
   {
-    "CHARSET",					/* CHARSET  */
+    "CHARSET",                                  /* CHARSET  */
     &ett_charset_subopt,
     VARIABLE_LENGTH,
     1,
-    NULL					/* XXX - fill me in */
+    NULL                                        /* XXX - fill me in */
   },
   {
-    "Remote Serial Port",				/* Remote Serial Port */
+    "Remote Serial Port",                       /* Remote Serial Port */
     &ett_rsp_subopt,
     VARIABLE_LENGTH,
     1,
-    NULL					/* XXX - fill me in */
+    NULL                                        /* XXX - fill me in */
   },
   {
-    "COM Port Control",					/* RFC 2217 */
+    "COM Port Control",                         /* RFC 2217 */
     &ett_comport_subopt,
     VARIABLE_LENGTH,
     1,
@@ -1519,23 +1522,23 @@ static tn_opt options[] = {
 
 };
 
-#define	NOPTIONS	array_length(options)
+#define NOPTIONS array_length(options)
 
 static int
 telnet_sub_option(packet_info *pinfo, proto_tree *telnet_tree, tvbuff_t *tvb, int start_offset)
 {
   proto_tree *ti, *option_tree;
-  int offset = start_offset;
-  guint8 opt_byte;
-  int subneg_len;
+  int         offset = start_offset;
+  guint8      opt_byte;
+  int         subneg_len;
   const char *opt;
-  gint ett = ett_telnet_subopt;
-  int iac_offset;
-  guint len;
-  tvbuff_t * unescaped_tvb;
-  void (*dissect)(packet_info *, const char *, tvbuff_t *, int, int, proto_tree *);
-  gint cur_offset;
-  gboolean iac_found;
+  gint        ett    = ett_telnet_subopt;
+  int         iac_offset;
+  guint       len;
+  tvbuff_t   *unescaped_tvb;
+  void      (*dissect)(packet_info *, const char *, tvbuff_t *, int, int, proto_tree *);
+  gint        cur_offset;
+  gboolean    iac_found;
 
   /*
    * As data with value iac (0xff) is possible, this value must be escaped
@@ -1543,7 +1546,7 @@ telnet_sub_option(packet_info *pinfo, proto_tree *telnet_tree, tvbuff_t *tvb, in
    */
   int  iac_data = 0;
 
-  offset += 2;	/* skip IAC and SB */
+  offset += 2;  /* skip IAC and SB */
 
   /* Get the option code */
   opt_byte = tvb_get_guint8(tvb, offset);
@@ -1563,26 +1566,26 @@ telnet_sub_option(packet_info *pinfo, proto_tree *telnet_tree, tvbuff_t *tvb, in
   iac_found = FALSE;
   len = tvb_length_remaining(tvb, offset);
   do {
-      iac_offset = tvb_find_guint8(tvb, cur_offset, len, TN_IAC);
-      iac_found = TRUE;
-      if (iac_offset == -1) {
-        /* None found - run to the end of the packet. */
-        offset += len;
+    iac_offset = tvb_find_guint8(tvb, cur_offset, len, TN_IAC);
+    iac_found = TRUE;
+    if (iac_offset == -1) {
+      /* None found - run to the end of the packet. */
+      offset += len;
+    } else {
+      if (((guint)(iac_offset + 1) >= len) ||
+          (tvb_get_guint8(tvb, iac_offset + 1) != TN_IAC)) {
+        /* We really found a single IAC, so we're done */
+        offset = iac_offset;
       } else {
-        if (((guint)(iac_offset + 1) >= len) ||
-             (tvb_get_guint8(tvb, iac_offset + 1) != TN_IAC)) {
-            /* We really found a single IAC, so we're done */
-            offset = iac_offset;
-        } else {
-            /*
-             * We saw an escaped IAC, so we have to move ahead to the
-             * next section
-             */
-            iac_found = FALSE;
-            cur_offset = iac_offset + 2;
-	    iac_data += 1;
-        }
+        /*
+         * We saw an escaped IAC, so we have to move ahead to the
+         * next section
+         */
+        iac_found = FALSE;
+        cur_offset = iac_offset + 2;
+        iac_data += 1;
       }
+    }
 
   } while (!iac_found);
 
@@ -1591,7 +1594,7 @@ telnet_sub_option(packet_info *pinfo, proto_tree *telnet_tree, tvbuff_t *tvb, in
   ti = proto_tree_add_text(telnet_tree, tvb, start_offset, subneg_len,
                            "Suboption Begin: %s", opt);
   option_tree = proto_item_add_subtree(ti, ett);
-  start_offset += 3;	/* skip IAC, SB, and option code */
+  start_offset += 3;    /* skip IAC, SB, and option code */
   subneg_len -= 3;
 
   if (subneg_len > 0) {
@@ -1602,30 +1605,30 @@ telnet_sub_option(packet_info *pinfo, proto_tree *telnet_tree, tvbuff_t *tvb, in
       switch (options[opt_byte].len_type) {
 
       case NO_LENGTH:
-	/* There isn't supposed to *be* sub-option negotiation for this. */
-	proto_tree_add_text(option_tree, tvb, start_offset, subneg_len,
-			    "Bogus suboption data");
-	return offset;
+        /* There isn't supposed to *be* sub-option negotiation for this. */
+        proto_tree_add_text(option_tree, tvb, start_offset, subneg_len,
+                            "Bogus suboption data");
+        return offset;
 
       case FIXED_LENGTH:
-	/* Make sure the length is what it's supposed to be. */
-	if (subneg_len - iac_data != options[opt_byte].optlen) {
-	  proto_tree_add_text(option_tree, tvb, start_offset, subneg_len,
-			    "Suboption parameter length is %d, should be %d",
-			    subneg_len, options[opt_byte].optlen);
-	  return offset;
-	}
-	break;
+        /* Make sure the length is what it's supposed to be. */
+        if (subneg_len - iac_data != options[opt_byte].optlen) {
+          proto_tree_add_text(option_tree, tvb, start_offset, subneg_len,
+                              "Suboption parameter length is %d, should be %d",
+                              subneg_len, options[opt_byte].optlen);
+          return offset;
+        }
+        break;
 
       case VARIABLE_LENGTH:
-	/* Make sure the length is greater than the minimum. */
-	if (subneg_len - iac_data < options[opt_byte].optlen) {
-	  proto_tree_add_text(option_tree, tvb, start_offset, subneg_len,
-			      "Suboption parameter length is %d, should be at least %d",
-			      subneg_len, options[opt_byte].optlen);
-	  return offset;
-	}
-	break;
+        /* Make sure the length is greater than the minimum. */
+        if (subneg_len - iac_data < options[opt_byte].optlen) {
+          proto_tree_add_text(option_tree, tvb, start_offset, subneg_len,
+                              "Suboption parameter length is %d, should be at least %d",
+                              subneg_len, options[opt_byte].optlen);
+          return offset;
+        }
+        break;
       }
 
       /* We have a dissector for this suboption's parameters; call it. */
@@ -1642,10 +1645,10 @@ telnet_sub_option(packet_info *pinfo, proto_tree *telnet_tree, tvbuff_t *tvb, in
         /* Data is escaped, we have to unescape it. */
         unescaped_tvb = unescape_and_tvbuffify_telnet_option(pinfo, tvb, start_offset, subneg_len);
         proto_tree_add_text(option_tree, unescaped_tvb, 0, subneg_len - iac_data,
-                          "Option data");
+                            "Option data");
       } else {
         proto_tree_add_text(option_tree, tvb, start_offset, subneg_len,
-                          "Option data");
+                            "Option data");
       }
     }
   }
@@ -1654,13 +1657,13 @@ telnet_sub_option(packet_info *pinfo, proto_tree *telnet_tree, tvbuff_t *tvb, in
 
 static int
 telnet_will_wont_do_dont(proto_tree *telnet_tree, tvbuff_t *tvb,
-			int start_offset, const char *type)
+                         int start_offset, const char *type)
 {
-  int offset = start_offset;
-  guint8 opt_byte;
+  int         offset = start_offset;
+  guint8      opt_byte;
   const char *opt;
 
-  offset += 2;	/* skip IAC and WILL,WONT,DO,DONT} */
+  offset += 2;  /* skip IAC and WILL,WONT,DO,DONT} */
   opt_byte = tvb_get_guint8(tvb, offset);
   if (opt_byte >= NOPTIONS)
     opt = "<unknown option>";
@@ -1669,89 +1672,89 @@ telnet_will_wont_do_dont(proto_tree *telnet_tree, tvbuff_t *tvb,
   offset++;
 
   proto_tree_add_text(telnet_tree, tvb, start_offset, 3,
-			"Command: %s %s", type, opt);
+                      "Command: %s %s", type, opt);
   return offset;
 }
 
 static int
 telnet_command(packet_info *pinfo, proto_tree *telnet_tree, tvbuff_t *tvb, int start_offset)
 {
-  int offset = start_offset;
+  int    offset = start_offset;
   guchar optcode;
 
-  offset += 1;	/* skip IAC */
+  offset += 1;  /* skip IAC */
   optcode = tvb_get_guint8(tvb, offset);
   offset++;
   switch(optcode) {
 
   case TN_EOF:
     proto_tree_add_text(telnet_tree, tvb, start_offset, 2,
-			"Command: End of File");
+                        "Command: End of File");
     break;
 
   case TN_SUSP:
     proto_tree_add_text(telnet_tree, tvb, start_offset, 2,
-			"Command: Suspend Current Process");
+                        "Command: Suspend Current Process");
     break;
 
   case TN_ABORT:
     proto_tree_add_text(telnet_tree, tvb, start_offset, 2,
-			"Command: Abort Process");
+                        "Command: Abort Process");
     break;
 
   case TN_EOR:
     proto_tree_add_text(telnet_tree, tvb, start_offset, 2,
-			"Command: End of Record");
+                        "Command: End of Record");
     break;
 
   case TN_SE:
     proto_tree_add_text(telnet_tree, tvb, start_offset, 2,
-			"Command: Suboption End");
+                        "Command: Suboption End");
     break;
 
   case TN_NOP:
     proto_tree_add_text(telnet_tree, tvb, start_offset, 2,
-			"Command: No Operation");
+                        "Command: No Operation");
     break;
 
   case TN_DM:
     proto_tree_add_text(telnet_tree, tvb, start_offset, 2,
-			"Command: Data Mark");
+                        "Command: Data Mark");
     break;
 
   case TN_BRK:
     proto_tree_add_text(telnet_tree, tvb, start_offset, 2,
-			"Command: Break");
+                        "Command: Break");
     break;
 
   case TN_IP:
     proto_tree_add_text(telnet_tree, tvb, start_offset, 2,
-			"Command: Interrupt Process");
+                        "Command: Interrupt Process");
     break;
 
   case TN_AO:
     proto_tree_add_text(telnet_tree, tvb, start_offset, 2,
-			"Command: Abort Output");
+                        "Command: Abort Output");
     break;
 
   case TN_AYT:
     proto_tree_add_text(telnet_tree, tvb, start_offset, 2,
-			"Command: Are You There?");
+                        "Command: Are You There?");
     break;
 
   case TN_EC:
     proto_tree_add_text(telnet_tree, tvb, start_offset, 2,
-			"Command: Escape Character");
+                        "Command: Escape Character");
     break;
 
   case TN_EL:
     proto_tree_add_text(telnet_tree, tvb, start_offset, 2,
-			"Command: Erase Line");
+                        "Command: Erase Line");
     break;
 
   case TN_GA:
     proto_tree_add_text(telnet_tree, tvb, start_offset, 2,
-			"Command: Go Ahead");
+                        "Command: Go Ahead");
     break;
 
   case TN_SB:
@@ -1760,27 +1763,27 @@ telnet_command(packet_info *pinfo, proto_tree *telnet_tree, tvbuff_t *tvb, int s
 
   case TN_WILL:
     offset = telnet_will_wont_do_dont(telnet_tree, tvb, start_offset,
-					"Will");
+                                      "Will");
     break;
 
   case TN_WONT:
     offset = telnet_will_wont_do_dont(telnet_tree, tvb, start_offset,
-					"Won't");
+                                      "Won't");
     break;
 
   case TN_DO:
     offset = telnet_will_wont_do_dont(telnet_tree, tvb, start_offset,
-					"Do");
+                                      "Do");
     break;
 
   case TN_DONT:
     offset = telnet_will_wont_do_dont(telnet_tree, tvb, start_offset,
-					"Don't");
+                                      "Don't");
     break;
 
   default:
     proto_tree_add_text(telnet_tree, tvb, start_offset, 2,
-			"Command: Unknown (0x%02x)", optcode);
+                        "Command: Unknown (0x%02x)", optcode);
     break;
   }
 
@@ -1790,9 +1793,9 @@ telnet_command(packet_info *pinfo, proto_tree *telnet_tree, tvbuff_t *tvb, int s
 static void
 telnet_add_text(proto_tree *tree, tvbuff_t *tvb, int offset, int len)
 {
-  gint next_offset;
-  int linelen;
-  guint8 c;
+  gint     next_offset;
+  int      linelen;
+  guint8   c;
   gboolean last_char_was_cr;
 
   while (len != 0 && tvb_offset_exists(tvb, offset)) {
@@ -1800,7 +1803,7 @@ telnet_add_text(proto_tree *tree, tvbuff_t *tvb, int offset, int len)
      * Find the end of the line.
      */
     linelen = tvb_find_line_end(tvb, offset, len, &next_offset, FALSE);
-    len -= next_offset - offset;	/* subtract out the line's characters */
+    len -= next_offset - offset;        /* subtract out the line's characters */
 
     /*
      * In Telnet, CR NUL is the way you send a CR by itself in the
@@ -1818,20 +1821,20 @@ telnet_add_text(proto_tree *tree, tvbuff_t *tvb, int offset, int len)
        * a line.
        */
       if (tvb_get_guint8(tvb, offset + linelen) == '\r') {
-      	last_char_was_cr = TRUE;
-      	while (len != 0 && tvb_offset_exists(tvb, next_offset)) {
+        last_char_was_cr = TRUE;
+        while (len != 0 && tvb_offset_exists(tvb, next_offset)) {
           c = tvb_get_guint8(tvb, next_offset);
-      	  next_offset++;	/* skip over that character */
-      	  len--;
+          next_offset++;        /* skip over that character */
+          len--;
           if (c == '\n' || (c == '\0' && last_char_was_cr)) {
             /*
-	     * LF is a line ending, whether preceded by CR or not.
-	     * NUL is a line ending if preceded by CR.
-	     */
+             * LF is a line ending, whether preceded by CR or not.
+             * NUL is a line ending if preceded by CR.
+             */
             break;
           }
-      	  last_char_was_cr = (c == '\r');
-      	}
+          last_char_was_cr = (c == '\r');
+        }
       }
     }
 
@@ -1848,175 +1851,186 @@ telnet_add_text(proto_tree *tree, tvbuff_t *tvb, int offset, int len)
 
 static int find_unescaped_iac(tvbuff_t *tvb, int offset, int len)
 {
-    int iac_offset = offset;
-
-    /* If we find an IAC (0XFF), make sure it is not followed by another 0XFF.
-       Such cases indicate that it is not an IAC at all */
-    while ((iac_offset = tvb_find_guint8(tvb, iac_offset, len, TN_IAC)) != -1 &&
-           (tvb_get_guint8(tvb, iac_offset + 1) == TN_IAC))
-    {
-        iac_offset+=2;
-        len = tvb_length_remaining(tvb, iac_offset);
-    }
-    return iac_offset;
+  int iac_offset = offset;
+
+  /* If we find an IAC (0XFF), make sure it is not followed by another 0XFF.
+     Such cases indicate that it is not an IAC at all */
+  while ((iac_offset = tvb_find_guint8(tvb, iac_offset, len, TN_IAC)) != -1 &&
+         (tvb_get_guint8(tvb, iac_offset + 1) == TN_IAC))
+  {
+    iac_offset+=2;
+    len = tvb_length_remaining(tvb, iac_offset);
+  }
+  return iac_offset;
 }
 
 static void
 dissect_telnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-	proto_tree      *telnet_tree, *ti;
-	tvbuff_t *next_tvb;
-	gint offset = 0;
-	guint len = 0;
-	guint is_tn3270 = 0;
-	guint is_tn5250 = 0;
-	int data_len;
-	gint iac_offset;
-
-	col_set_str(pinfo->cinfo, COL_PROTOCOL, "TELNET");
-	col_set_str(pinfo->cinfo, COL_INFO, "Telnet Data ...");
-
-	is_tn3270 = find_tn3270_conversation(pinfo);
-	is_tn5250 = find_tn5250_conversation(pinfo);
-
-	ti = proto_tree_add_item(tree, proto_telnet, tvb, offset, -1, ENC_NA);
-	telnet_tree = proto_item_add_subtree(ti, ett_telnet);
-
-	/*
-	 * Scan through the buffer looking for an IAC byte.
-	 */
-	while ((len = tvb_length_remaining(tvb, offset)) > 0) {
-	  iac_offset = find_unescaped_iac(tvb, offset, len);
-	  if (iac_offset != -1) {
-		/*
-		 * We found an IAC byte.
-		 * If there's any data before it, add that data to the
-		 * tree, a line at a time.
-		 */
-		data_len = iac_offset - offset;
-		if (data_len > 0) {
-		  if (is_tn3270) {
-			next_tvb = tvb_new_subset(tvb, offset, data_len, data_len);
-			call_dissector(tn3270_handle, next_tvb, pinfo, telnet_tree);
-          } else if (is_tn5250) {
-              next_tvb = tvb_new_subset(tvb, offset, data_len, data_len);
-              call_dissector(tn5250_handle, next_tvb, pinfo, telnet_tree);
-		  } else
-			telnet_add_text(telnet_tree, tvb, offset, data_len);
-		}
-		/*
-		 * Now interpret the command.
-		 */
-		offset = telnet_command(pinfo, telnet_tree, tvb, iac_offset);
-	  } else {
-		/* get more data if tn3270 */
-		if (is_tn3270 || is_tn5250) {
-		  pinfo->desegment_offset = offset;
-		  pinfo->desegment_len = DESEGMENT_ONE_MORE_SEGMENT;
-		  return;
-		}
-		/*
-		 * We found no IAC byte, so what remains in the buffer
-		 * is the last of the data in the packet.
-		 * Add it to the tree, a line at a time, and then quit.
-		 */
-		telnet_add_text(telnet_tree, tvb, offset, len);
-		break;
-	  }
-	}
+  proto_tree *telnet_tree, *ti;
+  tvbuff_t   *next_tvb;
+  gint        offset    = 0;
+  guint       len       = 0;
+  guint       is_tn3270 = 0;
+  guint       is_tn5250 = 0;
+  int         data_len;
+  gint        iac_offset;
+
+  col_set_str(pinfo->cinfo, COL_PROTOCOL, "TELNET");
+  col_set_str(pinfo->cinfo, COL_INFO, "Telnet Data ...");
+
+  is_tn3270 = find_tn3270_conversation(pinfo);
+  is_tn5250 = find_tn5250_conversation(pinfo);
+
+  ti = proto_tree_add_item(tree, proto_telnet, tvb, offset, -1, ENC_NA);
+  telnet_tree = proto_item_add_subtree(ti, ett_telnet);
+
+  /*
+   * Scan through the buffer looking for an IAC byte.
+   */
+  while ((len = tvb_length_remaining(tvb, offset)) > 0) {
+    iac_offset = find_unescaped_iac(tvb, offset, len);
+    if (iac_offset != -1) {
+      /*
+       * We found an IAC byte.
+       * If there's any data before it, add that data to the
+       * tree, a line at a time.
+       */
+      data_len = iac_offset - offset;
+      if (data_len > 0) {
+        if (is_tn3270) {
+          next_tvb = tvb_new_subset(tvb, offset, data_len, data_len);
+          call_dissector(tn3270_handle, next_tvb, pinfo, telnet_tree);
+        } else if (is_tn5250) {
+          next_tvb = tvb_new_subset(tvb, offset, data_len, data_len);
+          call_dissector(tn5250_handle, next_tvb, pinfo, telnet_tree);
+        } else
+          telnet_add_text(telnet_tree, tvb, offset, data_len);
+      }
+      /*
+       * Now interpret the command.
+       */
+      offset = telnet_command(pinfo, telnet_tree, tvb, iac_offset);
+    } else {
+      /* get more data if tn3270 */
+      if (is_tn3270 || is_tn5250) {
+        pinfo->desegment_offset = offset;
+        pinfo->desegment_len = DESEGMENT_ONE_MORE_SEGMENT;
+        return;
+      }
+      /*
+       * We found no IAC byte, so what remains in the buffer
+       * is the last of the data in the packet.
+       * Add it to the tree, a line at a time, and then quit.
+       */
+      telnet_add_text(telnet_tree, tvb, offset, len);
+      break;
+    }
+  }
 }
 
 void
 proto_register_telnet(void)
 {
-	static hf_register_info hf[] = {
-	{ &hf_telnet_auth_name,
-		{ "Name", "telnet.auth.name", FT_STRING, BASE_NONE,
-		  NULL, 0, "Name of user being authenticated", HFILL }},
-	{ &hf_telnet_auth_cmd,
-		{ "Auth Cmd", "telnet.auth.cmd", FT_UINT8, BASE_DEC,
-		  VALS(auth_cmd_vals), 0, "Authentication Command", HFILL }},
-     	{ &hf_telnet_auth_type,
-		{ "Auth Type", "telnet.auth.type", FT_UINT8, BASE_DEC,
-		  VALS(auth_type_vals), 0, "Authentication Type", HFILL }},
-       	{ &hf_telnet_auth_mod_cred_fwd,
-		{ "Cred Fwd", "telnet.auth.mod.cred_fwd", FT_BOOLEAN, 8,
-		  TFS(&auth_mod_cred_fwd), 0x08, "Modifier: Whether client will forward creds or not", HFILL }},
-       	{ &hf_telnet_auth_mod_who,
-		{ "Who", "telnet.auth.mod.who", FT_BOOLEAN, 8,
-		  TFS(&auth_mod_who), 0x01, "Modifier: Who to mask", HFILL }},
-       	{ &hf_telnet_auth_mod_how,
-		{ "How", "telnet.auth.mod.how", FT_BOOLEAN, 8,
-		  TFS(&auth_mod_how), 0x02, "Modifier: How to mask", HFILL }},
-       	{ &hf_telnet_auth_mod_enc,
-		{ "Encrypt", "telnet.auth.mod.enc", FT_UINT8, BASE_DEC,
-		  VALS(auth_mod_enc), 0x14, "Modifier: How to enable Encryption", HFILL }},
-       	{ &hf_telnet_auth_krb5_type,
-		{ "Command", "telnet.auth.krb5.cmd", FT_UINT8, BASE_DEC,
-		  VALS(auth_krb5_types), 0, "Krb5 Authentication sub-command", HFILL }},
-	{ &hf_telnet_enc_cmd,
-		{ "Enc Cmd", "telnet.enc.cmd", FT_UINT8, BASE_DEC,
-		  VALS(enc_cmd_vals), 0, "Encryption command", HFILL }},
-	{ &hf_telnet_enc_type,
-		{ "Enc Type", "telnet.enc.type", FT_UINT8, BASE_DEC,
-		  VALS(enc_type_vals), 0, "Encryption type", HFILL }},
-	{ &hf_telnet_data,
-		{ "Data", "telnet.data", FT_STRING, BASE_NONE,
-		  NULL, 0, NULL, HFILL }},
-        };
-	static gint *ett[] = {
-		&ett_telnet,
-		&ett_telnet_subopt,
-		&ett_status_subopt,
-		&ett_rcte_subopt,
-		&ett_olw_subopt,
-		&ett_ops_subopt,
-		&ett_crdisp_subopt,
-		&ett_htstops_subopt,
-		&ett_htdisp_subopt,
-		&ett_ffdisp_subopt,
-		&ett_vtstops_subopt,
-		&ett_vtdisp_subopt,
-		&ett_lfdisp_subopt,
-		&ett_extasc_subopt,
-		&ett_bytemacro_subopt,
-		&ett_det_subopt,
-		&ett_supdupout_subopt,
-		&ett_sendloc_subopt,
-		&ett_termtype_subopt,
-		&ett_tacacsui_subopt,
-		&ett_outmark_subopt,
-		&ett_tlocnum_subopt,
-		&ett_tn3270reg_subopt,
-		&ett_x3pad_subopt,
-		&ett_naws_subopt,
-		&ett_tspeed_subopt,
-		&ett_rfc_subopt,
-		&ett_linemode_subopt,
-		&ett_xdpyloc_subopt,
-		&ett_env_subopt,
-		&ett_auth_subopt,
-		&ett_enc_subopt,
-		&ett_newenv_subopt,
-		&ett_tn3270e_subopt,
-		&ett_xauth_subopt,
-		&ett_charset_subopt,
-		&ett_rsp_subopt,
-		&ett_comport_subopt
-	};
-
-	proto_telnet = proto_register_protocol("Telnet", "TELNET", "telnet");
-	proto_register_field_array(proto_telnet, hf, array_length(hf));
-	proto_register_subtree_array(ett, array_length(ett));
+  static hf_register_info hf[] = {
+    { &hf_telnet_auth_name,
+      { "Name", "telnet.auth.name", FT_STRING, BASE_NONE,
+        NULL, 0, "Name of user being authenticated", HFILL }
+    },
+    { &hf_telnet_auth_cmd,
+      { "Auth Cmd", "telnet.auth.cmd", FT_UINT8, BASE_DEC,
+        VALS(auth_cmd_vals), 0, "Authentication Command", HFILL }
+    },
+    { &hf_telnet_auth_type,
+      { "Auth Type", "telnet.auth.type", FT_UINT8, BASE_DEC,
+        VALS(auth_type_vals), 0, "Authentication Type", HFILL }
+    },
+    { &hf_telnet_auth_mod_cred_fwd,
+      { "Cred Fwd", "telnet.auth.mod.cred_fwd", FT_BOOLEAN, 8,
+        TFS(&auth_mod_cred_fwd), 0x08, "Modifier: Whether client will forward creds or not", HFILL }
+    },
+    { &hf_telnet_auth_mod_who,
+      { "Who", "telnet.auth.mod.who", FT_BOOLEAN, 8,
+        TFS(&auth_mod_who), 0x01, "Modifier: Who to mask", HFILL }
+    },
+    { &hf_telnet_auth_mod_how,
+      { "How", "telnet.auth.mod.how", FT_BOOLEAN, 8,
+        TFS(&auth_mod_how), 0x02, "Modifier: How to mask", HFILL }
+    },
+    { &hf_telnet_auth_mod_enc,
+      { "Encrypt", "telnet.auth.mod.enc", FT_UINT8, BASE_DEC,
+        VALS(auth_mod_enc), 0x14, "Modifier: How to enable Encryption", HFILL }
+    },
+    { &hf_telnet_auth_krb5_type,
+      { "Command", "telnet.auth.krb5.cmd", FT_UINT8, BASE_DEC,
+        VALS(auth_krb5_types), 0, "Krb5 Authentication sub-command", HFILL }
+    },
+    { &hf_telnet_enc_cmd,
+      { "Enc Cmd", "telnet.enc.cmd", FT_UINT8, BASE_DEC,
+        VALS(enc_cmd_vals), 0, "Encryption command", HFILL }
+    },
+    { &hf_telnet_enc_type,
+      { "Enc Type", "telnet.enc.type", FT_UINT8, BASE_DEC,
+        VALS(enc_type_vals), 0, "Encryption type", HFILL }
+    },
+    { &hf_telnet_data,
+      { "Data", "telnet.data", FT_STRING, BASE_NONE,
+        NULL, 0, NULL, HFILL }
+    },
+  };
+  static gint *ett[] = {
+    &ett_telnet,
+    &ett_telnet_subopt,
+    &ett_status_subopt,
+    &ett_rcte_subopt,
+    &ett_olw_subopt,
+    &ett_ops_subopt,
+    &ett_crdisp_subopt,
+    &ett_htstops_subopt,
+    &ett_htdisp_subopt,
+    &ett_ffdisp_subopt,
+    &ett_vtstops_subopt,
+    &ett_vtdisp_subopt,
+    &ett_lfdisp_subopt,
+    &ett_extasc_subopt,
+    &ett_bytemacro_subopt,
+    &ett_det_subopt,
+    &ett_supdupout_subopt,
+    &ett_sendloc_subopt,
+    &ett_termtype_subopt,
+    &ett_tacacsui_subopt,
+    &ett_outmark_subopt,
+    &ett_tlocnum_subopt,
+    &ett_tn3270reg_subopt,
+    &ett_x3pad_subopt,
+    &ett_naws_subopt,
+    &ett_tspeed_subopt,
+    &ett_rfc_subopt,
+    &ett_linemode_subopt,
+    &ett_xdpyloc_subopt,
+    &ett_env_subopt,
+    &ett_auth_subopt,
+    &ett_enc_subopt,
+    &ett_newenv_subopt,
+    &ett_tn3270e_subopt,
+    &ett_xauth_subopt,
+    &ett_charset_subopt,
+    &ett_rsp_subopt,
+    &ett_comport_subopt
+  };
+
+  proto_telnet = proto_register_protocol("Telnet", "TELNET", "telnet");
+  proto_register_field_array(proto_telnet, hf, array_length(hf));
+  proto_register_subtree_array(ett, array_length(ett));
 }
 
 void
 proto_reg_handoff_telnet(void)
 {
-	dissector_handle_t telnet_handle;
+  dissector_handle_t telnet_handle;
 
-	telnet_handle = create_dissector_handle(dissect_telnet, proto_telnet);
-	dissector_add_uint("tcp.port", TCP_PORT_TELNET, telnet_handle);
-	tn3270_handle = find_dissector("tn3270");
-    tn5250_handle = find_dissector("tn5250");
+  telnet_handle = create_dissector_handle(dissect_telnet, proto_telnet);
+  dissector_add_uint("tcp.port", TCP_PORT_TELNET, telnet_handle);
+  tn3270_handle = find_dissector("tn3270");
+  tn5250_handle = find_dissector("tn5250");
 }