Add editor-modelines; Don't use tabwidth=4; Adjust whitespace.

Change-Id: I7c287b176002c48dee6ae44334ee9fad221b4cd3
Reviewed-on: https://code.wireshark.org/review/8816
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

10 files changed, 402 insertions, 350 deletions

diff --git a/epan/dissectors/packet-aeron.c b/epan/dissectors/packet-aeron.c
index 104bcb453a..23f00abbe5 100644
--- a/epan/dissectors/packet-aeron.c
+++ b/epan/dissectors/packet-aeron.c
@@ -3058,10 +3058,10 @@ void proto_reg_handoff_aeron(void)
  *
  * Local variables:
  * c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
  * indent-tabs-mode: nil
  * End:
  *
- * vi: set shiftwidth=4 tabstop=4 expandtab:
- * :indentSize=4:tabSize=4:noTabs=true:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
  */
diff --git a/epan/dissectors/packet-ath.c b/epan/dissectors/packet-ath.c
index 40b2489852..a5957f8cd5 100644
--- a/epan/dissectors/packet-ath.c
+++ b/epan/dissectors/packet-ath.c
@@ -453,10 +453,10 @@ proto_reg_handoff_ath(void)
  *
  * Local variables:
  * c-basic-offset: 2
- * tab-width: 2
+ * tab-width: 8
  * indent-tabs-mode: nil
  * End:
  *
- * vi: set shiftwidth=2 tabstop=2 expandtab:
- * :indentSize=2:tabSize=2:noTabs=true:
+ * vi: set shiftwidth=2 tabstop=8 expandtab:
+ * :indentSize=2:tabSize=8:noTabs=true:
  */
diff --git a/epan/dissectors/packet-bgp.h b/epan/dissectors/packet-bgp.h
index 5662e0e24c..afa904ecb8 100644
--- a/epan/dissectors/packet-bgp.h
+++ b/epan/dissectors/packet-bgp.h
@@ -27,3 +27,16 @@ const char*
 decode_bgp_rd(tvbuff_t *tvb, gint offset);
 
 #endif
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */
diff --git a/epan/dissectors/packet-c15ch.c b/epan/dissectors/packet-c15ch.c
index 8a9b239dd1..d0c0c84ddc 100644
--- a/epan/dissectors/packet-c15ch.c
+++ b/epan/dissectors/packet-c15ch.c
@@ -12296,3 +12296,16 @@ void proto_reg_handoff_c15ch(void)
     general_q931_handle = find_dissector("q931");
 
 }
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */
diff --git a/epan/dissectors/packet-iana-oui.h b/epan/dissectors/packet-iana-oui.h
index d1640b3516..cb8913ede7 100644
--- a/epan/dissectors/packet-iana-oui.h
+++ b/epan/dissectors/packet-iana-oui.h
@@ -32,3 +32,16 @@
 #define IANA_PID_L2TP			0x0007	/* RFC 3070 */
 #define IANA_PID_VPN_ID			0x0008	/* RFC 2684 */
 #define IANA_PID_MSDP_GRE_PROTO_TYPE	0x0009
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */
diff --git a/epan/dissectors/packet-ocfs2.c b/epan/dissectors/packet-ocfs2.c
index 105a82173c..f0a99e9bc4 100644
--- a/epan/dissectors/packet-ocfs2.c
+++ b/epan/dissectors/packet-ocfs2.c
@@ -448,7 +448,7 @@ static int dlm_cookie_handler(proto_tree *tree, tvbuff_t *tvb, guint offset, int
 
 	proto_item_append_text(item, " (%u:%" G_GINT64_MODIFIER "u)", node_idx, seq);
 
-    return offset + 8;
+	return offset + 8;
 }
 
 static int dlm_lkm_flags_handler(proto_tree *tree, tvbuff_t *tvb, guint offset)
@@ -481,7 +481,7 @@ static int dlm_lkm_flags_handler(proto_tree *tree, tvbuff_t *tvb, guint offset)
 		&hf_dlm_lock_flag_put_lvb,
 		&hf_dlm_lock_flag_get_lvb,
 		&hf_dlm_lock_flag_recovery
-    };
+	};
 
 	proto_tree_add_bitmask_with_flags(tree, tvb, offset, hf_dlm_lock_flags,
 					ett_dtm_lock_flags, flags, ENC_BIG_ENDIAN, BMT_NO_INT | BMT_NO_FALSE | BMT_NO_TFS);
