Fix some proto_tree_add_item() encoding args;

In some files:
 Remove a few unneeded #includes;
 Do some whitespace/indentation cleanup

svn path=/trunk/; revision=39635

10 files changed, 299 insertions, 305 deletions

diff --git a/epan/dissectors/packet-coap.c b/epan/dissectors/packet-coap.c
index 31c3306f82..7cc1ddff73 100644
--- a/epan/dissectors/packet-coap.c
+++ b/epan/dissectors/packet-coap.c
@@ -248,7 +248,7 @@ dissect_coap_opt_ctype(tvbuff_t *tvb, packet_info *pinfo, proto_tree *subtree, g
 	coap_content_type_value = (gint)opt_ctype;
 	coap_content_type = val_to_str(opt_ctype, vals_ctype, "Unknown %d");
 
-	proto_tree_add_item(subtree, hfindex, tvb, offset, 1, FALSE);
+	proto_tree_add_item(subtree, hfindex, tvb, offset, 1, ENC_BIG_ENDIAN);
 }
 
 static void
@@ -261,7 +261,7 @@ dissect_coap_opt_time(tvbuff_t *tvb, packet_info *pinfo, proto_tree *subtree, gi
 		return;
 	}
 
-	item = proto_tree_add_item(subtree, hfindex, tvb, offset, opt_length, FALSE);
+	item = proto_tree_add_item(subtree, hfindex, tvb, offset, opt_length, ENC_BIG_ENDIAN);
 	proto_item_append_text(item, " (s)");
 
 	return;
@@ -295,7 +295,7 @@ dissect_coap_opt_block(tvbuff_t *tvb, packet_info *pinfo, proto_tree *subtree, g
 	block_mflag = val & 0x08;
 
 	proto_tree_add_int(subtree, hf_coap_opt_block_number, tvb, offset, opt_length, block_number);
-	proto_tree_add_item(subtree, hfindex, tvb, offset + opt_length - 1, 1, FALSE);
+	proto_tree_add_item(subtree, hfindex, tvb, offset + opt_length - 1, 1, ENC_BIG_ENDIAN);
 
 	block_size = 1 << (encoded_block_size + 4);
 	item = proto_tree_add_item(subtree, hf_coap_opt_block_size, tvb, offset + opt_length - 1, 1, ENC_BIG_ENDIAN);
@@ -325,7 +325,7 @@ dissect_coap_opt_port(tvbuff_t *tvb, packet_info *pinfo, proto_tree *subtree, gi
 		expert_add_info_format(pinfo, subtree, PI_MALFORMED, PI_WARN, "Invalid Option Length: %d", opt_length);
 		return;
 	}
-	(void)proto_tree_add_item(subtree, hfindex, tvb, offset, opt_length, FALSE);
+	(void)proto_tree_add_item(subtree, hfindex, tvb, offset, opt_length, ENC_BIG_ENDIAN);
 
 	/* forming a uri-string */
 	if (uri_string[0] == '\0')
diff --git a/epan/dissectors/packet-evrc.c b/epan/dissectors/packet-evrc.c
index a6f5af1491..7c150cefac 100644
--- a/epan/dissectors/packet-evrc.c
+++ b/epan/dissectors/packet-evrc.c
@@ -41,8 +41,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/strutil.h>
@@ -310,7 +308,7 @@ dissect_evrc_aux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, evrc_varia
             return;
         }
 
-        proto_tree_add_item(evrc_tree, hf_mode_request, tvb, offset, 1, FALSE);
+        proto_tree_add_item(evrc_tree, hf_mode_request, tvb, offset, 1, ENC_BIG_ENDIAN);
         proto_tree_add_item(evrc_tree, hf_evrc_frame_count, tvb, offset, 1, ENC_BIG_ENDIAN);
 
         /*
@@ -333,7 +331,7 @@ dissect_evrc_aux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, evrc_varia
         {
             oct = tvb_get_guint8(tvb, offset);
 
-            proto_tree_add_item(toc_tree, hf_toc_frame_type_high, tvb, offset, 1, FALSE);
+            proto_tree_add_item(toc_tree, hf_toc_frame_type_high, tvb, offset, 1, ENC_BIG_ENDIAN);
 
             speech_data_len[i] = evrc_frame_type_to_octs((guint8)((oct & 0xf0) >> 4));
 
@@ -342,7 +340,7 @@ dissect_evrc_aux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, evrc_varia
 	    if (i < frame_count)
             {
                 /* even number of frames */
-                proto_tree_add_item(toc_tree, hf_toc_frame_type_low, tvb, offset, 1, FALSE);
+                proto_tree_add_item(toc_tree, hf_toc_frame_type_low, tvb, offset, 1, ENC_BIG_ENDIAN);
 
                 speech_data_len[i] = evrc_frame_type_to_octs((guint8)(oct & 0x0f));
 