@@ -630,7 +630,7 @@ static void dissect_dlm_migrate_lockres(proto_tree *tree, tvbuff_t *tvb, int off
 static void
 dlm_fmt_revision( gchar *result, guint32 revision )
 {
-   g_snprintf( result, ITEM_LABEL_LENGTH, "%d.%02d", (guint8)(( revision & 0xFF00 ) >> 8), (guint8)(revision & 0xFF) );
+	g_snprintf( result, ITEM_LABEL_LENGTH, "%d.%02d", (guint8)(( revision & 0xFF00 ) >> 8), (guint8)(revision & 0xFF) );
 }
 
 #define DLM_QUERY_JOIN_REQUEST_OFF_DLMPROTO	4
diff --git a/epan/dissectors/packet-opensafety.h b/epan/dissectors/packet-opensafety.h
index b07cd25c88..9ceacd0da1 100644
--- a/epan/dissectors/packet-opensafety.h
+++ b/epan/dissectors/packet-opensafety.h
@@ -499,3 +499,16 @@ typedef struct _opensafety_packet_info
 #endif /* __cplusplus */
 
 #endif /* _OPENSAFETY_HEADER_ */
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */
diff --git a/epan/dissectors/packet-pmproxy.c b/epan/dissectors/packet-pmproxy.c
index 0398227fda..6e22bf7bb5 100644
--- a/epan/dissectors/packet-pmproxy.c
+++ b/epan/dissectors/packet-pmproxy.c
@@ -261,10 +261,10 @@ void proto_reg_handoff_pmproxy(void) {
  *
  * Local variables:
  * c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
  * indent-tabs-mode: nil
  * End:
  *
- * vi: set shiftwidth=4 tabstop=4 expandtab:
- * :indentSize=4:tabSize=4:noTabs=true:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
  */
diff --git a/epan/dissectors/packet-qnet6.c b/epan/dissectors/packet-qnet6.c
index 766a121e7f..387230d63e 100644
--- a/epan/dissectors/packet-qnet6.c
+++ b/epan/dissectors/packet-qnet6.c
@@ -4067,7 +4067,7 @@ dissect_qnet6(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void * dat
    * flags
    */
   proto_tree_add_bitmask_with_flags(qnet6_tree, tvb, offset,
-		hf_qnet6_l4_flags, ett_qnet6_flags, flags, ENC_NA, BMT_NO_APPEND|BMT_NO_FALSE);
+                hf_qnet6_l4_flags, ett_qnet6_flags, flags, ENC_NA, BMT_NO_APPEND|BMT_NO_FALSE);
   qflags = tvb_get_guint8(tvb, offset);
   offset++;
   /*
diff --git a/epan/dissectors/packet-thrift.c b/epan/dissectors/packet-thrift.c
index f575a9c5ef..2063e4cfca 100644
--- a/epan/dissectors/packet-thrift.c
+++ b/epan/dissectors/packet-thrift.c
@@ -27,15 +27,15 @@
  */
  /* Ref https://thrift.apache.org/developers */
 
- #include "config.h"
+#include "config.h"
 
 #include <epan/packet.h>
 
 void proto_register_thrift(void);
 void proto_reg_handoff_thrift(void);
 
-#define THRIFT_VERSION_MASK		0xffff0000
-#define THRIFT_VERSION_1		0x80010000
+#define THRIFT_VERSION_MASK     0xffff0000
+#define THRIFT_VERSION_1        0x80010000
 
 static int proto_thrift = -1;
 static int hf_thrift_version = -1;
@@ -58,40 +58,40 @@ static int hf_thrift_double = -1;
 static int ett_thrift = -1;
 
 static const value_string thrift_type_vals[] = {
-	{ 0, "T_STOP" },
-	{ 1, "T_VOID" },
-	{ 2, "T_BOL" },
-	{ 3, "T_BYTE" },
-	{ 4, "T_DOUBLE" },
-	{ 5, "Not Used" },
-	{ 6, "T_I16" },
-	{ 7, "Not Used" },
-	{ 8, "T_I32" },
-	{ 9, "T_U64" },
-	{ 10, "T_I64" },
-	{ 11, "T_UTF7" },
-	{ 12, "T_STRUCT" },
-	{ 13, "T_MAP" },
-	{ 14, "T_SET" },
-	{ 15, "T_LIST" },
-	{ 16, "T_UTF8" },
-	{ 17, "T_UTF16" },
-	{ 0, NULL },
+    {  0, "T_STOP" },
+    {  1, "T_VOID" },
+    {  2, "T_BOL" },
+    {  3, "T_BYTE" },
+    {  4, "T_DOUBLE" },
+    {  5, "Not Used" },
+    {  6, "T_I16" },
+    {  7, "Not Used" },
+    {  8, "T_I32" },
+    {  9, "T_U64" },
+    { 10, "T_I64" },
+    { 11, "T_UTF7" },
+    { 12, "T_STRUCT" },
+    { 13, "T_MAP" },
+    { 14, "T_SET" },
+    { 15, "T_LIST" },
+    { 16, "T_UTF8" },
+    { 17, "T_UTF16" },
+    { 0, NULL },
 };
 
 static const value_string thrift_mtype_vals[] = {
-	{ 0, "NONE" },
-	{ 1, "CALL" },
-	{ 2, "REPLY" },
-	{ 3, "EXCEPTION" },
-	{ 4, "ONEWAY" },
-	{ 0, NULL },
+    { 0, "NONE" },
+    { 1, "CALL" },
+    { 2, "REPLY" },
+    { 3, "EXCEPTION" },
+    { 4, "ONEWAY" },
+    { 0, NULL },
 };
 
 static const value_string thrift_bool_vals[] = {
-	{ 0, "FALSE" },
-	{ 1, "TRUE" },
-	{ 0, NULL },
+    { 0, "FALSE" },
+    { 1, "TRUE" },
+    { 0, NULL },
 };
 
 static int dissect_thrift_type(tvbuff_t* tvb, packet_info* pinfo _U_, proto_tree* tree, int type, int offset, int length);
@@ -99,345 +99,345 @@ static int dissect_thrift_type(tvbuff_t* tvb, packet_info* pinfo _U_, proto_tree
 static int
 dissect_thrift_utf7(tvbuff_t* tvb, packet_info* pinfo _U_, proto_tree* tree, int offset, int length _U_)
 {
-	guint32 str_len;
+    guint32 str_len;
 
-	proto_tree_add_item_ret_uint(tree, hf_thrift_str_len, tvb, offset, 4, ENC_BIG_ENDIAN, &str_len);
-	offset += 4;
+    proto_tree_add_item_ret_uint(tree, hf_thrift_str_len, tvb, offset, 4, ENC_BIG_ENDIAN, &str_len);
+    offset += 4;
 
-	proto_tree_add_item(tree, hf_thrift_utf7str, tvb, offset, str_len, ENC_ASCII | ENC_NA);
-	offset = offset + str_len;
+    proto_tree_add_item(tree, hf_thrift_utf7str, tvb, offset, str_len, ENC_ASCII | ENC_NA);
+    offset = offset + str_len;
 
-	return offset;
+    return offset;
 
 }
 
 static int
 dissect_thrift_list(tvbuff_t* tvb, packet_info* pinfo _U_, proto_tree* tree, int offset, int length)
 {
-	proto_tree *sub_tree;
-	proto_item *ti;
-	guint32 type;
-	int start_offset = offset, i;
-	guint32 list_len;
-
-	sub_tree = proto_tree_add_subtree(tree, tvb, offset, -1, ett_thrift, &ti, "List");
-	proto_tree_add_item_ret_uint(sub_tree, hf_thrift_type, tvb, offset, 1, ENC_BIG_ENDIAN, &type);
-	offset++;
-	proto_tree_add_item_ret_uint(sub_tree, hf_thrift_num_list_item, tvb, offset, 4, ENC_BIG_ENDIAN, &list_len);
-	offset += 4;
-
-	for (i = 0; i < (int)list_len; ++i) {
-		offset = dissect_thrift_type(tvb, pinfo, sub_tree, type, offset, length);
-	}
-	list_len = offset - start_offset;
-	proto_item_set_len(ti, list_len);
-
-	return offset;
+    proto_tree *sub_tree;
+    proto_item *ti;
+    guint32 type;
+    int start_offset = offset, i;
+    guint32 list_len;
+
+    sub_tree = proto_tree_add_subtree(tree, tvb, offset, -1, ett_thrift, &ti, "List");
+    proto_tree_add_item_ret_uint(sub_tree, hf_thrift_type, tvb, offset, 1, ENC_BIG_ENDIAN, &type);
+    offset++;
+    proto_tree_add_item_ret_uint(sub_tree, hf_thrift_num_list_item, tvb, offset, 4, ENC_BIG_ENDIAN, &list_len);
+    offset += 4;
+
+    for (i = 0; i < (int)list_len; ++i) {
+        offset = dissect_thrift_type(tvb, pinfo, sub_tree, type, offset, length);
+    }
+    list_len = offset - start_offset;
+    proto_item_set_len(ti, list_len);
+
+    return offset;
 
 }
 static int
 dissect_thrift_struct(tvbuff_t* tvb, packet_info* pinfo _U_, proto_tree* tree, int offset, int length)
 {
-	proto_tree *sub_tree;
-	proto_item *ti;
-	guint8 type;
-	int start_offset = offset, struct_len;
-
-	sub_tree = proto_tree_add_subtree(tree, tvb, offset, -1, ett_thrift, &ti, "Struct");
-	while (offset < length){
-		/*Read type and field id */
-		type = tvb_get_guint8(tvb, offset);
-		proto_tree_add_item(sub_tree, hf_thrift_type, tvb, offset, 1, ENC_BIG_ENDIAN);
-		offset++;
-		if (type == 0){
-			/* T_STOP */
-			struct_len = offset - start_offset;
-			proto_item_set_len(ti, struct_len);
-			break;
-		}
-		proto_tree_add_item(sub_tree, hf_thrift_fid, tvb, offset, 2, ENC_BIG_ENDIAN);
-		offset += 2;
-		offset = dissect_thrift_type(tvb, pinfo, sub_tree, type, offset, length);
-	}
-
-	return offset;
+    proto_tree *sub_tree;
+    proto_item *ti;
+    guint8 type;
+    int start_offset = offset, struct_len;
+
+    sub_tree = proto_tree_add_subtree(tree, tvb, offset, -1, ett_thrift, &ti, "Struct");
+    while (offset < length){
+        /*Read type and field id */
+        type = tvb_get_guint8(tvb, offset);
+        proto_tree_add_item(sub_tree, hf_thrift_type, tvb, offset, 1, ENC_BIG_ENDIAN);
+        offset++;
+        if (type == 0){
+            /* T_STOP */
+            struct_len = offset - start_offset;
+            proto_item_set_len(ti, struct_len);
+            break;
+        }
+        proto_tree_add_item(sub_tree, hf_thrift_fid, tvb, offset, 2, ENC_BIG_ENDIAN);
+        offset += 2;
+        offset = dissect_thrift_type(tvb, pinfo, sub_tree, type, offset, length);
+    }
+
+    return offset;
 }
 
 static int
 dissect_thrift_type(tvbuff_t* tvb, packet_info* pinfo _U_, proto_tree* tree, int type, int offset, int length)
 {
-	switch (type){
-	case 2:
-		/*T_BOOL*/
-		proto_tree_add_item(tree, hf_thrift_bool, tvb, offset, 1, ENC_BIG_ENDIAN);
-		offset += 1;
-		break;
-	case 3:
-		/*T_BYTE , T_I08*/
-		proto_tree_add_item(tree, hf_thrift_byte, tvb, offset, 1, ENC_BIG_ENDIAN);
-		offset += 1;
-		break;
-	case 4:
-		/*T_DOUBLE*/
-		proto_tree_add_item(tree, hf_thrift_double, tvb, offset, 8, ENC_BIG_ENDIAN);
-		offset += 8;
-		break;
-	case 6:
-		/*T_I16 Integer 16*/
-		proto_tree_add_item(tree, hf_thrift_i16, tvb, offset, 2, ENC_BIG_ENDIAN);
-		offset += 2;
-		break;
-	case 8:
-		/*T_I32 Integer 32*/
-		proto_tree_add_item(tree, hf_thrift_i32, tvb, offset, 4, ENC_BIG_ENDIAN);
-		offset += 4;
-		break;
-	case 9:
-		/*T_U64 Integer 64*/
-		proto_tree_add_item(tree, hf_thrift_u64, tvb, offset, 8, ENC_BIG_ENDIAN);
-		offset += 8;
-		break;
-	case 10:
-		/*T_I64 Integer 64*/
-		proto_tree_add_item(tree, hf_thrift_i64, tvb, offset, 8, ENC_BIG_ENDIAN);
-		offset += 8;
-		break;
-	case 11:
-		/* T_UTF7 */
-		offset = dissect_thrift_utf7(tvb, pinfo, tree, offset, length);
-		break;
-	case 12:
-		/* T_STRUCT */
-		offset = dissect_thrift_struct(tvb, pinfo, tree, offset, length);
-		break;
-	case 15:
-		/* T_LIST */
-		offset = dissect_thrift_list(tvb, pinfo, tree, offset, length);
-		break;
-	default:
-		/* Bail out */
-		return length;
-	}
-
-	return offset;
+    switch (type){
+    case 2:
+        /*T_BOOL*/
+        proto_tree_add_item(tree, hf_thrift_bool, tvb, offset, 1, ENC_BIG_ENDIAN);
+        offset += 1;
+        break;
+    case 3:
+        /*T_BYTE , T_I08*/
+        proto_tree_add_item(tree, hf_thrift_byte, tvb, offset, 1, ENC_BIG_ENDIAN);
+        offset += 1;
+        break;
+    case 4:
+        /*T_DOUBLE*/
+        proto_tree_add_item(tree, hf_thrift_double, tvb, offset, 8, ENC_BIG_ENDIAN);
+        offset += 8;
+        break;
+    case 6:
+        /*T_I16 Integer 16*/
+        proto_tree_add_item(tree, hf_thrift_i16, tvb, offset, 2, ENC_BIG_ENDIAN);
+        offset += 2;
+        break;
+    case 8:
+        /*T_I32 Integer 32*/
+        proto_tree_add_item(tree, hf_thrift_i32, tvb, offset, 4, ENC_BIG_ENDIAN);
+        offset += 4;
+        break;
+    case 9:
+        /*T_U64 Integer 64*/
+        proto_tree_add_item(tree, hf_thrift_u64, tvb, offset, 8, ENC_BIG_ENDIAN);
+        offset += 8;
+        break;
+    case 10:
+        /*T_I64 Integer 64*/
+        proto_tree_add_item(tree, hf_thrift_i64, tvb, offset, 8, ENC_BIG_ENDIAN);
+        offset += 8;
+        break;
+    case 11:
+        /* T_UTF7 */
+        offset = dissect_thrift_utf7(tvb, pinfo, tree, offset, length);
+        break;
+    case 12:
+        /* T_STRUCT */
+        offset = dissect_thrift_struct(tvb, pinfo, tree, offset, length);
+        break;
+    case 15:
+        /* T_LIST */
+        offset = dissect_thrift_list(tvb, pinfo, tree, offset, length);
+        break;
+    default:
+        /* Bail out */
+        return length;
+    }
+
+    return offset;
 }
 
 static void
 disscet_thrift_common(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree)
 {
-	proto_tree *sub_tree;
-	int offset = 0;
-	guint32 str_len;
-	guint8 mtype;
-	guint16 version;
-	guint32 seq_id;
-	guint8 *method_str;
-	int length = tvb_reported_length(tvb);
-	guint8 type;
-
-	version = tvb_get_ntohs(tvb, 0);
-	mtype = tvb_get_guint8(tvb, 3);
-	str_len = tvb_get_ntohl(tvb, 4);
-	seq_id = tvb_get_ntohl(tvb, str_len + 8);
-	method_str = tvb_get_string_enc(wmem_packet_scope(), tvb, 8, str_len, ENC_UTF_8);
-
-	proto_tree_add_item(tree, proto_thrift, tvb, 0, -1, ENC_NA);
-	sub_tree = proto_tree_add_subtree_format(tree, tvb, 0, -1, ett_thrift, NULL, "%s[ version:0x%x, seqid:%d, method:%s]",
-		val_to_str(mtype, thrift_mtype_vals, "%d"),
-		version,
-		seq_id,
-		method_str);
-
-	col_set_str(pinfo->cinfo, COL_PROTOCOL, "THRIFT");
-	col_add_fstr(pinfo->cinfo, COL_INFO, "%s %s", val_to_str(mtype, thrift_mtype_vals, "%d"), method_str);
-
-	if (tree){
-		proto_tree_add_item(sub_tree, hf_thrift_version, tvb, offset, 2, ENC_BIG_ENDIAN);
-		offset += 2;
-		/* Not used byte ?*/
-		offset++;
-		proto_tree_add_item(sub_tree, hf_thrift_mtype, tvb, offset, 1, ENC_BIG_ENDIAN);
-		offset += 1;
-		proto_tree_add_item(sub_tree, hf_thrift_str_len, tvb, offset, 4, ENC_BIG_ENDIAN);
-		offset += 4;
-		proto_tree_add_item(sub_tree, hf_thrift_method, tvb, offset, str_len, ENC_ASCII | ENC_NA);
-		offset = offset + str_len;
-		proto_tree_add_item(sub_tree, hf_thrift_seq_id, tvb, offset, 4, ENC_BIG_ENDIAN);
-		offset += 4;
-
-	}
-	else{
-		offset = 12 + str_len;
-	}
-
-	/* Call method dissector here using dissector_try_string()*/
-	sub_tree = proto_tree_add_subtree(tree, tvb, offset, -1, ett_thrift, NULL, "Data");
-	if (tree){
-		while (offset < length){
-			/*Read type and field id */
-			type = tvb_get_guint8(tvb, offset);
-			proto_tree_add_item(sub_tree, hf_thrift_type, tvb, offset, 1, ENC_BIG_ENDIAN);
-			if (type == 0){
-				return;
-			}
-			offset++;
-			proto_tree_add_item(sub_tree, hf_thrift_fid, tvb, offset, 2, ENC_BIG_ENDIAN);
-			offset += 2;
-
-			offset = dissect_thrift_type(tvb, pinfo, sub_tree, type, offset, length);
-		}
-	}
+    proto_tree *sub_tree;
+    int offset = 0;
+    guint32 str_len;
+    guint8 mtype;
+    guint16 version;
+    guint32 seq_id;
+    guint8 *method_str;
+    int length = tvb_reported_length(tvb);
+    guint8 type;
+
+    version = tvb_get_ntohs(tvb, 0);
+    mtype = tvb_get_guint8(tvb, 3);
+    str_len = tvb_get_ntohl(tvb, 4);
+    seq_id = tvb_get_ntohl(tvb, str_len + 8);
+    method_str = tvb_get_string_enc(wmem_packet_scope(), tvb, 8, str_len, ENC_UTF_8);
+
+    proto_tree_add_item(tree, proto_thrift, tvb, 0, -1, ENC_NA);
+    sub_tree = proto_tree_add_subtree_format(tree, tvb, 0, -1, ett_thrift, NULL, "%s[ version:0x%x, seqid:%d, method:%s]",
+        val_to_str(mtype, thrift_mtype_vals, "%d"),
+        version,
+        seq_id,
+        method_str);
+
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, "THRIFT");
+    col_add_fstr(pinfo->cinfo, COL_INFO, "%s %s", val_to_str(mtype, thrift_mtype_vals, "%d"), method_str);
+
+    if (tree){
+        proto_tree_add_item(sub_tree, hf_thrift_version, tvb, offset, 2, ENC_BIG_ENDIAN);
+        offset += 2;
+        /* Not used byte ?*/
+        offset++;
+        proto_tree_add_item(sub_tree, hf_thrift_mtype, tvb, offset, 1, ENC_BIG_ENDIAN);
+        offset += 1;
+        proto_tree_add_item(sub_tree, hf_thrift_str_len, tvb, offset, 4, ENC_BIG_ENDIAN);
+        offset += 4;
+        proto_tree_add_item(sub_tree, hf_thrift_method, tvb, offset, str_len, ENC_ASCII | ENC_NA);
+        offset = offset + str_len;
+        proto_tree_add_item(sub_tree, hf_thrift_seq_id, tvb, offset, 4, ENC_BIG_ENDIAN);
+        offset += 4;
+
+    }
+    else{
+        offset = 12 + str_len;
+    }
+
+    /* Call method dissector here using dissector_try_string()*/
+    sub_tree = proto_tree_add_subtree(tree, tvb, offset, -1, ett_thrift, NULL, "Data");
+    if (tree){
+        while (offset < length){
+            /*Read type and field id */
+            type = tvb_get_guint8(tvb, offset);
+            proto_tree_add_item(sub_tree, hf_thrift_type, tvb, offset, 1, ENC_BIG_ENDIAN);
+            if (type == 0){
+                return;
+            }
+            offset++;
+            proto_tree_add_item(sub_tree, hf_thrift_fid, tvb, offset, 2, ENC_BIG_ENDIAN);
+            offset += 2;
+
+            offset = dissect_thrift_type(tvb, pinfo, sub_tree, type, offset, length);
+        }
+    }
 }
 
 static gboolean
 dissect_thrift_heur(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, void *data _U_) {
-	int offset = 0;
-	guint32 header;
-	int length = tvb_captured_length(tvb);
-	int str_length;
-	guchar c;
-
-	/* Need at least 9 bytes for a thrift message */
-	if (length < 9){
-		return FALSE;
-	}
-
-	header = tvb_get_ntohl(tvb, offset);
-
-	if ((header & THRIFT_VERSION_1) != THRIFT_VERSION_1){
-		return FALSE;
-	}
-
-	offset += 4;
-	str_length = tvb_get_ntohl(tvb, offset);
-	if ((str_length < 1) ||(length < str_length + 8)){
-		return FALSE;
-	}
-	offset += 4;
-	if (length < offset + str_length){
-		return FALSE;
-	}
-	while (offset < (str_length + 8)){
-		c = tvb_get_guint8(tvb, offset);
-		if (!g_ascii_isprint(c)){
-			return FALSE;
-		}
-		offset++;
-	}
-
-	disscet_thrift_common(tvb, pinfo, tree);
-
-	return TRUE;
+    int offset = 0;
+    guint32 header;
+    int length = tvb_captured_length(tvb);
+    int str_length;
+    guchar c;
+
+    /* Need at least 9 bytes for a thrift message */
+    if (length < 9){
+        return FALSE;
+    }
+
+    header = tvb_get_ntohl(tvb, offset);
+
+    if ((header & THRIFT_VERSION_1) != THRIFT_VERSION_1){
+        return FALSE;
+    }
+
+    offset += 4;
+    str_length = tvb_get_ntohl(tvb, offset);
+    if ((str_length < 1) ||(length < str_length + 8)){
+        return FALSE;
+    }
+    offset += 4;
+    if (length < offset + str_length){
+        return FALSE;
+    }
+    while (offset < (str_length + 8)){
+        c = tvb_get_guint8(tvb, offset);
+        if (!g_ascii_isprint(c)){
+            return FALSE;
+        }
+        offset++;
+    }
+
+    disscet_thrift_common(tvb, pinfo, tree);
+
+    return TRUE;
 
 }
 
 void proto_register_thrift(void) {
 
-	static hf_register_info hf[] = {
-		{ &hf_thrift_version,
-		{ "Version", "thrift.version",
-		FT_UINT16, BASE_HEX, NULL, 0x0,
-		NULL, HFILL }
-		},
-		{ &hf_thrift_mtype,
-		{ "Message type", "thrift.mtype",
-		FT_UINT8, BASE_DEC, VALS(thrift_mtype_vals), 0x0,
-		NULL, HFILL }
-		},
-		{ &hf_thrift_str_len,
-		{ "Length", "thrift.str_len",
-		FT_UINT32, BASE_DEC, NULL, 0x0,
-		NULL, HFILL }
-		},
-		{ &hf_thrift_method,
-		{ "Method", "thrift.method",
-		FT_STRING, BASE_NONE, NULL, 0x0,
-		NULL, HFILL }
-		},
-		{ &hf_thrift_seq_id,
-		{ "Sequence Id", "thrift.seq_id",
-		FT_UINT32, BASE_DEC, NULL, 0x0,
-		NULL, HFILL }
-		},
-		{ &hf_thrift_type,
-		{ "Type", "thrift.type",
-		FT_UINT8, BASE_DEC, VALS(thrift_type_vals), 0x0,
-		NULL, HFILL }
-		},
-		{ &hf_thrift_fid,
-		{ "Field Id", "thrift.fid",
-		FT_UINT16, BASE_DEC, NULL, 0x0,
-		NULL, HFILL }
-		},
-		{ &hf_thrift_i16,
-		{ "Integer16", "thrift.i16",
-		FT_INT16, BASE_DEC, NULL, 0x0,
-		NULL, HFILL }
-		},
-		{ &hf_thrift_i32,
-		{ "Integer32", "thrift.i32",
-		FT_INT32, BASE_DEC, NULL, 0x0,
-		NULL, HFILL }
-		},
-		{ &hf_thrift_utf7str,
-		{ "UTF7 String", "thrift.utf7str",
-		FT_STRING, BASE_NONE, NULL, 0x0,
-		NULL, HFILL }
-		},
-		{ &hf_thrift_num_list_item,
-		{ "Number of List Items", "thrift.num_list_item",
-		FT_UINT32, BASE_DEC, NULL, 0x0,
-		NULL, HFILL }
-		},
-		{ &hf_thrift_bool,
-		{ "Boolean", "thrift.bool",
-		FT_UINT8, BASE_DEC, VALS(thrift_bool_vals), 0x0,
-		NULL, HFILL }
-		},
-		{ &hf_thrift_byte,
-		{ "Byte", "thrift.byte",
-		FT_UINT8, BASE_DEC, NULL, 0x0,
-		NULL, HFILL }
-		},
-		{ &hf_thrift_i64,
-		{ "Integer64", "thrift.i64",
-		FT_INT64, BASE_DEC, NULL, 0x0,
-		NULL, HFILL }
-		},
-		{ &hf_thrift_u64,
-		{ "Integer64", "thrift.u64",
-		FT_UINT64, BASE_DEC, NULL, 0x0,
-		NULL, HFILL }
-		},
-		{ &hf_thrift_double,
-		{ "Double", "thrift.double",
-		FT_DOUBLE, BASE_NONE, NULL, 0x0,
-		NULL, HFILL }
-		},
-	};
-
-
-	/* setup protocol subtree arrays */
-	static gint* ett[] = {
-		&ett_thrift,
-	};
-
-	/* Register protocol name and description */
-	proto_thrift = proto_register_protocol("Thrift Protocol", "Thrift", "thrift");
-
-	/* register field array */
-	proto_register_field_array(proto_thrift, hf, array_length(hf));
-
-	/* register subtree array */
-	proto_register_subtree_array(ett, array_length(ett));
-
-	/* register dissector */
-	/*register_dissector("thrift", dissect_thrift, proto_thrift); */
+    static hf_register_info hf[] = {
+        { &hf_thrift_version,
+        { "Version", "thrift.version",
+        FT_UINT16, BASE_HEX, NULL, 0x0,
+        NULL, HFILL }
+        },
+        { &hf_thrift_mtype,
+        { "Message type", "thrift.mtype",
+        FT_UINT8, BASE_DEC, VALS(thrift_mtype_vals), 0x0,
+        NULL, HFILL }
+        },
+        { &hf_thrift_str_len,
+        { "Length", "thrift.str_len",
+        FT_UINT32, BASE_DEC, NULL, 0x0,
+        NULL, HFILL }
+        },
+        { &hf_thrift_method,
+        { "Method", "thrift.method",
+        FT_STRING, BASE_NONE, NULL, 0x0,
+        NULL, HFILL }
+        },
+        { &hf_thrift_seq_id,
+        { "Sequence Id", "thrift.seq_id",
+        FT_UINT32, BASE_DEC, NULL, 0x0,
+        NULL, HFILL }
+        },
+        { &hf_thrift_type,
+        { "Type", "thrift.type",
+        FT_UINT8, BASE_DEC, VALS(thrift_type_vals), 0x0,
+        NULL, HFILL }
+        },
+        { &hf_thrift_fid,
+        { "Field Id", "thrift.fid",
+        FT_UINT16, BASE_DEC, NULL, 0x0,
+        NULL, HFILL }
+        },
+        { &hf_thrift_i16,
+        { "Integer16", "thrift.i16",
+        FT_INT16, BASE_DEC, NULL, 0x0,
+        NULL, HFILL }
+        },
+        { &hf_thrift_i32,
+        { "Integer32", "thrift.i32",
+        FT_INT32, BASE_DEC, NULL, 0x0,
+        NULL, HFILL }
+        },
+        { &hf_thrift_utf7str,
+        { "UTF7 String", "thrift.utf7str",
+        FT_STRING, BASE_NONE, NULL, 0x0,
+        NULL, HFILL }
+        },
+        { &hf_thrift_num_list_item,
+        { "Number of List Items", "thrift.num_list_item",
+        FT_UINT32, BASE_DEC, NULL, 0x0,
+        NULL, HFILL }
+        },
+        { &hf_thrift_bool,
+        { "Boolean", "thrift.bool",
+        FT_UINT8, BASE_DEC, VALS(thrift_bool_vals), 0x0,
+        NULL, HFILL }
+        },
+        { &hf_thrift_byte,
+        { "Byte", "thrift.byte",
+        FT_UINT8, BASE_DEC, NULL, 0x0,
+        NULL, HFILL }
+        },
+        { &hf_thrift_i64,
+        { "Integer64", "thrift.i64",
+        FT_INT64, BASE_DEC, NULL, 0x0,
+        NULL, HFILL }
+        },
+        { &hf_thrift_u64,
+        { "Integer64", "thrift.u64",
+        FT_UINT64, BASE_DEC, NULL, 0x0,
+        NULL, HFILL }
+        },
+        { &hf_thrift_double,
+        { "Double", "thrift.double",
+        FT_DOUBLE, BASE_NONE, NULL, 0x0,
+        NULL, HFILL }
+        },
+    };
+
+
+    /* setup protocol subtree arrays */
+    static gint* ett[] = {
+        &ett_thrift,
+    };
+
+    /* Register protocol name and description */
+    proto_thrift = proto_register_protocol("Thrift Protocol", "Thrift", "thrift");
+
+    /* register field array */
+    proto_register_field_array(proto_thrift, hf, array_length(hf));
+
+    /* register subtree array */
+    proto_register_subtree_array(ett, array_length(ett));
+
+    /* register dissector */
+    /*register_dissector("thrift", dissect_thrift, proto_thrift); */
 }
 
 void proto_reg_handoff_thrift(void) {
 
-	heur_dissector_add("tcp", dissect_thrift_heur, proto_thrift);
+    heur_dissector_add("tcp", dissect_thrift_heur, proto_thrift);
 
 }
 /*
@@ -445,10 +445,10 @@ void proto_reg_handoff_thrift(void) {
 *
 * Local variables:
 * c-basic-offset: 4
-* tab-width: 4
-* indent-tabs-mode: t
+* tab-width: 8
+* indent-tabs-mode: nil
 * End:
 *
-* vi: set shiftwidth=4 tabstop=4 noexpandtab:
-* :indentSize=4:tabSize=4:noTabs=false:
+* vi: set shiftwidth=4 tabstop=8 expandtab:
+* :indentSize=4:tabSize=8:noTabs=true:
 */