diff --git a/epan/dissectors/packet-ieee8021ah.c b/epan/dissectors/packet-ieee8021ah.c
index 62e881c212..a72319f642 100644
--- a/epan/dissectors/packet-ieee8021ah.c
+++ b/epan/dissectors/packet-ieee8021ah.c
@@ -134,7 +134,7 @@ dissect_ieee8021ad(tvbuff_t *tvb, packet_info *pinfo,
     ieee8021ad_tree = NULL;
 
     if (tree) {
-	ptree = proto_tree_add_item(tree, proto_tree_index, tvb, 0, IEEE8021AD_LEN, FALSE);
+	ptree = proto_tree_add_item(tree, proto_tree_index, tvb, 0, IEEE8021AD_LEN, ENC_NA);
 	ieee8021ad_tree = proto_item_add_subtree(ptree, ett_ieee8021ad);
     }
 
@@ -144,7 +144,7 @@ dissect_ieee8021ad(tvbuff_t *tvb, packet_info *pinfo,
        tree to 802.1ah, pass to 1ah dissector */
     if (encap_proto == ETHERTYPE_IEEE_802_1AH) {
 	if (tree) {
-	    tagtree = proto_tree_add_item(ptree, proto_tree_index, tvb, 0, 2, FALSE);
+	    tagtree = proto_tree_add_item(ptree, proto_tree_index, tvb, 0, 2, ENC_NA);
 	    ieee8021ad_tag_tree = proto_item_add_subtree(tagtree, ett_ieee8021ad);
 
 	    /* add fields */
@@ -242,7 +242,7 @@ dissect_ieee8021ah_common(tvbuff_t *tvb, packet_info *pinfo,
 
     if (tree) {
 	/* 802.1ah I-Tag */
-	ptree = proto_tree_add_item(tree, tree_index, tvb, 0, 4, FALSE);
+	ptree = proto_tree_add_item(tree, tree_index, tvb, 0, 4, ENC_NA);
 	ieee8021ah_tag_tree = proto_item_add_subtree(ptree, ett_ieee8021ah);
 
 	/* add fields */
@@ -326,7 +326,7 @@ dissect_ieee8021ah(tvbuff_t *tvb, packet_info *pinfo,
     ieee8021ah_tree = NULL;
 
     if (tree) {
-	ptree = proto_tree_add_item(tree, proto_tree_index, tvb, 0, IEEE8021AH_LEN, FALSE);
+	ptree = proto_tree_add_item(tree, proto_tree_index, tvb, 0, IEEE8021AH_LEN, ENC_NA);
 	ieee8021ah_tree = proto_item_add_subtree(ptree, ett_ieee8021ah);
 
 	dissect_ieee8021ah_common(tvb, pinfo, ieee8021ah_tree, tree, proto_tree_index);
diff --git a/epan/dissectors/packet-mikey.c b/epan/dissectors/packet-mikey.c
index 369c91df44..f22693b6e3 100644
--- a/epan/dissectors/packet-mikey.c
+++ b/epan/dissectors/packet-mikey.c
@@ -1018,7 +1018,7 @@ dissect_payload_sp(mikey_t *mikey _U_, tvbuff_t *tvb, packet_info *pinfo _U_, pr
 	}
 
 	tvb_ensure_bytes_exist(tvb, offset+5, length);
-/* 	proto_tree_add_item(tree, hf_mikey[POS_SP_PARAM], tvb, 5, length, FALSE); */
+/* 	proto_tree_add_item(tree, hf_mikey[POS_SP_PARAM], tvb, 5, length, ENC_NA); */
 
 	offset += 5;
 	sub_pos = 0;
@@ -1270,7 +1270,7 @@ dissect_mikey(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 			if (hf == -1)
 				hf = 0;
 
-			sub_ti = proto_tree_add_item(mikey_tree, hf_mikey_pl[hf], subtvb, 0, -1, FALSE);
+			sub_ti = proto_tree_add_item(mikey_tree, hf_mikey_pl[hf], subtvb, 0, -1, ENC_NA);
 
 			mikey_payload_tree = proto_item_add_subtree(sub_ti, ett_mikey_payload);
 			if (payload != PL_HDR && payload != PL_SIGN)
diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c
index f35a48ef82..7b32870a95 100644
--- a/epan/dissectors/packet-nfs.c
+++ b/epan/dissectors/packet-nfs.c
@@ -31,8 +31,7 @@
 #endif
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+
 #include <glib.h>
 
 #include "packet-rpc.h"
@@ -4869,32 +4868,32 @@ display_access_items(tvbuff_t* tvb, int offset, packet_info* pinfo, proto_tree*
 					case 0:
 						access_subitem = proto_tree_add_item (access_subtree,
 							(mtype=='S' ? hf_nfs_access_supp_read : hf_nfs_access_read),
-							tvb, offset, 4, FALSE);
+							tvb, offset, 4, ENC_BIG_ENDIAN);
 						break;
 					case 1:
 						access_subitem = proto_tree_add_item (access_subtree,
 							(mtype=='S' ? hf_nfs_access_supp_lookup : hf_nfs_access_lookup),
-							tvb, offset, 4, FALSE);
+							tvb, offset, 4, ENC_BIG_ENDIAN);
 						break;
 					case 2:
 						access_subitem = proto_tree_add_item (access_subtree,
 							(mtype=='S' ? hf_nfs_access_supp_modify : hf_nfs_access_modify),
-							tvb, offset, 4, FALSE);
+							tvb, offset, 4, ENC_BIG_ENDIAN);
 						break;
 					case 3:
 						access_subitem = proto_tree_add_item (access_subtree,
 							(mtype=='S' ? hf_nfs_access_supp_extend : hf_nfs_access_extend),
-							tvb, offset, 4, FALSE);
+							tvb, offset, 4, ENC_BIG_ENDIAN);
 						break;
 					case 4:
 						access_subitem = proto_tree_add_item (access_subtree,
 							(mtype=='S' ? hf_nfs_access_supp_delete : hf_nfs_access_delete),
-							tvb, offset, 4, FALSE);
+							tvb, offset, 4, ENC_BIG_ENDIAN);
 						break;
 					case 5:
 						access_subitem = proto_tree_add_item (access_subtree,
 							(mtype=='S' ? hf_nfs_access_supp_execute : hf_nfs_access_execute),
-							tvb, offset, 4, FALSE);
+							tvb, offset, 4, ENC_BIG_ENDIAN);
 						break;
 				}
 				if (mtype=='C') proto_item_append_text(access_subitem, "?" );
diff --git a/epan/dissectors/packet-ospf.c b/epan/dissectors/packet-ospf.c
index cc0489f64b..64700f5ec4 100644
--- a/epan/dissectors/packet-ospf.c
+++ b/epan/dissectors/packet-ospf.c
@@ -1826,7 +1826,7 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, int offset, proto_tree *tree,
                                             stlv_type==MPLS_LINK_LOCAL_IF ?
                                             hf_ospf_filter[OSPFF_LS_MPLS_LOCAL_ADDR] :
                                             hf_ospf_filter[OSPFF_LS_MPLS_REMOTE_ADDR],
-                                            tvb, stlv_offset+4+i, 4, FALSE);
+                                            tvb, stlv_offset+4+i, 4, ENC_BIG_ENDIAN);
                     break;
 
                 case MPLS_LINK_TE_METRIC:
diff --git a/epan/dissectors/packet-ptp.c b/epan/dissectors/packet-ptp.c
index 63e17d8158..08d5d7f1cc 100644
--- a/epan/dissectors/packet-ptp.c
+++ b/epan/dissectors/packet-ptp.c
@@ -2218,14 +2218,14 @@ dissect_ptp_v2_text(tvbuff_t *tvb, guint16 *cur_offset, proto_tree *tree, int hf
     if (tree)
     {
         ptptext_ti = proto_tree_add_item(tree, hf_ptp_v2_mm_ptptext, tvb,
-            *cur_offset+1, length, FALSE);
+            *cur_offset+1, length, ENC_BIG_ENDIAN);
 
         ptptext_subtree = proto_item_add_subtree(ptptext_ti, ett_ptp_v2_ptptext);
-            /* subtree */
-            proto_tree_add_item(ptptext_subtree, hf_ptp_v2_mm_ptptext_length, tvb,
-                *cur_offset, 1, FALSE);
-            proto_tree_add_item(ptptext_subtree, hf_ptp_v2_mm_ptptext, tvb,
-                *cur_offset+1, length, FALSE);
+        /* subtree */
+        proto_tree_add_item(ptptext_subtree, hf_ptp_v2_mm_ptptext_length, tvb,
+                            *cur_offset, 1, ENC_BIG_ENDIAN);
+        proto_tree_add_item(ptptext_subtree, hf_ptp_v2_mm_ptptext, tvb,
+                            *cur_offset+1, length, ENC_ASCII|ENC_NA);
 
         *cur_offset = *cur_offset + length + 1;
     }
diff --git a/epan/dissectors/packet-pw-atm.c b/epan/dissectors/packet-pw-atm.c
index 7fa572cce7..6682ba7f64 100644
--- a/epan/dissectors/packet-pw-atm.c
+++ b/epan/dissectors/packet-pw-atm.c
@@ -474,7 +474,7 @@ gboolean too_small_packet_or_notpw(tvbuff_t * tvb
 		if (tree)
 		{
 			proto_item  *item;
-			item = proto_tree_add_item(tree, proto_handler, tvb, 0, -1, FALSE);
+			item = proto_tree_add_item(tree, proto_handler, tvb, 0, -1, ENC_NA);
 			expert_add_info_format(pinfo, item, PI_MALFORMED, PI_ERROR,
 				"PW packet size (%d) is too small to carry sensible information"
 				,(int)packet_size);
@@ -1303,7 +1303,7 @@ void dissect_control_word(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree
 							if (pref_aal5_sdu_extend_cw_length_with_rsvd)
 								hf_len = hf_pref_cw_rsvlen;
 						}
-						item = proto_tree_add_item(tree2, hf_len, tvb, 1, 1, FALSE);
+						item = proto_tree_add_item(tree2, hf_len, tvb, 1, 1, ENC_BIG_ENDIAN);
 					}
 					if (pd->props & PWC_CW_BAD_LEN_MUST_BE_0)
 					{
@@ -1572,7 +1572,7 @@ int dissect_cell_header(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 						,(PWATM_MODE_AAL5_PDU == pd->mode)
 							? hf_aal5_pdu_rsv
 							: hf_cell_h_rsv
-						,tvb, 0, 1, FALSE);
+						,tvb, 0, 1, ENC_BIG_ENDIAN);
 					if (0 != pd->cwb3.rsv)
 					{
 						expert_add_info_format(pinfo, item2, PI_MALFORMED, PI_ERROR
diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c
index 2c42827dfa..aa4339938f 100644
--- a/epan/dissectors/packet-ssh.c
+++ b/epan/dissectors/packet-ssh.c
@@ -48,8 +48,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
@@ -233,7 +231,7 @@ static const value_string ssh2_msg_vals[] = {
 	{ SSH_MSG_CHANNEL_REQUEST, "Channel Request" },
 	{ SSH_MSG_CHANNEL_SUCCESS, "Channel Success" },
 	{ SSH_MSG_CHANNEL_FAILURE, "Channel Failure" },
-  	{ 0, NULL }
+	{ 0, NULL }
 };
 
 static const value_string ssh1_msg_vals[] = {
@@ -247,7 +245,7 @@ static const value_string ssh1_msg_vals[] = {
 
 
 static const value_string ssh_opcode_vals[] _U_ = {
-  { 0,          NULL }
+	{ 0, NULL }
 };
 
 static int ssh_dissect_key_init(tvbuff_t *tvb, int offset, proto_tree *tree,
@@ -274,7 +272,7 @@ static int ssh_dissect_encrypted_packet(tvbuff_t *tvb, packet_info *pinfo,
 		struct ssh_flow_data *global_data,
 		int offset, proto_tree *tree,int is_response);
 static proto_item * ssh_proto_tree_add_item(proto_tree *tree, int hfindex, tvbuff_t *tvb,
-    gint start, gint length, gboolean little_endian);
+		gint start, gint length, guint encoding);
 
 
 
@@ -421,8 +419,8 @@ dissect_ssh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		}
 
 		if(need_desegmentation) return;
-                if(offset <= last_offset)
-                        THROW(ReportedBoundsError);
+		if(offset <= last_offset)
+			THROW(ReportedBoundsError);
 	}
 }
 
@@ -514,10 +512,10 @@ ssh_dissect_ssh1(tvbuff_t *tvb, packet_info *pinfo,
 			 * ask for even more (after the header) that will
 			 * break reassembly.
 			 */
-                	pinfo->desegment_offset = offset;
-                	pinfo->desegment_len = DESEGMENT_ONE_MORE_SEGMENT;
-                	*need_desegmentation = TRUE;
-                	return offset;
+			pinfo->desegment_offset = offset;
+			pinfo->desegment_len = DESEGMENT_ONE_MORE_SEGMENT;
+			*need_desegmentation = TRUE;
+			return offset;
 		}
 	}
 	plen = tvb_get_ntohl(tvb, offset) ;
@@ -526,15 +524,15 @@ ssh_dissect_ssh1(tvbuff_t *tvb, packet_info *pinfo,
 
 	if (ssh_desegment && pinfo->can_desegment) {
 		if(plen+4+padding_length >  remain_length ) {
-                	pinfo->desegment_offset = offset;
-                	pinfo->desegment_len = plen+padding_length - remain_length;
-                	*need_desegmentation = TRUE;
-                	return offset;
+			pinfo->desegment_offset = offset;
+			pinfo->desegment_len = plen+padding_length - remain_length;
+			*need_desegmentation = TRUE;
+			return offset;
 		}
 	}
 
 	if (check_col(pinfo->cinfo, COL_INFO)) {
-  		col_add_fstr(pinfo->cinfo, COL_INFO, "%s: ",
+		col_add_fstr(pinfo->cinfo, COL_INFO, "%s: ",
 			is_response?"Server":"Client");
 	}
 
@@ -607,7 +605,7 @@ ssh_tree_add_mpint(tvbuff_t *tvb, int offset, proto_tree *tree,
 	offset+=4;
 	if (tree) {
 		ssh_proto_tree_add_item(tree, hf_ssh_mpint_selection,
-			tvb, offset, len, FALSE);
+			tvb, offset, len, ENC_NA);
 	}
 	return 4+len;
 }
@@ -624,7 +622,7 @@ ssh_tree_add_string(tvbuff_t *tvb, int offset, proto_tree *tree,
 	offset+=4;
 	if (tree) {
 		ssh_proto_tree_add_item(tree, hf_ssh_string,
-			tvb, offset, len, FALSE);
+			tvb, offset, len, ENC_NA);
 	}
 	return 4+len;
 }
@@ -668,20 +666,20 @@ ssh_dissect_key_exchange(tvbuff_t *tvb, packet_info *pinfo,
 			 * ask for even more (after the header) that will
 			 * break reassembly.
 			 */
-                	pinfo->desegment_offset = offset;
-                	pinfo->desegment_len = DESEGMENT_ONE_MORE_SEGMENT;
-                	*need_desegmentation = TRUE;
-                	return offset;
+			pinfo->desegment_offset = offset;
+			pinfo->desegment_len = DESEGMENT_ONE_MORE_SEGMENT;
+			*need_desegmentation = TRUE;
+			return offset;
 		}
 	}
 	plen = tvb_get_ntohl(tvb, offset) ;
 
 	if (ssh_desegment && pinfo->can_desegment) {
 		if(plen +4 >  remain_length ) {
-                	pinfo->desegment_offset = offset;
-                	pinfo->desegment_len = plen+4 - remain_length;
-                	*need_desegmentation = TRUE;
-                	return offset;
+			pinfo->desegment_offset = offset;
+			pinfo->desegment_len = plen+4 - remain_length;
+			*need_desegmentation = TRUE;
+			return offset;
 		}
 	}
 	/*
@@ -689,7 +687,7 @@ ssh_dissect_key_exchange(tvbuff_t *tvb, packet_info *pinfo,
 	 */
 
 	if (check_col(pinfo->cinfo, COL_INFO)) {
-  		col_add_fstr(pinfo->cinfo, COL_INFO, "%s: ",
+		col_add_fstr(pinfo->cinfo, COL_INFO, "%s: ",
 			is_response?"Server":"Client");
 	}
 
@@ -765,7 +763,7 @@ ssh_dissect_key_exchange(tvbuff_t *tvb, packet_info *pinfo,
 			offset+=ssh_tree_add_mpint(tvb,offset,key_ex_tree,hf_ssh_mpint_f);
 			offset+=ssh_tree_add_string(tvb,offset,key_ex_tree,hf_ssh_kexdh_h_sig,hf_ssh_kexdh_h_sig_length);
 		}
- 	}
+	}
 
 	len = plen+4-padding_length-(offset-last_offset);
 	if (tree ) {
@@ -804,7 +802,7 @@ ssh_dissect_encrypted_packet(tvbuff_t *tvb, packet_info *pinfo,
 
 	len = tvb_reported_length_remaining(tvb,offset);
 	if (check_col(pinfo->cinfo, COL_INFO)) {
-  		col_add_fstr(pinfo->cinfo, COL_INFO, "Encrypted %s packet len=%d",
+		col_add_fstr(pinfo->cinfo, COL_INFO, "Encrypted %s packet len=%d",
 			is_response?"response":"request",len);
 	}
 	if (tree ) {
@@ -820,7 +818,7 @@ ssh_dissect_encrypted_packet(tvbuff_t *tvb, packet_info *pinfo,
 			ssh_proto_tree_add_item(tree, hf_ssh_mac_string,
 				tvb, offset+encrypted_len,
 				global_data->mac_length , ENC_NA);
-  	}
+	}
 	offset+=len;
 	return offset;
 }
@@ -868,10 +866,10 @@ ssh_dissect_protocol(tvbuff_t *tvb, packet_info *pinfo,
 
 	if (ssh_desegment && pinfo->can_desegment) {
 		if(linelen == -1 || remain_length < (guint)linelen-offset ) {
-                	pinfo->desegment_offset = offset;
-                	pinfo->desegment_len = linelen-remain_length;
-                	*need_desegmentation = TRUE;
-                	return offset;
+			pinfo->desegment_offset = offset;
+			pinfo->desegment_len = linelen-remain_length;
+			*need_desegmentation = TRUE;
+			return offset;
 		}
 	}
 	if(linelen == -1 ) {
@@ -884,14 +882,14 @@ ssh_dissect_protocol(tvbuff_t *tvb, packet_info *pinfo,
 	}
 
 	if (check_col(pinfo->cinfo, COL_INFO)) {
-  		col_add_fstr(pinfo->cinfo, COL_INFO, "%s Protocol: %s",
+		col_add_fstr(pinfo->cinfo, COL_INFO, "%s Protocol: %s",
 			is_response?"Server":"Client",
 			tvb_format_text(tvb,offset,protolen));
 	}
 	if (tree ) {
 		ssh_proto_tree_add_item(tree, hf_ssh_protocol,
 		    		tvb, offset, linelen, ENC_ASCII|ENC_NA);
-  	}
+	}
 	offset+=linelen;
 	return offset;
 }
@@ -983,7 +981,7 @@ ssh_choose_algo(gchar *client, gchar *server, gchar **result)
 static void
 ssh_evaluate_negotiation(tvbuff_t *tvb, int offset, int len,
 			 int hf_value, int hf_client, int hf_server,
-                         gchar **client, gchar **server, gchar **agreed)
+			 gchar **client, gchar **server, gchar **agreed)
 {
 	if (!tvb || !client || !server || !agreed) return;
 
@@ -1029,7 +1027,7 @@ ssh_dissect_key_init(tvbuff_t *tvb, int offset, proto_tree *tree,
 		offset+=4;
 		if (key_init_tree) {
 			ssh_proto_tree_add_item(key_init_tree,
-				*ssh_proposals[i].value, tvb, offset, len, FALSE);
+				*ssh_proposals[i].value, tvb, offset, len, ENC_ASCII|ENC_NA);
 		}
 		/* record negotiations */
 		if (global_data) {
@@ -1082,10 +1080,10 @@ ssh_dissect_key_init(tvbuff_t *tvb, int offset, proto_tree *tree,
 }
 static proto_item *
 ssh_proto_tree_add_item(proto_tree *tree, int hfindex, tvbuff_t *tvb,
-    gint start, gint length, gboolean little_endian)
+			gint start, gint length, guint encoding)
 {
 	if (tree && length <0xffff && length > 0) {
-		return proto_tree_add_item(tree, hfindex, tvb, start, length,little_endian);
+		return proto_tree_add_item(tree, hfindex, tvb, start, length, encoding);
 	}
 	return NULL;
 }
@@ -1093,242 +1091,242 @@ ssh_proto_tree_add_item(proto_tree *tree, int hfindex, tvbuff_t *tvb,
 void
 proto_register_ssh(void)
 {
-  static hf_register_info hf[] = {
-    { &hf_ssh_packet_length,
-      { "Packet Length",      "ssh.packet_length",
-        FT_UINT32, BASE_DEC, NULL,  0x0,
-        "SSH packet length", HFILL }},
-
-    { &hf_ssh_padding_length,
-      { "Padding Length",  "ssh.padding_length",
-        FT_UINT8, BASE_DEC, NULL, 0x0,
-        "SSH Packet Number", HFILL }},
-
-    { &hf_ssh_msg_code,
-      { "Message Code",  "ssh.message_code",
-        FT_UINT8, BASE_DEC, NULL, 0x0,
-        "SSH Message Code", HFILL }},
-
-    { &hf_ssh_mpint_g,
-      { "DH base (G)",  "ssh.dh.g",
-        FT_BYTES, BASE_NONE, NULL, 0x0,
-        "SSH DH base (G)", HFILL }},
-
-    { &hf_ssh_mpint_p,
-      { "DH modulus (P)",  "ssh.dh.p",
-        FT_BYTES, BASE_NONE, NULL, 0x0,
-        "SSH DH modulus (P)", HFILL }},
-
-    { &hf_ssh_mpint_e,
-      { "DH client e",  "ssh.dh.e",
-        FT_BYTES, BASE_NONE, NULL, 0x0,
-        "SSH DH client e", HFILL }},
-
-    { &hf_ssh_mpint_f,
-      { "DH server f",  "ssh.dh.f",
-        FT_BYTES, BASE_NONE, NULL, 0x0,
-        "SSH DH server f", HFILL }},
-
-    { &hf_ssh_mpint_length,
-      { "Multi Precision Integer Length",      "ssh.mpint_length",
-        FT_UINT32, BASE_DEC, NULL,  0x0,
-        "SSH mpint length", HFILL }},
-
-    { &hf_ssh_kexdh_host_key,
-      { "KEX DH host key",         "ssh.kexdh.host_key",
-        FT_BYTES, BASE_NONE, NULL, 0x0,
-        "SSH KEX DH host key", HFILL }},
-
-    { &hf_ssh_kexdh_h_sig,
-      { "KEX DH H signature",         "ssh.kexdh.h_sig",
-        FT_BYTES, BASE_NONE, NULL, 0x0,
-        "SSH KEX DH H signature", HFILL }},
-
-    { &hf_ssh_kexdh_host_key_length,
-      { "KEX DH host key length",         "ssh.kexdh.host_key_length",
-        FT_UINT32, BASE_DEC, NULL, 0x0,
-        "SSH KEX DH host key length", HFILL }},
-
-    { &hf_ssh_kexdh_h_sig_length,
-      { "KEX DH H signature length",         "ssh.kexdh.h_sig_length",
-        FT_UINT32, BASE_DEC, NULL, 0x0,
-        "SSH KEX DH H signature length", HFILL }},
-
-    { &hf_ssh_encrypted_packet,
-      { "Encrypted Packet",  "ssh.encrypted_packet",
-        FT_BYTES, BASE_NONE, NULL, 0x0,
-        "SSH Protocol Packet", HFILL }},
-
-    { &hf_ssh_protocol,
-      { "Protocol",  "ssh.protocol",
-        FT_STRING, BASE_NONE, NULL, 0x0,
-        "SSH Protocol", HFILL }},
-
-    { &hf_ssh_cookie,
-      { "Cookie",  "ssh.cookie",
-        FT_BYTES, BASE_NONE, NULL, 0x0,
-        "SSH Cookie", HFILL }},
-
-    { &hf_ssh_kex_first_packet_follows,
-      { "KEX First Packet Follows",      "ssh.kex.first_packet_follows",
-        FT_UINT8, BASE_DEC, NULL, 0x0,
-        "SSH KEX Fist Packet Follows", HFILL }},
-
-    { &hf_ssh_kex_reserved,
-      { "Reserved",  "ssh.kex.reserved",
-        FT_BYTES, BASE_NONE, NULL, 0x0,
-        "SSH Protocol KEX Reserved", HFILL }},
-
-    { &hf_ssh_dh_gex_min,
-      { "DH GEX Min",  "ssh.dh_gex.min",
-        FT_BYTES, BASE_NONE, NULL, 0x0,
-        "SSH DH GEX Minimum", HFILL }},
-
-    { &hf_ssh_dh_gex_nbits,
-      { "DH GEX Numbers of Bits",  "ssh.dh_gex.nbits",
-        FT_BYTES, BASE_NONE, NULL, 0x0,
-        "SSH DH GEX Number of Bits", HFILL }},
-
-    { &hf_ssh_dh_gex_max,
-      { "DH GEX Max",  "ssh.dh_gex.max",
-        FT_BYTES, BASE_NONE, NULL, 0x0,
-        "SSH DH GEX Maximum", HFILL }},
-
-    { &hf_ssh_payload,
-      { "Payload",  "ssh.payload",
-        FT_BYTES, BASE_NONE, NULL, 0x0,
-        "SSH Payload", HFILL }},
-
-    { &hf_ssh_padding_string,
-      { "Padding String",  "ssh.padding_string",
-        FT_BYTES, BASE_NONE, NULL, 0x0,
-        "SSH Padding String", HFILL }},
-
-    { &hf_ssh_mac_string,
-      { "MAC",  "ssh.mac",
-        FT_BYTES, BASE_NONE, NULL, 0x0,
-        "SSH Protocol Packet MAC", HFILL }},
-
-    { &hf_ssh_kex_algorithms,
-      { "kex_algorithms string",         "ssh.kex_algorithms",
-        FT_STRINGZ, BASE_NONE, NULL, 0x0,
-        "SSH kex_algorithms string", HFILL }},
-
-    { &hf_ssh_server_host_key_algorithms,
-      { "server_host_key_algorithms string",         "ssh.server_host_key_algorithms",
-        FT_STRINGZ, BASE_NONE, NULL, 0x0,
-        "SSH server_host_key_algorithms string", HFILL }},
-
-    { &hf_ssh_encryption_algorithms_client_to_server,
-      { "encryption_algorithms_client_to_server string",         "ssh.encryption_algorithms_client_to_server",
-        FT_STRINGZ, BASE_NONE, NULL, 0x0,
-        "SSH encryption_algorithms_client_to_server string", HFILL }},
-
-    { &hf_ssh_encryption_algorithms_server_to_client,
-      { "encryption_algorithms_server_to_client string",         "ssh.encryption_algorithms_server_to_client",
-        FT_STRINGZ, BASE_NONE, NULL, 0x0,
-        "SSH encryption_algorithms_server_to_client string", HFILL }},
-
-    { &hf_ssh_mac_algorithms_client_to_server,
-      { "mac_algorithms_client_to_server string",         "ssh.mac_algorithms_client_to_server",
-        FT_STRINGZ, BASE_NONE, NULL, 0x0,
-        "SSH mac_algorithms_client_to_server string", HFILL }},
-
-    { &hf_ssh_mac_algorithms_server_to_client,
-      { "mac_algorithms_server_to_client string",         "ssh.mac_algorithms_server_to_client",
-        FT_STRINGZ, BASE_NONE, NULL, 0x0,
-        "SSH mac_algorithms_server_to_client string", HFILL }},
-
-    { &hf_ssh_compression_algorithms_client_to_server,
-      { "compression_algorithms_client_to_server string",         "ssh.compression_algorithms_client_to_server",
-        FT_STRINGZ, BASE_NONE, NULL, 0x0,
-        "SSH compression_algorithms_client_to_server string", HFILL }},
-
-    { &hf_ssh_compression_algorithms_server_to_client,
-      { "compression_algorithms_server_to_client string",         "ssh.compression_algorithms_server_to_client",
-        FT_STRINGZ, BASE_NONE, NULL, 0x0,
-        "SSH compression_algorithms_server_to_client string", HFILL }},
-
-    { &hf_ssh_languages_client_to_server,
-      { "languages_client_to_server string",         "ssh.languages_client_to_server",
-        FT_STRINGZ, BASE_NONE, NULL, 0x0,
-        "SSH languages_client_to_server string", HFILL }},
-
-    { &hf_ssh_languages_server_to_client,
-      { "languages_server_to_client string",         "ssh.languages_server_to_client",
-        FT_STRINGZ, BASE_NONE, NULL, 0x0,
-        "SSH languages_server_to_client string", HFILL }},
-
-    { &hf_ssh_kex_algorithms_length,
-      { "kex_algorithms length",         "ssh.kex_algorithms_length",
-        FT_UINT32, BASE_DEC, NULL, 0x0,
-        "SSH kex_algorithms length", HFILL }},
-
-    { &hf_ssh_server_host_key_algorithms_length,
-      { "server_host_key_algorithms length",         "ssh.server_host_key_algorithms_length",
-        FT_UINT32, BASE_DEC, NULL, 0x0,
-        "SSH server_host_key_algorithms length", HFILL }},
-
-    { &hf_ssh_encryption_algorithms_client_to_server_length,
-      { "encryption_algorithms_client_to_server length",         "ssh.encryption_algorithms_client_to_server_length",
-        FT_UINT32, BASE_DEC, NULL, 0x0,
-        "SSH encryption_algorithms_client_to_server length", HFILL }},
-
-    { &hf_ssh_encryption_algorithms_server_to_client_length,
-      { "encryption_algorithms_server_to_client length",         "ssh.encryption_algorithms_server_to_client_length",
-        FT_UINT32, BASE_DEC, NULL, 0x0,
-        "SSH encryption_algorithms_server_to_client length", HFILL }},
-
-    { &hf_ssh_mac_algorithms_client_to_server_length,
-      { "mac_algorithms_client_to_server length",         "ssh.mac_algorithms_client_to_server_length",
-        FT_UINT32, BASE_DEC, NULL, 0x0,
-        "SSH mac_algorithms_client_to_server length", HFILL }},
-
-    { &hf_ssh_mac_algorithms_server_to_client_length,
-      { "mac_algorithms_server_to_client length",         "ssh.mac_algorithms_server_to_client_length",
-        FT_UINT32, BASE_DEC, NULL, 0x0,
-        "SSH mac_algorithms_server_to_client length", HFILL }},
-
-    { &hf_ssh_compression_algorithms_client_to_server_length,
-      { "compression_algorithms_client_to_server length",         "ssh.compression_algorithms_client_to_server_length",
-        FT_UINT32, BASE_DEC, NULL, 0x0,
-        "SSH compression_algorithms_client_to_server length", HFILL }},
-
-    { &hf_ssh_compression_algorithms_server_to_client_length,
-      { "compression_algorithms_server_to_client length",         "ssh.compression_algorithms_server_to_client_length",
-        FT_UINT32, BASE_DEC, NULL, 0x0,
-        "SSH compression_algorithms_server_to_client length", HFILL }},
-
-    { &hf_ssh_languages_client_to_server_length,
-      { "languages_client_to_server length",         "ssh.languages_client_to_server_length",
-        FT_UINT32, BASE_DEC, NULL, 0x0,
-        "SSH languages_client_to_server length", HFILL }},
-
-    { &hf_ssh_languages_server_to_client_length,
-      { "languages_server_to_client length",         "ssh.languages_server_to_client_length",
-        FT_UINT32, BASE_DEC, NULL, 0x0,
-        "SSH languages_server_to_client length", HFILL }},
-  	};
-
-  	static gint *ett[] = {
-    		&ett_ssh,
+	static hf_register_info hf[] = {
+		{ &hf_ssh_packet_length,
+		  { "Packet Length",      "ssh.packet_length",
+		    FT_UINT32, BASE_DEC, NULL,  0x0,
+		    "SSH packet length", HFILL }},
+
+		{ &hf_ssh_padding_length,
+		  { "Padding Length",  "ssh.padding_length",
+		    FT_UINT8, BASE_DEC, NULL, 0x0,
+		    "SSH Packet Number", HFILL }},
+
+		{ &hf_ssh_msg_code,
+		  { "Message Code",  "ssh.message_code",
+		    FT_UINT8, BASE_DEC, NULL, 0x0,
+		    "SSH Message Code", HFILL }},
+
+		{ &hf_ssh_mpint_g,
+		  { "DH base (G)",  "ssh.dh.g",
+		    FT_BYTES, BASE_NONE, NULL, 0x0,
+		    "SSH DH base (G)", HFILL }},
+
+		{ &hf_ssh_mpint_p,
+		  { "DH modulus (P)",  "ssh.dh.p",
+		    FT_BYTES, BASE_NONE, NULL, 0x0,
+		    "SSH DH modulus (P)", HFILL }},
+
+		{ &hf_ssh_mpint_e,
+		  { "DH client e",  "ssh.dh.e",
+		    FT_BYTES, BASE_NONE, NULL, 0x0,
+		    "SSH DH client e", HFILL }},
+
+		{ &hf_ssh_mpint_f,
+		  { "DH server f",  "ssh.dh.f",
+		    FT_BYTES, BASE_NONE, NULL, 0x0,
+		    "SSH DH server f", HFILL }},
+
+		{ &hf_ssh_mpint_length,
+		  { "Multi Precision Integer Length",      "ssh.mpint_length",
+		    FT_UINT32, BASE_DEC, NULL,  0x0,
+		    "SSH mpint length", HFILL }},
+
+		{ &hf_ssh_kexdh_host_key,
+		  { "KEX DH host key",         "ssh.kexdh.host_key",
+		    FT_BYTES, BASE_NONE, NULL, 0x0,
+		    "SSH KEX DH host key", HFILL }},
+
+		{ &hf_ssh_kexdh_h_sig,
+		  { "KEX DH H signature",         "ssh.kexdh.h_sig",
+		    FT_BYTES, BASE_NONE, NULL, 0x0,
+		    "SSH KEX DH H signature", HFILL }},
+
+		{ &hf_ssh_kexdh_host_key_length,
+		  { "KEX DH host key length",         "ssh.kexdh.host_key_length",
+		    FT_UINT32, BASE_DEC, NULL, 0x0,
+		    "SSH KEX DH host key length", HFILL }},
+
+		{ &hf_ssh_kexdh_h_sig_length,
+		  { "KEX DH H signature length",         "ssh.kexdh.h_sig_length",
+		    FT_UINT32, BASE_DEC, NULL, 0x0,
+		    "SSH KEX DH H signature length", HFILL }},
+
+		{ &hf_ssh_encrypted_packet,
+		  { "Encrypted Packet",  "ssh.encrypted_packet",
+		    FT_BYTES, BASE_NONE, NULL, 0x0,
+		    "SSH Protocol Packet", HFILL }},
+
+		{ &hf_ssh_protocol,
+		  { "Protocol",  "ssh.protocol",
+		    FT_STRING, BASE_NONE, NULL, 0x0,
+		    "SSH Protocol", HFILL }},
+
+		{ &hf_ssh_cookie,
+		  { "Cookie",  "ssh.cookie",
+		    FT_BYTES, BASE_NONE, NULL, 0x0,
+		    "SSH Cookie", HFILL }},
+
+		{ &hf_ssh_kex_first_packet_follows,
+		  { "KEX First Packet Follows",      "ssh.kex.first_packet_follows",
+		    FT_UINT8, BASE_DEC, NULL, 0x0,
+		    "SSH KEX Fist Packet Follows", HFILL }},
+
+		{ &hf_ssh_kex_reserved,
+		  { "Reserved",  "ssh.kex.reserved",
+		    FT_BYTES, BASE_NONE, NULL, 0x0,
+		    "SSH Protocol KEX Reserved", HFILL }},
+
+		{ &hf_ssh_dh_gex_min,
+		  { "DH GEX Min",  "ssh.dh_gex.min",
+		    FT_BYTES, BASE_NONE, NULL, 0x0,
+		    "SSH DH GEX Minimum", HFILL }},
+
+		{ &hf_ssh_dh_gex_nbits,
+		  { "DH GEX Numbers of Bits",  "ssh.dh_gex.nbits",
+		    FT_BYTES, BASE_NONE, NULL, 0x0,
+		    "SSH DH GEX Number of Bits", HFILL }},
+
+		{ &hf_ssh_dh_gex_max,
+		  { "DH GEX Max",  "ssh.dh_gex.max",
+		    FT_BYTES, BASE_NONE, NULL, 0x0,
+		    "SSH DH GEX Maximum", HFILL }},
+
+		{ &hf_ssh_payload,
+		  { "Payload",  "ssh.payload",
+		    FT_BYTES, BASE_NONE, NULL, 0x0,
+		    "SSH Payload", HFILL }},
+
+		{ &hf_ssh_padding_string,
+		  { "Padding String",  "ssh.padding_string",
+		    FT_BYTES, BASE_NONE, NULL, 0x0,
+		    "SSH Padding String", HFILL }},
+
+		{ &hf_ssh_mac_string,
+		  { "MAC",  "ssh.mac",
+		    FT_BYTES, BASE_NONE, NULL, 0x0,
+		    "SSH Protocol Packet MAC", HFILL }},
+
+		{ &hf_ssh_kex_algorithms,
+		  { "kex_algorithms string",         "ssh.kex_algorithms",
+		    FT_STRINGZ, BASE_NONE, NULL, 0x0,
+		    "SSH kex_algorithms string", HFILL }},
+
+		{ &hf_ssh_server_host_key_algorithms,
+		  { "server_host_key_algorithms string",         "ssh.server_host_key_algorithms",
+		    FT_STRINGZ, BASE_NONE, NULL, 0x0,
+		    "SSH server_host_key_algorithms string", HFILL }},
+
+		{ &hf_ssh_encryption_algorithms_client_to_server,
+		  { "encryption_algorithms_client_to_server string",         "ssh.encryption_algorithms_client_to_server",
+		    FT_STRINGZ, BASE_NONE, NULL, 0x0,
+		    "SSH encryption_algorithms_client_to_server string", HFILL }},
+
+		{ &hf_ssh_encryption_algorithms_server_to_client,
+		  { "encryption_algorithms_server_to_client string",         "ssh.encryption_algorithms_server_to_client",
+		    FT_STRINGZ, BASE_NONE, NULL, 0x0,
+		    "SSH encryption_algorithms_server_to_client string", HFILL }},
+
+		{ &hf_ssh_mac_algorithms_client_to_server,
+		  { "mac_algorithms_client_to_server string",         "ssh.mac_algorithms_client_to_server",
+		    FT_STRINGZ, BASE_NONE, NULL, 0x0,
+		    "SSH mac_algorithms_client_to_server string", HFILL }},
+
+		{ &hf_ssh_mac_algorithms_server_to_client,
+		  { "mac_algorithms_server_to_client string",         "ssh.mac_algorithms_server_to_client",
+		    FT_STRINGZ, BASE_NONE, NULL, 0x0,
+		    "SSH mac_algorithms_server_to_client string", HFILL }},
+
+		{ &hf_ssh_compression_algorithms_client_to_server,
+		  { "compression_algorithms_client_to_server string",         "ssh.compression_algorithms_client_to_server",
+		    FT_STRINGZ, BASE_NONE, NULL, 0x0,
+		    "SSH compression_algorithms_client_to_server string", HFILL }},
+
+		{ &hf_ssh_compression_algorithms_server_to_client,
+		  { "compression_algorithms_server_to_client string",         "ssh.compression_algorithms_server_to_client",
+		    FT_STRINGZ, BASE_NONE, NULL, 0x0,
+		    "SSH compression_algorithms_server_to_client string", HFILL }},
+
+		{ &hf_ssh_languages_client_to_server,
+		  { "languages_client_to_server string",         "ssh.languages_client_to_server",
+		    FT_STRINGZ, BASE_NONE, NULL, 0x0,
+		    "SSH languages_client_to_server string", HFILL }},
+
+		{ &hf_ssh_languages_server_to_client,
+		  { "languages_server_to_client string",         "ssh.languages_server_to_client",
+		    FT_STRINGZ, BASE_NONE, NULL, 0x0,
+		    "SSH languages_server_to_client string", HFILL }},
+
+		{ &hf_ssh_kex_algorithms_length,
+		  { "kex_algorithms length",         "ssh.kex_algorithms_length",
+		    FT_UINT32, BASE_DEC, NULL, 0x0,
+		    "SSH kex_algorithms length", HFILL }},
+
+		{ &hf_ssh_server_host_key_algorithms_length,
+		  { "server_host_key_algorithms length",         "ssh.server_host_key_algorithms_length",
+		    FT_UINT32, BASE_DEC, NULL, 0x0,
+		    "SSH server_host_key_algorithms length", HFILL }},
+
+		{ &hf_ssh_encryption_algorithms_client_to_server_length,
+		  { "encryption_algorithms_client_to_server length",         "ssh.encryption_algorithms_client_to_server_length",
+		    FT_UINT32, BASE_DEC, NULL, 0x0,
+		    "SSH encryption_algorithms_client_to_server length", HFILL }},
+
+		{ &hf_ssh_encryption_algorithms_server_to_client_length,
+		  { "encryption_algorithms_server_to_client length",         "ssh.encryption_algorithms_server_to_client_length",
+		    FT_UINT32, BASE_DEC, NULL, 0x0,
+		    "SSH encryption_algorithms_server_to_client length", HFILL }},
+
+		{ &hf_ssh_mac_algorithms_client_to_server_length,
+		  { "mac_algorithms_client_to_server length",         "ssh.mac_algorithms_client_to_server_length",
+		    FT_UINT32, BASE_DEC, NULL, 0x0,
+		    "SSH mac_algorithms_client_to_server length", HFILL }},
+
+		{ &hf_ssh_mac_algorithms_server_to_client_length,
+		  { "mac_algorithms_server_to_client length",         "ssh.mac_algorithms_server_to_client_length",
+		    FT_UINT32, BASE_DEC, NULL, 0x0,
+		    "SSH mac_algorithms_server_to_client length", HFILL }},
+
+		{ &hf_ssh_compression_algorithms_client_to_server_length,
+		  { "compression_algorithms_client_to_server length",         "ssh.compression_algorithms_client_to_server_length",
+		    FT_UINT32, BASE_DEC, NULL, 0x0,
+		    "SSH compression_algorithms_client_to_server length", HFILL }},
+
+		{ &hf_ssh_compression_algorithms_server_to_client_length,
+		  { "compression_algorithms_server_to_client length",         "ssh.compression_algorithms_server_to_client_length",
+		    FT_UINT32, BASE_DEC, NULL, 0x0,
+		    "SSH compression_algorithms_server_to_client length", HFILL }},
+
+		{ &hf_ssh_languages_client_to_server_length,
+		  { "languages_client_to_server length",         "ssh.languages_client_to_server_length",
+		    FT_UINT32, BASE_DEC, NULL, 0x0,
+		    "SSH languages_client_to_server length", HFILL }},
+
+		{ &hf_ssh_languages_server_to_client_length,
+		  { "languages_server_to_client length",         "ssh.languages_server_to_client_length",
+		    FT_UINT32, BASE_DEC, NULL, 0x0,
+		    "SSH languages_server_to_client length", HFILL }},
+	};
+
+	static gint *ett[] = {
+		&ett_ssh,
 		&ett_key_exchange,
 		&ett_ssh1,
 		&ett_ssh2,
 		&ett_key_init
-  	};
-  	module_t *ssh_module;
+	};
+	module_t *ssh_module;
 
-  	proto_ssh = proto_register_protocol("SSH Protocol", "SSH", "ssh");
+	proto_ssh = proto_register_protocol("SSH Protocol", "SSH", "ssh");
 	proto_register_field_array(proto_ssh, hf, array_length(hf));
-  	proto_register_subtree_array(ett, array_length(ett));
+	proto_register_subtree_array(ett, array_length(ett));
 
-  	ssh_module = prefs_register_protocol(proto_ssh, NULL);
+	ssh_module = prefs_register_protocol(proto_ssh, NULL);
 	prefs_register_bool_preference(ssh_module, "desegment_buffers",
-		"Reassemble SSH buffers spanning multiple TCP segments",
-		"Whether the SSH dissector should reassemble SSH buffers spanning multiple TCP segments. "
-		"To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.",
-		&ssh_desegment);
+				       "Reassemble SSH buffers spanning multiple TCP segments",
+				       "Whether the SSH dissector should reassemble SSH buffers spanning multiple TCP segments. "
+				       "To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.",
+				       &ssh_desegment);
 }
 
 void
diff --git a/epan/dissectors/packet-tte.c b/epan/dissectors/packet-tte.c
index 17075e9f94..aef5139334 100644
--- a/epan/dissectors/packet-tte.c
+++ b/epan/dissectors/packet-tte.c
@@ -98,15 +98,14 @@ dissect_tte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         tte_tree = proto_item_add_subtree(tte_root_item, ett_tte);
 
         tte_macdest_item = proto_tree_add_item(tte_tree,
-            hf_eth_dst, tvb, 0, TTE_MAC_LENGTH, FALSE);
+            hf_eth_dst, tvb, 0, TTE_MAC_LENGTH, ENC_NA);
 
         proto_tree_add_item(tte_tree,
-            hf_eth_src, tvb, TTE_MAC_LENGTH, TTE_MAC_LENGTH, FALSE);
+            hf_eth_src, tvb, TTE_MAC_LENGTH, TTE_MAC_LENGTH, ENC_NA);
 
         proto_tree_add_item(tte_tree,
             hf_eth_type, tvb, TTE_MAC_LENGTH*2, TTE_ETHERTYPE_LENGTH,
-
-            FALSE);
+            ENC_BIG_ENDIAN);
 
         tte_macdest_tree = proto_item_add_subtree(tte_macdest_item,
             ett_tte_macdest);