More conversions of proto_tree_add_item() 'encoding' arg

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39467 f5534014-38df-0310-8fa8-9805f1628bb7

6 files changed, 179 insertions, 179 deletions

diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c
index f66c37ddc6..ca207fe3cb 100644
--- a/epan/dissectors/packet-iax2.c
+++ b/epan/dissectors/packet-iax2.c
@@ -1123,7 +1123,7 @@ static proto_item *dissect_datetime_ie(tvbuff_t *tvb, guint32 offset, proto_tree
   guint32 ie_val;
   nstime_t datetime;
 
-  proto_tree_add_item (ies_tree, hf_iax2_ies[IAX_IE_DATETIME], tvb, offset + 2, 4, FALSE);
+  proto_tree_add_item (ies_tree, hf_iax2_ies[IAX_IE_DATETIME], tvb, offset + 2, 4, ENC_BIG_ENDIAN);
   ie_val = tvb_get_ntohl(tvb, offset+2);
 
   /* who's crazy idea for a time encoding was this? */
diff --git a/epan/dissectors/packet-lmp.c b/epan/dissectors/packet-lmp.c
index 8b7c5e1441..34712d8815 100644
--- a/epan/dissectors/packet-lmp.c
+++ b/epan/dissectors/packet-lmp.c
@@ -1018,7 +1018,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		  l = tvb_get_ntohs(tvb, offset2);
 		  ti2 = proto_tree_add_item(lmp_object_tree,
 					    hf_lmp_filter[LMPF_VAL_BEGIN_VERIFY_FLAGS],
-					    tvb, offset2, 2, FALSE);
+					    tvb, offset2, 2, ENC_BIG_ENDIAN);
 
 		  lmp_flags_tree = proto_item_add_subtree(ti2,
 							  lmp_subtree[LMP_TREE_BEGIN_VERIFY_FLAGS]);
@@ -1036,7 +1036,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 				      tvb_get_ntohl(tvb, offset2+4));
 		  proto_tree_add_item(lmp_object_tree,
 				      hf_lmp_filter[LMPF_VAL_BEGIN_VERIFY_ENCTYPE],
-				      tvb, offset2+8, 1, FALSE);
+				      tvb, offset2+8, 1, ENC_BIG_ENDIAN);
 		  proto_tree_add_text(lmp_object_tree, tvb, offset2+10, 2,
 				      "Verify Transport Mechanism: 0x%0x",
 				      tvb_get_ntohs(tvb, offset2+10));
@@ -1123,10 +1123,10 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 					 tvb_ip_to_str(tvb, offset2+8));
 		  proto_tree_add_item(lmp_object_tree,
 				      hf_lmp_filter[LMPF_VAL_TE_LINK_LOCAL_IPV4],
-				      tvb, offset2+4, 4, FALSE);
+				      tvb, offset2+4, 4, ENC_BIG_ENDIAN);
 		  proto_tree_add_item(lmp_object_tree,
 				      hf_lmp_filter[LMPF_VAL_TE_LINK_REMOTE_IPV4],
-				      tvb, offset2+8, 4, FALSE);
+				      tvb, offset2+8, 4, ENC_BIG_ENDIAN);
 		  break;
 
 	      case 2:
@@ -1148,11 +1148,11 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 		  proto_tree_add_item(lmp_object_tree,
 				      hf_lmp_filter[LMPF_VAL_TE_LINK_LOCAL_UNNUM],
-				      tvb, offset2+4, 4, FALSE);
+				      tvb, offset2+4, 4, ENC_BIG_ENDIAN);
 
 		  proto_tree_add_item(lmp_object_tree,
 				      hf_lmp_filter[LMPF_VAL_TE_LINK_REMOTE_UNNUM],
-				      tvb, offset2+8, 4, FALSE);
+				      tvb, offset2+8, 4, ENC_BIG_ENDIAN);
 		  break;
 	      default:
 		  proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
@@ -1188,11 +1188,11 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 		  proto_tree_add_item(lmp_object_tree,
 				      hf_lmp_filter[LMPF_VAL_DATA_LINK_LOCAL_IPV4],
-				      tvb, offset2+4, 4, FALSE);
+				      tvb, offset2+4, 4, ENC_BIG_ENDIAN);
 
 		  proto_tree_add_item(lmp_object_tree,
 				      hf_lmp_filter[LMPF_VAL_DATA_LINK_REMOTE_IPV4],
-				      tvb, offset2+8, 4, FALSE);
+				      tvb, offset2+8, 4, ENC_BIG_ENDIAN);
 		  l = 12;
 		  break;
 
@@ -1215,9 +1215,9 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 					 tvb_get_ntohl(tvb, offset2+8));
 		  proto_tree_add_item(lmp_object_tree,
 				      hf_lmp_filter[LMPF_VAL_DATA_LINK_LOCAL_UNNUM],
-				      tvb, offset2+4, 4, FALSE);
+				      tvb, offset2+4, 4, ENC_BIG_ENDIAN);
 		  proto_tree_add_item(lmp_object_tree, hf_lmp_filter[LMPF_VAL_DATA_LINK_REMOTE_UNNUM],
-				      tvb, offset2+8, 4, FALSE);
+				      tvb, offset2+8, 4, ENC_BIG_ENDIAN);
 		  l = 12;
 		  break;
 
@@ -1231,7 +1231,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		  mylen = tvb_get_guint8(tvb, offset2+l+1);
 		  ti2 = proto_tree_add_item(lmp_object_tree,
 					    hf_lmp_filter[LMPF_VAL_DATA_LINK_SUBOBJ],
-					    tvb, offset2+l, mylen, FALSE);
+					    tvb, offset2+l, mylen, ENC_NA);
 		  lmp_subobj_tree = proto_item_add_subtree(ti2,
 							   lmp_subtree[LMP_TREE_DATA_LINK_SUBOBJ]);
 		  proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l, 1,
@@ -1255,10 +1255,10 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 					  tvb_get_ntohieee_float(tvb, offset2+l+8)*8/1000000);
 		      proto_tree_add_item(lmp_subobj_tree,
 					  hf_lmp_filter[LMPF_VAL_DATA_LINK_SUBOBJ_SWITCHING_TYPE],
-					  tvb, offset2+l+2, 1, FALSE);
+					  tvb, offset2+l+2, 1, ENC_BIG_ENDIAN);
 		      proto_tree_add_item(lmp_subobj_tree,
 					  hf_lmp_filter[LMPF_VAL_DATA_LINK_SUBOBJ_LSP_ENCODING],
-					  tvb, offset2+l+3, 1, FALSE);
+					  tvb, offset2+l+3, 1, ENC_BIG_ENDIAN);
 		      proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l+4, 4,
 					  "Minimum Reservable Bandwidth: %.3f Mbps",
 					  tvb_get_ntohieee_float(tvb, offset2+l+4)*8/1000000);
@@ -1750,7 +1750,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 		  proto_tree_add_item(lmp_object_tree,
 				      hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_INTERFACE_ID],
-				      tvb, offset2+12, 4, FALSE);
+				      tvb, offset2+12, 4, ENC_BIG_ENDIAN);
 
 		  break;
 
@@ -1865,28 +1865,28 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		  proto_item_append_text(ti, ": IPv4");
 		  proto_tree_add_item(lmp_object_tree,
 				      hf_lmp_filter[LMPF_VAL_LOCAL_LAD_INFO_NODE_ID],
-				      tvb, offset2, 4, FALSE);
+				      tvb, offset2, 4, ENC_BIG_ENDIAN);
 		  proto_tree_add_item(lmp_object_tree,
 				      hf_lmp_filter[LMPF_VAL_LOCAL_LAD_INFO_AREA_ID],
-				      tvb, offset2+4, 4, FALSE);
+				      tvb, offset2+4, 4, ENC_BIG_ENDIAN);
 		  proto_tree_add_item(lmp_object_tree,
 				      hf_lmp_filter[LMPF_VAL_LOCAL_LAD_INFO_TE_LINK_ID],
-				      tvb, offset2+8, 4, FALSE);
+				      tvb, offset2+8, 4, ENC_BIG_ENDIAN);
 		  proto_tree_add_item(lmp_object_tree,
 				      hf_lmp_filter[LMPF_VAL_LOCAL_LAD_INFO_COMPONENT_ID],
-				      tvb, offset2+12, 4, FALSE);
+				      tvb, offset2+12, 4, ENC_BIG_ENDIAN);
 		  proto_tree_add_item(lmp_object_tree,
 				      hf_lmp_filter[LMPF_VAL_LOCAL_LAD_INFO_SC_PC_ID],
-				      tvb, offset2+16, 4, FALSE);
+				      tvb, offset2+16, 4, ENC_BIG_ENDIAN);
 		  proto_tree_add_item(lmp_object_tree,
 				      hf_lmp_filter[LMPF_VAL_LOCAL_LAD_INFO_SC_PC_ADDR],
-				      tvb, offset2+20, 4, FALSE);
+				      tvb, offset2+20, 4, ENC_BIG_ENDIAN);
 		  l = 24;
 		  while (l < obj_length - 4) {
 		    mylen = tvb_get_guint8(tvb, offset2+l+1);
 		    ti2 = proto_tree_add_item(lmp_object_tree,
 					    hf_lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ],
-					    tvb, offset2+l, mylen, FALSE);
+					    tvb, offset2+l, mylen, ENC_NA);
 		    lmp_subobj_tree = proto_item_add_subtree(ti2,
 							     lmp_subtree[LMP_TREE_LAD_INFO_SUBOBJ]);
 		    proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l, 1,
@@ -1912,13 +1912,13 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 					    tvb_ip_to_str(tvb, offset2+l+12));
 			proto_tree_add_item(lmp_subobj_tree,
 					    hf_lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_PRI_AREA_ID],
-					    tvb, offset2+l+4, 4, FALSE);
+					    tvb, offset2+l+4, 4, ENC_BIG_ENDIAN);
 			proto_tree_add_item(lmp_subobj_tree,
 					    hf_lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_PRI_RC_PC_ID],
-					    tvb, offset2+l+8, 4, FALSE);
+					    tvb, offset2+l+8, 4, ENC_BIG_ENDIAN);
 			proto_tree_add_item(lmp_subobj_tree,
 					    hf_lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_PRI_RC_PC_ADDR],
-					    tvb, offset2+l+12, 4, FALSE);
+					    tvb, offset2+l+12, 4, ENC_BIG_ENDIAN);
 			break;
 
 		      case 251:
@@ -1930,13 +1930,13 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 					    tvb_ip_to_str(tvb, offset2+l+12));
 			proto_tree_add_item(lmp_subobj_tree,
 					    hf_lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_SEC_AREA_ID],
-					    tvb, offset2+l+4, 4, FALSE);
+					    tvb, offset2+l+4, 4, ENC_BIG_ENDIAN);
 			proto_tree_add_item(lmp_subobj_tree,
 					    hf_lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_SEC_RC_PC_ID],
-					    tvb, offset2+l+8, 4, FALSE);
+					    tvb, offset2+l+8, 4, ENC_BIG_ENDIAN);
 			proto_tree_add_item(lmp_subobj_tree,
 					    hf_lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_SEC_RC_PC_ADDR],
-					    tvb, offset2+l+12, 4, FALSE);
+					    tvb, offset2+l+12, 4, ENC_BIG_ENDIAN);
 			break;
 
 		      case 252:
@@ -1948,10 +1948,10 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 						       gmpls_lsp_enc_rvals, "Unknown (%d)"));
 			proto_tree_add_item(lmp_subobj_tree,
 					    hf_lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_SWITCHING_TYPE],
-					    tvb, offset2+l+4, 1, FALSE);
+					    tvb, offset2+l+4, 1, ENC_BIG_ENDIAN);
 			proto_tree_add_item(lmp_subobj_tree,
 					    hf_lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_LSP_ENCODING],
-					    tvb, offset2+l+5, 1, FALSE);
+					    tvb, offset2+l+5, 1, ENC_BIG_ENDIAN);
 
 			for (j = 0; j < (mylen - 8) / 4; j++) {
 			  proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l+8+(j*4), 4,
diff --git a/epan/dissectors/packet-mikey.c b/epan/dissectors/packet-mikey.c
index 7291bf8b7d..3ec4fb06bc 100644
--- a/epan/dissectors/packet-mikey.c
+++ b/epan/dissectors/packet-mikey.c
@@ -589,7 +589,7 @@ mikey_dissector_lookup(const struct mikey_dissector_entry *map, int type)
 static void
 add_next_payload(tvbuff_t *tvb, proto_tree *tree, int offset)
 {
-	proto_tree_add_item(tree, hf_mikey[POS_NEXT_PAYLOAD], tvb, offset, 1, FALSE);
+	proto_tree_add_item(tree, hf_mikey[POS_NEXT_PAYLOAD], tvb, offset, 1, ENC_BIG_ENDIAN);
 }
 
 
@@ -612,9 +612,9 @@ dissect_payload_cs_id_srtp(mikey_t *mikey _U_, tvbuff_t *tvb, packet_info *pinfo
 		id_ti = proto_tree_add_none_format(tree, hf_mikey[POS_ID_SRTP], tvb, 0, 9, "SRTP ID: Policy: %d, SSRC: 0x%x, ROC: 0x%x", no, ssrc, roc);
 		id_tree = proto_item_add_subtree(id_ti, ett_mikey_hdr_id);
 
-		proto_tree_add_item(id_tree, hf_mikey[POS_ID_SRTP_NO], tvb, 0, 1, FALSE);
-		proto_tree_add_item(id_tree, hf_mikey[POS_ID_SRTP_SSRC], tvb, 1, 4, FALSE);
-		proto_tree_add_item(id_tree, hf_mikey[POS_ID_SRTP_ROC], tvb, 5, 4, FALSE);
+		proto_tree_add_item(id_tree, hf_mikey[POS_ID_SRTP_NO], tvb, 0, 1, ENC_BIG_ENDIAN);
+		proto_tree_add_item(id_tree, hf_mikey[POS_ID_SRTP_SSRC], tvb, 1, 4, ENC_BIG_ENDIAN);
+		proto_tree_add_item(id_tree, hf_mikey[POS_ID_SRTP_ROC], tvb, 5, 4, ENC_BIG_ENDIAN);
 	}
 	return 9;
 }
@@ -656,21 +656,21 @@ dissect_payload_hdr(mikey_t *mikey, tvbuff_t *tvb, packet_info *pinfo, proto_tre
 
 	if (tree) {
 		proto_tree_add_item(tree, hf_mikey[POS_HDR_VERSION],
-					tvb, offset+0, 1, FALSE);
+					tvb, offset+0, 1, ENC_BIG_ENDIAN);
 
-		proto_tree_add_item(tree, hf_mikey[POS_HDR_DATA_TYPE], tvb, offset+1, 1, FALSE);
+		proto_tree_add_item(tree, hf_mikey[POS_HDR_DATA_TYPE], tvb, offset+1, 1, ENC_BIG_ENDIAN);
 		parent = proto_tree_get_parent(tree);
 		proto_item_append_text(parent, " Type: %s", val_to_str(mikey->type, data_type_vals, "Unknown"));
 
 		add_next_payload(tvb, tree, offset+2);
 
-		proto_tree_add_item(tree, hf_mikey[POS_HDR_V], tvb, offset+3, 1, FALSE);
-		proto_tree_add_item(tree, hf_mikey[POS_HDR_PRF_FUNC], tvb, offset+3, 1, FALSE);
+		proto_tree_add_item(tree, hf_mikey[POS_HDR_V], tvb, offset+3, 1, ENC_BIG_ENDIAN);
+		proto_tree_add_item(tree, hf_mikey[POS_HDR_PRF_FUNC], tvb, offset+3, 1, ENC_BIG_ENDIAN);
 
-		proto_tree_add_item(tree, hf_mikey[POS_HDR_CSB_ID], tvb, offset+4, 4, FALSE);
+		proto_tree_add_item(tree, hf_mikey[POS_HDR_CSB_ID], tvb, offset+4, 4, ENC_BIG_ENDIAN);
 
-		proto_tree_add_item(tree, hf_mikey[POS_HDR_CS_COUNT], tvb, offset+8, 1, FALSE);
-		proto_tree_add_item(tree, hf_mikey[POS_HDR_CS_ID_MAP_TYPE], tvb, offset+9, 1, FALSE);
+		proto_tree_add_item(tree, hf_mikey[POS_HDR_CS_COUNT], tvb, offset+8, 1, ENC_BIG_ENDIAN);
+		proto_tree_add_item(tree, hf_mikey[POS_HDR_CS_ID_MAP_TYPE], tvb, offset+9, 1, ENC_BIG_ENDIAN);
 	}
 
 	offset += 10;
@@ -709,21 +709,21 @@ dissect_payload_kemac(mikey_t *mikey, tvbuff_t *tvb, packet_info *pinfo, proto_t
 	mac_alg = tvb_get_guint8(tvb, offset+4+encr_length);
 
 	if (tree) {
-		proto_tree_add_item(tree, hf_mikey[POS_KEMAC_ENCR_ALG], tvb, 1, 1, FALSE);
-		proto_tree_add_item(tree, hf_mikey[POS_KEMAC_ENCR_DATA_LEN], tvb, 2, 2, FALSE);
+		proto_tree_add_item(tree, hf_mikey[POS_KEMAC_ENCR_ALG], tvb, 1, 1, ENC_BIG_ENDIAN);
+		proto_tree_add_item(tree, hf_mikey[POS_KEMAC_ENCR_DATA_LEN], tvb, 2, 2, ENC_BIG_ENDIAN);
 		/* TODO: Add key decode for MIKEY_TYPE_PK_INIT and MIKEY_TYPE_RSA_R_RESP with NULL encryption */
 		if (encr_alg == ENCR_NULL && mikey->type == MIKEY_TYPE_PSK_INIT && encr_length > 0) {
 			/* We can decode easily the Key Data if NULL encryption is used */
-			key_data_item = proto_tree_add_item(tree, hf_mikey_pl[PL_KEY_DATA], tvb, 4, encr_length, FALSE);
+			key_data_item = proto_tree_add_item(tree, hf_mikey_pl[PL_KEY_DATA], tvb, 4, encr_length, ENC_NA);
 			key_data_tree = proto_item_add_subtree(key_data_item, ett_mikey_enc_data);
 
 			sub_tvb = tvb_new_subset(tvb, offset+4, encr_length, encr_length);
 			dissect_payload(PL_KEY_DATA, mikey, sub_tvb, pinfo, key_data_tree);
 		} else {
 			/* If Key Data is encrypted, show only the encr_data */
-			proto_tree_add_item(tree, hf_mikey[POS_KEMAC_ENCR_DATA], tvb, 4, encr_length, FALSE);
+			proto_tree_add_item(tree, hf_mikey[POS_KEMAC_ENCR_DATA], tvb, 4, encr_length, ENC_NA);
 		}
-		proto_tree_add_item(tree, hf_mikey[POS_KEMAC_MAC_ALG], tvb, 4+encr_length, 1, FALSE);
+		proto_tree_add_item(tree, hf_mikey[POS_KEMAC_MAC_ALG], tvb, 4+encr_length, 1, ENC_BIG_ENDIAN);
 	}
 
 	switch (mac_alg) {
@@ -739,7 +739,7 @@ dissect_payload_kemac(mikey_t *mikey, tvbuff_t *tvb, packet_info *pinfo, proto_t
 
 	tvb_ensure_bytes_exist(tvb, offset+4+encr_length+1, mac_length);
 	if (tree) {
-		proto_tree_add_item(tree, hf_mikey[POS_KEMAC_MAC], tvb, 4+encr_length+1, mac_length, FALSE);
+		proto_tree_add_item(tree, hf_mikey[POS_KEMAC_MAC], tvb, 4+encr_length+1, mac_length, ENC_NA);
 	}
 
 	return 4+encr_length+1+mac_length;
@@ -756,14 +756,14 @@ dissect_payload_pke(mikey_t *mikey _U_, tvbuff_t *tvb, packet_info *pinfo _U_, p
 		tvb_get_guint8(tvb, offset+2);
 
 	if (tree) {
-		proto_tree_add_item(tree, hf_mikey[POS_PKE_C], tvb, 1, 2, FALSE);
+		proto_tree_add_item(tree, hf_mikey[POS_PKE_C], tvb, 1, 2, ENC_BIG_ENDIAN);
 
-		proto_tree_add_item(tree, hf_mikey[POS_PKE_DATA_LEN], tvb, 1, 2, FALSE);
+		proto_tree_add_item(tree, hf_mikey[POS_PKE_DATA_LEN], tvb, 1, 2, ENC_BIG_ENDIAN);
 	}
 
 	tvb_ensure_bytes_exist(tvb, offset+3, length);
 	if (tree) {
-		proto_tree_add_item(tree, hf_mikey[POS_PKE_DATA], tvb, 3, length, FALSE);
+		proto_tree_add_item(tree, hf_mikey[POS_PKE_DATA], tvb, 3, length, ENC_NA);
 	}
 	return 3 + length;
 }
@@ -797,10 +797,10 @@ dissect_payload_dh(mikey_t *mikey _U_, tvbuff_t *tvb, packet_info *pinfo _U_, pr
 	kv = tvb_get_guint8(tvb, offset+2+dh_length) & 0x0f;
 
 	if (tree) {
-		proto_tree_add_item(tree, hf_mikey[POS_DH_GROUP], tvb, 1, 1, FALSE);
-		proto_tree_add_item(tree, hf_mikey[POS_DH_VALUE], tvb, 2, dh_length, FALSE);
-		proto_tree_add_item(tree, hf_mikey[POS_DH_RESERV], tvb, 2+dh_length, 1, FALSE);
-		proto_tree_add_item(tree, hf_mikey[POS_DH_KV], tvb, 2+dh_length, 1, FALSE);
+		proto_tree_add_item(tree, hf_mikey[POS_DH_GROUP], tvb, 1, 1, ENC_BIG_ENDIAN);
+		proto_tree_add_item(tree, hf_mikey[POS_DH_VALUE], tvb, 2, dh_length, ENC_NA);
+		proto_tree_add_item(tree, hf_mikey[POS_DH_RESERV], tvb, 2+dh_length, 1, ENC_BIG_ENDIAN);
+		proto_tree_add_item(tree, hf_mikey[POS_DH_KV], tvb, 2+dh_length, 1, ENC_BIG_ENDIAN);
 	}
 
 	if (kv != 0) {
@@ -820,13 +820,13 @@ dissect_payload_sign(mikey_t *mikey _U_, tvbuff_t *tvb, packet_info *pinfo _U_,
 	length = ((tvb_get_guint8(tvb, offset+0) & 0x0f) << 8) + tvb_get_guint8(tvb, offset+1);
 
 	if (tree) {
-		proto_tree_add_item(tree, hf_mikey[POS_SIGN_S_TYPE], tvb, 0, 2, FALSE);
+		proto_tree_add_item(tree, hf_mikey[POS_SIGN_S_TYPE], tvb, 0, 2, ENC_BIG_ENDIAN);
 		proto_tree_add_uint(tree, hf_mikey[POS_SIGNATURE_LEN], tvb, 0, 2, length);
 	}
 
 	tvb_ensure_bytes_exist(tvb, offset+2, length);
 	if (tree) {
-		proto_tree_add_item(tree, hf_mikey[POS_SIGNATURE], tvb, 2, length, FALSE);
+		proto_tree_add_item(tree, hf_mikey[POS_SIGNATURE], tvb, 2, length, ENC_NA);
 	}
 	return 2 + length;
 }
@@ -845,7 +845,7 @@ dissect_payload_t(mikey_t *mikey _U_, tvbuff_t *tvb, packet_info *pinfo _U_, pro
 	if (tree) {
 		parent = proto_tree_get_parent(tree);
 		proto_item_append_text(parent, " Type: %s", val_to_str(ts_type, ts_type_vals, "Unknown"));
-		proto_tree_add_item(tree, hf_mikey[POS_TS_TYPE], tvb, offset+1, 1, FALSE);
+		proto_tree_add_item(tree, hf_mikey[POS_TS_TYPE], tvb, offset+1, 1, ENC_BIG_ENDIAN);
 	}
 
 	switch (ts_type) {
@@ -877,13 +877,13 @@ dissect_payload_id(mikey_t *mikey _U_, tvbuff_t *tvb, packet_info *pinfo _U_, pr
 	type = tvb_get_guint8(tvb, offset+1);
 	length = tvb_get_ntohs(tvb, offset+2);
 	if (tree) {
-		proto_tree_add_item(tree, hf_mikey[POS_ID_TYPE], tvb, 1, 1, FALSE);
-		proto_tree_add_item(tree, hf_mikey[POS_ID_LEN], tvb, 2, 2, FALSE);
+		proto_tree_add_item(tree, hf_mikey[POS_ID_TYPE], tvb, 1, 1, ENC_BIG_ENDIAN);
+		proto_tree_add_item(tree, hf_mikey[POS_ID_LEN], tvb, 2, 2, ENC_BIG_ENDIAN);
 	}
 
 	tvb_ensure_bytes_exist(tvb, offset+4, length);
 	if (tree) {
-		proto_tree_add_item(tree, hf_mikey[POS_ID], tvb, 4, length, FALSE);
+		proto_tree_add_item(tree, hf_mikey[POS_ID], tvb, 4, length, ENC_ASCII|ENC_NA);
 
 		parent = proto_tree_get_parent(tree);
 		proto_item_append_text(parent, " %s: %s", val_to_str(type, id_type_vals, "Unknown"), tvb_get_ephemeral_string(tvb, 4, length));
@@ -911,8 +911,8 @@ dissect_payload_cert(mikey_t *mikey _U_, tvbuff_t *tvb, packet_info *pinfo, prot
 
 	if (tree) {
 		parent = proto_tree_get_parent(tree);
-		proto_tree_add_item(tree, hf_mikey[POS_CERT_TYPE], tvb, 1, 1, FALSE);
-		proto_tree_add_item(tree, hf_mikey[POS_CERT_LEN], tvb, 1, 2, FALSE);
+		proto_tree_add_item(tree, hf_mikey[POS_CERT_TYPE], tvb, 1, 1, ENC_BIG_ENDIAN);
+		proto_tree_add_item(tree, hf_mikey[POS_CERT_LEN], tvb, 1, 2, ENC_BIG_ENDIAN);
 
 		proto_item_append_text(parent, " Type: %s", val_to_str(type, cert_type_vals, "Unknown"));
 	}
@@ -934,7 +934,7 @@ dissect_payload_v(mikey_t *mikey _U_, tvbuff_t *tvb, packet_info *pinfo _U_, pro
 	alg = tvb_get_guint8(tvb, offset+1);
 
 	if (tree) {
-		proto_tree_add_item(tree, hf_mikey[POS_V_AUTH_ALG], tvb, 1, 1, FALSE);
+		proto_tree_add_item(tree, hf_mikey[POS_V_AUTH_ALG], tvb, 1, 1, ENC_BIG_ENDIAN);
 	}
 
 	switch (alg) {
@@ -950,7 +950,7 @@ dissect_payload_v(mikey_t *mikey _U_, tvbuff_t *tvb, packet_info *pinfo _U_, pro
 
 	tvb_ensure_bytes_exist(tvb, offset+2, length);
 	if (tree) {
-		proto_tree_add_item(tree, hf_mikey[POS_V_DATA], tvb, 2, length, FALSE);
+		proto_tree_add_item(tree, hf_mikey[POS_V_DATA], tvb, 2, length, ENC_NA);
 	}
 
 	return 2 + length;
@@ -985,9 +985,9 @@ dissect_payload_sp_param(enum sp_prot_t proto, tvbuff_t *tvb, proto_tree *tree)
 		param_ti = proto_tree_add_item(tree, hfindex, tvb, 2, length, FALSE);
 		param_tree = proto_item_add_subtree(param_ti, ett_mikey_sp_param);
 
-		proto_tree_add_item(param_tree, hf_mikey[POS_SP_PARAM_F_TYPE], tvb, 0, 1, FALSE);
-		proto_tree_add_item(param_tree, hf_mikey[POS_SP_PARAM_F_LEN], tvb, 1, 1, FALSE);
-		proto_tree_add_item(param_tree, hf_mikey[POS_SP_PARAM_F_VALUE], tvb, 2, length, FALSE);
+		proto_tree_add_item(param_tree, hf_mikey[POS_SP_PARAM_F_TYPE], tvb, 0, 1, ENC_BIG_ENDIAN);
+		proto_tree_add_item(param_tree, hf_mikey[POS_SP_PARAM_F_LEN], tvb, 1, 1, ENC_BIG_ENDIAN);
+		proto_tree_add_item(param_tree, hf_mikey[POS_SP_PARAM_F_VALUE], tvb, 2, length, ENC_NA);
 	}
 
 	return 2+length;
@@ -1010,9 +1010,9 @@ dissect_payload_sp(mikey_t *mikey _U_, tvbuff_t *tvb, packet_info *pinfo _U_, pr
 
 	if (tree) {
 		parent = proto_tree_get_parent(tree);
-		proto_tree_add_item(tree, hf_mikey[POS_SP_NO], tvb, 1, 1, FALSE);
-		proto_tree_add_item(tree, hf_mikey[POS_SP_TYPE], tvb, 2, 1, FALSE);
-		proto_tree_add_item(tree, hf_mikey[POS_SP_PARAM_LEN], tvb, 3, 2, FALSE);
+		proto_tree_add_item(tree, hf_mikey[POS_SP_NO], tvb, 1, 1, ENC_BIG_ENDIAN);
+		proto_tree_add_item(tree, hf_mikey[POS_SP_TYPE], tvb, 2, 1, ENC_BIG_ENDIAN);
+		proto_tree_add_item(tree, hf_mikey[POS_SP_PARAM_LEN], tvb, 3, 2, ENC_BIG_ENDIAN);
 
 		proto_item_append_text(parent, " No: %d, Type: %s", no, val_to_str(type, sp_prot_type_vals, "Unknown"));
 	}
@@ -1049,13 +1049,13 @@ dissect_payload_rand(mikey_t *mikey _U_, tvbuff_t *tvb, packet_info *pinfo _U_,
 	length = tvb_get_guint8(tvb, offset+1);
 
 	if (tree) {
-		proto_tree_add_item(tree, hf_mikey[POS_RAND_LEN], tvb, 1, 1, FALSE);
+		proto_tree_add_item(tree, hf_mikey[POS_RAND_LEN], tvb, 1, 1, ENC_BIG_ENDIAN);
 	}
 
 	tvb_ensure_bytes_exist(tvb, offset+2, length);
 
 	if (tree) {
-		proto_tree_add_item(tree, hf_mikey[POS_RAND], tvb, 2, length, FALSE);
+		proto_tree_add_item(tree, hf_mikey[POS_RAND], tvb, 2, length, ENC_NA);
 	}
 	return 2 + length;
 }
@@ -1070,8 +1070,8 @@ dissect_payload_err(mikey_t *mikey _U_, tvbuff_t *tvb, packet_info *pinfo _U_, p
 	err_no = tvb_get_guint8(tvb, 1);
 
 	if (tree) {
-		proto_tree_add_item(tree, hf_mikey[POS_ERR_NO], tvb, 1, 1, FALSE);
-		proto_tree_add_item(tree, hf_mikey[POS_ERR_RESERVED], tvb, 2, 2, FALSE);
+		proto_tree_add_item(tree, hf_mikey[POS_ERR_NO], tvb, 1, 1, ENC_BIG_ENDIAN);
+		proto_tree_add_item(tree, hf_mikey[POS_ERR_RESERVED], tvb, 2, 2, ENC_NA);
 	}
 	parent = proto_tree_get_parent(tree);
 	proto_item_append_text(parent, ": %s", val_to_str(err_no, err_vals, "Unknown"));
@@ -1102,10 +1102,10 @@ dissect_payload_keydata(mikey_t *mikey _U_, tvbuff_t *tvb, packet_info *pinfo _U
 	offset += 4;
 
 	if (tree) {
-		proto_tree_add_item(tree, hf_mikey[POS_KEY_DATA_TYPE], tvb, 1, 1, FALSE);
-		proto_tree_add_item(tree, hf_mikey[POS_KEY_DATA_KV], tvb, 1, 1, FALSE);
-		proto_tree_add_item(tree, hf_mikey[POS_KEY_DATA_LEN], tvb, 2, 2, FALSE);
-		proto_tree_add_item(tree, hf_mikey[POS_KEY_DATA], tvb, 4, data_len, FALSE);
+		proto_tree_add_item(tree, hf_mikey[POS_KEY_DATA_TYPE], tvb, 1, 1, ENC_BIG_ENDIAN);
+		proto_tree_add_item(tree, hf_mikey[POS_KEY_DATA_KV], tvb, 1, 1, ENC_BIG_ENDIAN);
+		proto_tree_add_item(tree, hf_mikey[POS_KEY_DATA_LEN], tvb, 2, 2, ENC_BIG_ENDIAN);
+		proto_tree_add_item(tree, hf_mikey[POS_KEY_DATA], tvb, 4, data_len, ENC_NA);
 
 		parent = proto_tree_get_parent(tree);
 		proto_item_append_text(parent, " Type: %s", val_to_str(key_type, kd_vals, "Unknown"));
@@ -1117,8 +1117,8 @@ dissect_payload_keydata(mikey_t *mikey _U_, tvbuff_t *tvb, packet_info *pinfo _U
 			salt_len = tvb_get_ntohs(tvb, offset);
 			if (salt_len>0) {
 				tvb_ensure_bytes_exist(tvb, offset+2, salt_len);
-				proto_tree_add_item(tree, hf_mikey[POS_KEY_SALT_LEN], tvb, offset, 2, FALSE);
-				proto_tree_add_item(tree, hf_mikey[POS_KEY_SALT], tvb, offset+2, salt_len, FALSE);
+				proto_tree_add_item(tree, hf_mikey[POS_KEY_SALT_LEN], tvb, offset, 2, ENC_BIG_ENDIAN);
+				proto_tree_add_item(tree, hf_mikey[POS_KEY_SALT], tvb, offset+2, salt_len, ENC_NA);
 			}
 			offset += 2+salt_len;
 		}
@@ -1127,28 +1127,28 @@ dissect_payload_keydata(mikey_t *mikey _U_, tvbuff_t *tvb, packet_info *pinfo _U
 		if (kv_type == KV_INTERVAL) {
 			tvb_ensure_bytes_exist(tvb, offset, 1);
 			kv_from_len = tvb_get_guint8(tvb, offset);
-			proto_tree_add_item(tree, hf_mikey[POS_KEY_KV_FROM_LEN], tvb, offset, 1, FALSE);
+			proto_tree_add_item(tree, hf_mikey[POS_KEY_KV_FROM_LEN], tvb, offset, 1, ENC_BIG_ENDIAN);
 			if (kv_from_len > 0) {
 				tvb_ensure_bytes_exist(tvb, offset+1, kv_from_len);
-				proto_tree_add_item(tree, hf_mikey[POS_KEY_KV_FROM], tvb, offset+1, kv_from_len, FALSE);
+				proto_tree_add_item(tree, hf_mikey[POS_KEY_KV_FROM], tvb, offset+1, kv_from_len, ENC_NA);
 			}
 			offset += 1+kv_from_len;
 
 			tvb_ensure_bytes_exist(tvb, offset, 1);
 			kv_to_len = tvb_get_guint8(tvb, offset);
-			proto_tree_add_item(tree, hf_mikey[POS_KEY_KV_TO_LEN], tvb, offset, 1, FALSE);
+			proto_tree_add_item(tree, hf_mikey[POS_KEY_KV_TO_LEN], tvb, offset, 1, ENC_BIG_ENDIAN);
 			if (kv_to_len > 0) {
 				tvb_ensure_bytes_exist(tvb, offset+1, kv_to_len);
-				proto_tree_add_item(tree, hf_mikey[POS_KEY_KV_TO], tvb, offset+1, kv_to_len, FALSE);
+				proto_tree_add_item(tree, hf_mikey[POS_KEY_KV_TO], tvb, offset+1, kv_to_len, ENC_NA);
 			}
 			offset += 1+kv_to_len;
 		} else if (kv_type == KV_SPI) {
 			tvb_ensure_bytes_exist(tvb, offset, 1);
 			kv_spi_len = tvb_get_guint8(tvb, offset);
-			proto_tree_add_item(tree, hf_mikey[POS_KEY_KV_SPI_LEN], tvb, offset, 1, FALSE);
+			proto_tree_add_item(tree, hf_mikey[POS_KEY_KV_SPI_LEN], tvb, offset, 1, ENC_BIG_ENDIAN);
 			if (kv_spi_len > 0) {
 				tvb_ensure_bytes_exist(tvb, offset+1, kv_spi_len);
-				proto_tree_add_item(tree, hf_mikey[POS_KEY_KV_SPI], tvb, offset+1, kv_spi_len, FALSE);
+				proto_tree_add_item(tree, hf_mikey[POS_KEY_KV_SPI], tvb, offset+1, kv_spi_len, ENC_NA);
 			}
 			offset += 1+kv_spi_len;
 		}
@@ -1169,8 +1169,8 @@ dissect_payload_general_ext(mikey_t *mikey _U_, tvbuff_t *tvb, packet_info *pinf
 	data_len = tvb_get_ntohs(tvb, offset+2);
 
 	if (tree) {
-		proto_tree_add_item(tree, hf_mikey[POS_GENERAL_EXT_TYPE], tvb, 1, 1, FALSE);
-		proto_tree_add_item(tree, hf_mikey[POS_GENERAL_EXT_LEN], tvb, 2, 2, FALSE);
+		proto_tree_add_item(tree, hf_mikey[POS_GENERAL_EXT_TYPE], tvb, 1, 1, ENC_BIG_ENDIAN);
+		proto_tree_add_item(tree, hf_mikey[POS_GENERAL_EXT_LEN], tvb, 2, 2, ENC_BIG_ENDIAN);
 	}
 
 	tvb_ensure_bytes_exist(tvb, offset+3, data_len);
@@ -1180,9 +1180,9 @@ dissect_payload_general_ext(mikey_t *mikey _U_, tvbuff_t *tvb, packet_info *pinf
 		parent = proto_tree_get_parent(tree);
 		if (type==1) {
 			/* For SDP-IDs, show a string instead of raw bytes */
-			proto_tree_add_item(tree, hf_mikey[POS_GENERAL_EXT_VALUE], tvb, 4, data_len, FALSE);
+			proto_tree_add_item(tree, hf_mikey[POS_GENERAL_EXT_VALUE], tvb, 4, data_len, ENC_ASCII|ENC_NA);
 		} else {
-			proto_tree_add_item(tree, hf_mikey[POS_GENERAL_EXT_DATA], tvb, 4, data_len, FALSE);
+			proto_tree_add_item(tree, hf_mikey[POS_GENERAL_EXT_DATA], tvb, 4, data_len, ENC_NA);
 		}
 		proto_item_append_text(parent, " Type: %s", val_to_str(type, genext_type_vals, "Unknown"));
 	}
diff --git a/epan/dissectors/packet-ospf.c b/epan/dissectors/packet-ospf.c
index 506b3a4ad3..ec9835fda4 100644
--- a/epan/dissectors/packet-ospf.c
+++ b/epan/dissectors/packet-ospf.c
@@ -988,7 +988,7 @@ dissect_ospf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         proto_tree_add_text(ospf_header_tree, tvb, 0, 1, "OSPF Version: %u",
                             version);
         proto_tree_add_item(ospf_header_tree, hf_ospf_filter[OSPFF_MSG_TYPE],
-                            tvb, 1, 1, FALSE);
+                            tvb, 1, 1, ENC_BIG_ENDIAN);
         if (ospf_msg_type_to_filter(packet_type) != -1) {
             hidden_item = proto_tree_add_item(ospf_header_tree,
                                               hf_ospf_filter[ospf_msg_type_to_filter(packet_type)],
@@ -998,7 +998,7 @@ dissect_ospf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         proto_tree_add_text(ospf_header_tree, tvb, 2, 2, "Packet Length: %u",
                             ospflen);
         proto_tree_add_item(ospf_header_tree, hf_ospf_filter[OSPFF_SRC_ROUTER],
-                            tvb, 4, 4, FALSE);
+                            tvb, 4, 4, ENC_BIG_ENDIAN);
         areaid=tvb_get_ntohl(tvb,8);
         proto_tree_add_text(ospf_header_tree, tvb, 8, 4, "Area ID: %s%s",
                             tvb_ip_to_str(tvb, 8), areaid == 0 ? " (Backbone)" : "");
@@ -1275,31 +1275,31 @@ dissect_ospfv3_lls_tlv(tvbuff_t *tvb, int offset, proto_tree *tree)
     switch(type) {
     case LLS_V3_EXT_OPT:
         ti = proto_tree_add_item(tree, hf_ospf_filter[OSPFF_V3_LLS_EXT_OPTIONS_TLV], tvb,
-                                 offset, length + 4, FALSE);
+                                 offset, length + 4, ENC_NA);
        break;
     case LLS_V3_STATE_CHECK:
         ti = proto_tree_add_item(tree, hf_ospf_filter[OSPFF_V3_LLS_STATE_TLV], tvb,
-                                 offset, length + 4, FALSE);
+                                 offset, length + 4, ENC_NA);
         break;
     case LLS_V3_NBR_DROP:
         ti = proto_tree_add_item(tree, hf_ospf_filter[OSPFF_V3_LLS_DROP_TLV], tvb,
-                                 offset, length + 4, FALSE);
+                                 offset, length + 4, ENC_NA);
         break;
     case LLS_V3_RELAYS:
         ti = proto_tree_add_item(tree, hf_ospf_filter[OSPFF_V3_LLS_RELAY_TLV], tvb,
-                                 offset, length + 4, FALSE);
+                                 offset, length + 4, ENC_NA);
         break;
     case LLS_V3_WILLING:
         ti = proto_tree_add_item(tree, hf_ospf_filter[OSPFF_V3_LLS_WILLINGNESS_TLV], tvb,
-                                 offset, length + 4, FALSE);
+                                 offset, length + 4, ENC_NA);
         break;
     case LLS_V3_RQST_FROM:
          ti = proto_tree_add_item(tree, hf_ospf_filter[OSPFF_V3_LLS_RF_TLV], tvb,
-                                  offset, length + 4, FALSE);
+                                  offset, length + 4, ENC_NA);
          break;
     case LLS_V3_FULL_STATE:
         ti = proto_tree_add_item(tree, hf_ospf_filter[OSPFF_V3_LLS_FSF_TLV], tvb,
-                                 offset, length + 4, FALSE);
+                                 offset, length + 4, ENC_NA);
         break;
     default:
         ti = proto_tree_add_text(tree, tvb, offset, length + 4, "%s",
@@ -1324,7 +1324,7 @@ dissect_ospfv3_lls_tlv(tvbuff_t *tvb, int offset, proto_tree *tree)
         break;
     case LLS_V3_STATE_CHECK:
         proto_tree_add_item(ospf_lls_tlv_tree, hf_ospf_filter[OSPFF_V3_LLS_STATE_SCS],
-                            tvb, offset+4, 2, FALSE);
+                            tvb, offset+4, 2, ENC_BIG_ENDIAN);
 
         dissect_ospf_bitfield(ospf_lls_tlv_tree, tvb, offset + 6,
                               &bfinfo_v3_lls_state_options);
@@ -1342,7 +1342,7 @@ dissect_ospfv3_lls_tlv(tvbuff_t *tvb, int offset, proto_tree *tree)
     case LLS_V3_RELAYS:
         relays_added = tvb_get_guint8(tvb, offset+4);
         proto_tree_add_item(ospf_lls_tlv_tree, hf_ospf_filter[OSPFF_V3_LLS_RELAY_ADDED],
-                            tvb, offset+4, 1, FALSE);
+                            tvb, offset+4, 1, ENC_BIG_ENDIAN);
         dissect_ospf_bitfield(ospf_lls_tlv_tree, tvb, offset + 5,
                               &bfinfo_v3_lls_relay_options);
         offset += 8;
@@ -1362,7 +1362,7 @@ dissect_ospfv3_lls_tlv(tvbuff_t *tvb, int offset, proto_tree *tree)
         break;
     case LLS_V3_WILLING:
         proto_tree_add_item(ospf_lls_tlv_tree, hf_ospf_filter[OSPFF_V3_LLS_WILLINGNESS],
-                            tvb, offset+4, 1, FALSE);
+                            tvb, offset+4, 1, ENC_BIG_ENDIAN);
 
         break;
     case LLS_V3_RQST_FROM:
@@ -1573,7 +1573,7 @@ dissect_ospf_ls_req(tvbuff_t *tvb, int offset, proto_tree *tree, guint8 version,
 
         case OSPF_VERSION_2:
             proto_tree_add_item(ospf_lsr_tree, hf_ospf_filter[OSPFF_LS_TYPE],
-                                tvb, offset, 4, FALSE);
+                                tvb, offset, 4, ENC_BIG_ENDIAN);
             break;
         case OSPF_VERSION_3:
             reserved = tvb_get_ntohs(tvb, offset);
@@ -1590,7 +1590,7 @@ dissect_ospf_ls_req(tvbuff_t *tvb, int offset, proto_tree *tree, guint8 version,
         proto_tree_add_text(ospf_lsr_tree, tvb, offset + 4, 4, "Link State ID: %s",
                             tvb_ip_to_str(tvb, offset + 4));
         proto_tree_add_item(ospf_lsr_tree, hf_ospf_filter[OSPFF_ADV_ROUTER],
-                            tvb, offset + 8, 4, FALSE);
+                            tvb, offset + 8, 4, ENC_BIG_ENDIAN);
 
         offset += 12;
     }
@@ -1743,7 +1743,7 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, int offset, proto_tree *tree,
     ti = proto_tree_add_text(tree, tvb, offset, length,
                              "MPLS Traffic Engineering LSA");
     hidden_item = proto_tree_add_item(tree, hf_ospf_filter[OSPFF_LS_MPLS],
-                                      tvb, offset, 2, FALSE);
+                                      tvb, offset, 2, ENC_BIG_ENDIAN);
     PROTO_ITEM_SET_HIDDEN(hidden_item);
     mpls_tree = proto_item_add_subtree(ti, ett_ospf_lsa_mpls);
 
@@ -1763,7 +1763,7 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, int offset, proto_tree *tree,
             proto_tree_add_text(tlv_tree, tvb, offset+2, 2, "TLV Length: %u",
                                 tlv_length);
             proto_tree_add_item(tlv_tree, hf_ospf_filter[OSPFF_LS_MPLS_ROUTERID],
-                                tvb, offset+4, 4, FALSE);
+                                tvb, offset+4, 4, ENC_BIG_ENDIAN);
             break;
 
         case MPLS_TLV_LINK:
@@ -1794,7 +1794,7 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, int offset, proto_tree *tree,
                     proto_tree_add_text(stlv_tree, tvb, stlv_offset+2, 2, "TLV Length: %u",
                                         stlv_len);
                     proto_tree_add_item(stlv_tree, hf_ospf_filter[OSPFF_LS_MPLS_LINKTYPE],
-                                        tvb, stlv_offset+4, 1,FALSE);
+                                        tvb, stlv_offset+4, 1,ENC_BIG_ENDIAN);
                     break;
 
                 case MPLS_LINK_ID:
@@ -1807,7 +1807,7 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, int offset, proto_tree *tree,
                     proto_tree_add_text(stlv_tree, tvb, stlv_offset+2, 2, "TLV Length: %u",
                                         stlv_len);
                     proto_tree_add_item(stlv_tree, hf_ospf_filter[OSPFF_LS_MPLS_LINKID],
-                                        tvb, stlv_offset+4, 4, FALSE);
+                                        tvb, stlv_offset+4, 4, ENC_BIG_ENDIAN);
                     break;
 
                 case MPLS_LINK_LOCAL_IF:
@@ -1854,7 +1854,7 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, int offset, proto_tree *tree,
                     stlv_admingrp = tvb_get_ntohl(tvb, stlv_offset + 4);
                     mask = 1;
                     ti = proto_tree_add_item(stlv_tree, hf_ospf_filter[OSPFF_LS_MPLS_LINKCOLOR],
-                                             tvb, stlv_offset+4, 4, FALSE);
+                                             tvb, stlv_offset+4, 4, ENC_BIG_ENDIAN);
                     stlv_admingrp_tree = proto_item_add_subtree(ti, ett_ospf_lsa_mpls_link_stlv_admingrp);
                     if (stlv_admingrp_tree == NULL)
                         return;
@@ -1928,7 +1928,7 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, int offset, proto_tree *tree,
                                         stlv_len);
 
                     proto_tree_add_item(stlv_tree, hf_ospf_filter[OSPFF_LS_MPLS_BC_MODEL_ID],
-                                        tvb, stlv_offset+4, 1, FALSE);
+                                        tvb, stlv_offset+4, 1, ENC_BIG_ENDIAN);
 
                     /* 3 octets reserved +5, +6 and +7 (all 0x00) */
                     if(tvb_memeql(tvb, stlv_offset+5, allzero, 3) == -1) {
@@ -1980,10 +1980,10 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, int offset, proto_tree *tree,
                                         stlv_len);
                     proto_tree_add_item(stlv_tree,
                                         hf_ospf_filter[OSPFF_LS_MPLS_LOCAL_IFID],
-                                        tvb, stlv_offset+4, 4, FALSE);
+                                        tvb, stlv_offset+4, 4, ENC_BIG_ENDIAN);
                     proto_tree_add_item(stlv_tree,
                                         hf_ospf_filter[OSPFF_LS_MPLS_REMOTE_IFID],
-                                        tvb, stlv_offset+8, 4, FALSE);
+                                        tvb, stlv_offset+8, 4, ENC_BIG_ENDIAN);
                     break;
 
                 case MPLS_LINK_IF_SWITCHING_DESC:
@@ -2066,7 +2066,7 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, int offset, proto_tree *tree,
                                         stlv_len);
                     proto_tree_add_item(stlv_tree,
                                         hf_ospf_filter[OSPFF_LS_OIF_LOCAL_NODE_ID],
-                                        tvb, stlv_offset + 4, 4, FALSE);
+                                        tvb, stlv_offset + 4, 4, ENC_BIG_ENDIAN);
                     break;
 
                 case OIF_REMOTE_NODE_ID:
@@ -2080,7 +2080,7 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, int offset, proto_tree *tree,
                                         stlv_len);
                     proto_tree_add_item(stlv_tree,
                                         hf_ospf_filter[OSPFF_LS_OIF_REMOTE_NODE_ID],
-                                        tvb, stlv_offset + 4, 4, FALSE);
+                                        tvb, stlv_offset + 4, 4, ENC_BIG_ENDIAN);
                     break;
 
                 case OIF_SONET_SDH_SWITCHING_CAPABILITY:
@@ -2247,7 +2247,7 @@ static void dissect_ospf_lsa_grace_tlv (tvbuff_t *tvb, int offset,
         tlv_length_with_pad = tlv_length + 4 + ((4 - (tlv_length % 4)) % 4);
 
         tree_item = proto_tree_add_item(tree, hf_ospf_filter[OSPFF_V2_GRACE_TLV], tvb, offset,
-                                        tlv_length_with_pad, FALSE);
+                                        tlv_length_with_pad, ENC_NA);
         tlv_tree = proto_item_add_subtree(tree_item, ett_ospf_lsa_grace_tlv);
         proto_tree_add_text(tlv_tree, tvb, offset, 2, "Type: %s (%u)",
                             val_to_str(tlv_type, grace_tlv_type_vals, "Unknown grace-LSA TLV"), tlv_type);
@@ -2257,14 +2257,14 @@ static void dissect_ospf_lsa_grace_tlv (tvbuff_t *tvb, int offset,
         case GRACE_TLV_PERIOD:
             grace_period = tvb_get_ntohl(tvb, offset + 4);
             grace_tree_item = proto_tree_add_item(tlv_tree, hf_ospf_filter[OSPFF_V2_GRACE_PERIOD], tvb,
-                                                  offset + 4, tlv_length, FALSE);
+                                                  offset + 4, tlv_length, ENC_BIG_ENDIAN);
             proto_item_append_text(grace_tree_item, " seconds");
             proto_item_set_text(tree_item, "Grace Period: %u seconds", grace_period);
             break;
         case GRACE_TLV_REASON:
             restart_reason = tvb_get_guint8(tvb, offset + 4);
             proto_tree_add_item(tlv_tree, hf_ospf_filter[OSPFF_V2_GRACE_REASON], tvb, offset + 4,
-                                tlv_length, FALSE);
+                                tlv_length, ENC_BIG_ENDIAN);
             proto_item_set_text(tree_item, "Restart Reason: %s (%u)",
                                 val_to_str(restart_reason, restart_reason_vals, "Unknown Restart Reason"),
                                 restart_reason);
@@ -2272,7 +2272,7 @@ static void dissect_ospf_lsa_grace_tlv (tvbuff_t *tvb, int offset,
         case GRACE_TLV_IP:
             restart_ip = tvb_get_ipv4(tvb, offset + 4);
             proto_tree_add_item(tlv_tree, hf_ospf_filter[OSPFF_V2_GRACE_IP], tvb, offset + 4,
-                                tlv_length, FALSE);
+                                tlv_length, ENC_BIG_ENDIAN);
             proto_item_set_text(tree_item, "Restart IP: %s (%s)",
                                 get_hostname(restart_ip), ip_to_str((guint8 *)&restart_ip));
             break;
@@ -2362,7 +2362,7 @@ dissect_ospf_v2_lsa(tvbuff_t *tvb, int offset, proto_tree *tree,
     options = tvb_get_guint8 (tvb, offset + 2);
     dissect_ospf_bitfield(ospf_lsa_tree, tvb, offset + 2, &bfinfo_v2_options);
     proto_tree_add_item(ospf_lsa_tree, hf_ospf_filter[OSPFF_LS_TYPE], tvb,
-                        offset + 3, 1, FALSE);
+                        offset + 3, 1, ENC_BIG_ENDIAN);
     if (ospf_ls_type_to_filter(ls_type) != -1) {
         hidden_item = proto_tree_add_item(ospf_lsa_tree,
                                           hf_ospf_filter[ospf_ls_type_to_filter(ls_type)], tvb,
@@ -2387,7 +2387,7 @@ dissect_ospf_v2_lsa(tvbuff_t *tvb, int offset, proto_tree *tree,
             proto_tree_add_text(ospf_lsa_tree, tvb, offset + 5, 1, "Link State ID TE-LSA Reserved: %u",
                                 tvb_get_guint8(tvb, offset + 5));
             proto_tree_add_item(ospf_lsa_tree, hf_ospf_filter[OSPFF_LS_MPLS_TE_INSTANCE],
-                                tvb, offset + 6, 2, FALSE);
+                                tvb, offset + 6, 2, ENC_BIG_ENDIAN);
             break;
 
         default:
@@ -2402,7 +2402,7 @@ dissect_ospf_v2_lsa(tvbuff_t *tvb, int offset, proto_tree *tree,
     }
 
     proto_tree_add_item(ospf_lsa_tree, hf_ospf_filter[OSPFF_ADV_ROUTER],
-                        tvb, offset + 8, 4, FALSE);
+                        tvb, offset + 8, 4, ENC_BIG_ENDIAN);
     proto_tree_add_text(ospf_lsa_tree, tvb, offset + 12, 4, "LS Sequence Number: 0x%08x",
                         tvb_get_ntohl(tvb, offset + 12));
     proto_tree_add_text(ospf_lsa_tree, tvb, offset + 16, 2, "LS Checksum: 0x%04x",
@@ -2679,7 +2679,7 @@ dissect_ospf_v3_lsa(tvbuff_t *tvb, int offset, proto_tree *tree,
                         tvb_ip_to_str(tvb, offset + 4));
 
     proto_tree_add_item(ospf_lsa_tree, hf_ospf_filter[OSPFF_ADV_ROUTER],
-                        tvb, offset + 8, 4, FALSE);
+                        tvb, offset + 8, 4, ENC_BIG_ENDIAN);
     proto_tree_add_text(ospf_lsa_tree, tvb, offset + 12, 4, "LS Sequence Number: 0x%08x",
                         tvb_get_ntohl(tvb, offset + 12));
     proto_tree_add_text(ospf_lsa_tree, tvb, offset + 16, 2, "LS Checksum: 0x%04x",
diff --git a/epan/dissectors/packet-pcep.c b/epan/dissectors/packet-pcep.c
index 372578e24f..57ebbbf793 100644
--- a/epan/dissectors/packet-pcep.c
+++ b/epan/dissectors/packet-pcep.c
@@ -676,7 +676,7 @@ dissect_subobj_ipv4(proto_tree *pcep_subobj_tree, tvbuff_t *tvb, int offset, int
 	guint8 resvd;
 	guint l;
 
-	ti = proto_tree_add_item(pcep_subobj_tree, pcep_filter[PCEPF_SUBOBJ_IPv4], tvb, offset, length, FALSE);
+	ti = proto_tree_add_item(pcep_subobj_tree, pcep_filter[PCEPF_SUBOBJ_IPv4], tvb, offset, length, ENC_NA);
 	pcep_subobj_ipv4 = proto_item_add_subtree(ti, ett_pcep_obj);
 
 	if (length != 8) {
@@ -748,7 +748,7 @@ dissect_subobj_ipv6(proto_tree *pcep_subobj_tree, tvbuff_t *tvb, int offset, int
 	guint8 resv;
 	int l;
 
-	ti = proto_tree_add_item(pcep_subobj_tree, pcep_filter[PCEPF_SUBOBJ_IPv6], tvb, offset, length, FALSE);
+	ti = proto_tree_add_item(pcep_subobj_tree, pcep_filter[PCEPF_SUBOBJ_IPv6], tvb, offset, length, ENC_NA);
 	pcep_subobj_ipv6 = proto_item_add_subtree(ti, ett_pcep_obj);
 
 	if (length != 20) {
@@ -820,7 +820,7 @@ dissect_subobj_label_control(proto_tree *pcep_subobj_tree,  tvbuff_t *tvb,  int
 	int l;
 	int u;
 
-	ti = proto_tree_add_item(pcep_subobj_tree, pcep_filter[PCEPF_SUBOBJ_LABEL_CONTROL], tvb, offset, length, FALSE);
+	ti = proto_tree_add_item(pcep_subobj_tree, pcep_filter[PCEPF_SUBOBJ_LABEL_CONTROL], tvb, offset, length, ENC_NA);
 	pcep_subobj_label_control = proto_item_add_subtree(ti, ett_pcep_obj);
 
 	if (length < 5) {
@@ -878,7 +878,7 @@ dissect_subobj_unnumb_interfaceID(proto_tree *pcep_subobj_tree, tvbuff_t *tvb, i
 	guint16 reserved_flags;
 	int l;
 
-	ti = proto_tree_add_item(pcep_subobj_tree, pcep_filter[PCEPF_SUBOBJ_UNNUM_INTERFACEID], tvb, offset, length, FALSE);
+	ti = proto_tree_add_item(pcep_subobj_tree, pcep_filter[PCEPF_SUBOBJ_UNNUM_INTERFACEID], tvb, offset, length, ENC_NA);
 	pcep_subobj_unnumb_interfaceID = proto_item_add_subtree(ti, ett_pcep_obj);
 
 	if (length != 12) {
@@ -955,7 +955,7 @@ dissect_subobj_autonomous_sys_num(proto_tree *pcep_subobj_tree, tvbuff_t *tvb, i
 		attribute = tvb_get_guint8(tvb, offset+3);
 		AS_number = tvb_get_ntohs(tvb, offset+6);
 
-		ti = proto_tree_add_item(pcep_subobj_tree, pcep_filter[PCEPF_SUBOBJ_AUTONOMOUS_SYS_NUM], tvb, offset, length, FALSE);
+		ti = proto_tree_add_item(pcep_subobj_tree, pcep_filter[PCEPF_SUBOBJ_AUTONOMOUS_SYS_NUM], tvb, offset, length, ENC_NA);
 		pcep_subobj_autonomous_sys_num = proto_item_add_subtree(ti, ett_pcep_obj);
 		if (length != 8) {
 			proto_tree_add_text(pcep_subobj_autonomous_sys_num, tvb, offset, length,
@@ -974,7 +974,7 @@ dissect_subobj_autonomous_sys_num(proto_tree *pcep_subobj_tree, tvbuff_t *tvb, i
 	} else {
 		AS_number = tvb_get_ntohs(tvb, offset+2);
 
-		ti = proto_tree_add_item(pcep_subobj_tree, pcep_filter[PCEPF_SUBOBJ_AUTONOMOUS_SYS_NUM], tvb, offset, length, FALSE);
+		ti = proto_tree_add_item(pcep_subobj_tree, pcep_filter[PCEPF_SUBOBJ_AUTONOMOUS_SYS_NUM], tvb, offset, length, ENC_NA);
 		pcep_subobj_autonomous_sys_num = proto_item_add_subtree(ti, ett_pcep_obj);
 
 		if (length != 4) {
@@ -1006,7 +1006,7 @@ dissect_subobj_srlg(proto_tree *pcep_subobj_tree, tvbuff_t *tvb, int offset, gui
 	reserved = tvb_get_guint8(tvb, offset+6);
 	attribute = tvb_get_guint8(tvb, offset+7);
 
-	ti = proto_tree_add_item(pcep_subobj_tree, pcep_filter[PCEPF_SUBOBJ_SRLG], tvb, offset, length, FALSE);
+	ti = proto_tree_add_item(pcep_subobj_tree, pcep_filter[PCEPF_SUBOBJ_SRLG], tvb, offset, length, ENC_NA);
 	pcep_subobj_srlg = proto_item_add_subtree(ti, ett_pcep_obj);
 
 	if (length != 8) {
@@ -1036,7 +1036,7 @@ dissect_subobj_exrs(proto_tree *pcep_subobj_tree, tvbuff_t *tvb, int offset, int
 	guint offset_exrs = 0;
 	guint l;
 
-	ti = proto_tree_add_item(pcep_subobj_tree, pcep_filter[PCEPF_SUBOBJ_EXRS], tvb, offset, length, FALSE);
+	ti = proto_tree_add_item(pcep_subobj_tree, pcep_filter[PCEPF_SUBOBJ_EXRS], tvb, offset, length, ENC_NA);
 	pcep_subobj_exrs = proto_item_add_subtree(ti, ett_pcep_obj);
 
 	if (length < 4) {
@@ -1107,7 +1107,7 @@ dissect_subobj_pksv4(proto_tree *pcep_subobj_tree, tvbuff_t *tvb, int offset, gi
 	guint16 path_key;
 	int l;
 
-	ti = proto_tree_add_item(pcep_subobj_tree, pcep_filter[PCEPF_SUBOBJ_PKSv4], tvb, offset, length, FALSE);
+	ti = proto_tree_add_item(pcep_subobj_tree, pcep_filter[PCEPF_SUBOBJ_PKSv4], tvb, offset, length, ENC_NA);
 	pcep_subobj_pksv4 = proto_item_add_subtree(ti, ett_pcep_obj);
 
 	if (length != 8) {
@@ -1134,7 +1134,7 @@ dissect_subobj_pksv6(proto_tree *pcep_subobj_tree, tvbuff_t *tvb, int offset, gi
 	guint16 path_key;
 	int l;
 
-	ti = proto_tree_add_item(pcep_subobj_tree, pcep_filter[PCEPF_SUBOBJ_PKSv6], tvb, offset, length, FALSE);
+	ti = proto_tree_add_item(pcep_subobj_tree, pcep_filter[PCEPF_SUBOBJ_PKSv6], tvb, offset, length, ENC_NA);
 	pcep_subobj_pksv6 = proto_item_add_subtree(ti, ett_pcep_obj);
 
 	if (length != 20) {
@@ -2086,92 +2086,92 @@ dissect_pcep_obj_tree(proto_tree *pcep_tree, tvbuff_t *tvb, int len, int offset,
 	switch (obj_class) {
 
 	case PCEP_OPEN_OBJ:
-		pcep_object_item = proto_tree_add_item(pcep_tree, pcep_filter[PCEPF_OBJ_OPEN], tvb, offset, -1, FALSE);
+		pcep_object_item = proto_tree_add_item(pcep_tree, pcep_filter[PCEPF_OBJ_OPEN], tvb, offset, -1, ENC_NA);
 		pcep_object_tree = proto_item_add_subtree(pcep_object_item, ett_pcep_obj_open);
 		break;
 
 	case PCEP_RP_OBJ:
-		pcep_object_item = proto_tree_add_item(pcep_tree, pcep_filter[PCEPF_OBJ_RP], tvb, offset, -1, FALSE);
+		pcep_object_item = proto_tree_add_item(pcep_tree, pcep_filter[PCEPF_OBJ_RP], tvb, offset, -1, ENC_NA);
 		pcep_object_tree = proto_item_add_subtree(pcep_object_item, ett_pcep_obj_request_parameters);
 		break;
 
 	case PCEP_NO_PATH_OBJ:
-		pcep_object_item = proto_tree_add_item(pcep_tree, pcep_filter[PCEPF_OBJ_NO_PATH], tvb, offset, -1, FALSE);
+		pcep_object_item = proto_tree_add_item(pcep_tree, pcep_filter[PCEPF_OBJ_NO_PATH], tvb, offset, -1, ENC_NA);
 		pcep_object_tree = proto_item_add_subtree(pcep_object_item, ett_pcep_obj_no_path);
 		break;
 
 	case PCEP_END_POINT_OBJ:
-		pcep_object_item = proto_tree_add_item(pcep_tree, pcep_filter[PCEPF_OBJ_END_POINT], tvb, offset, -1, FALSE);
+		pcep_object_item = proto_tree_add_item(pcep_tree, pcep_filter[PCEPF_OBJ_END_POINT], tvb, offset, -1, ENC_NA);
 		pcep_object_tree = proto_item_add_subtree(pcep_object_item, ett_pcep_obj_end_point);
 		break;
 
 	case PCEP_BANDWIDTH_OBJ:
-		pcep_object_item = proto_tree_add_item(pcep_tree, pcep_filter[PCEPF_OBJ_BANDWIDTH], tvb, offset, -1, FALSE);
+		pcep_object_item = proto_tree_add_item(pcep_tree, pcep_filter[PCEPF_OBJ_BANDWIDTH], tvb, offset, -1, ENC_NA);
 		pcep_object_tree = proto_item_add_subtree(pcep_object_item, ett_pcep_obj_bandwidth);
 		break;
 
 	case PCEP_METRIC_OBJ:
-		pcep_object_item = proto_tree_add_item(pcep_tree, pcep_filter[PCEPF_OBJ_METRIC], tvb, offset, -1, FALSE);
+		pcep_object_item = proto_tree_add_item(pcep_tree, pcep_filter[PCEPF_OBJ_METRIC], tvb, offset, -1, ENC_NA);
 		pcep_object_tree = proto_item_add_subtree(pcep_object_item, ett_pcep_obj_metric);
 		break;
 
 	case PCEP_EXPLICIT_ROUTE_OBJ:
-		pcep_object_item = proto_tree_add_item(pcep_tree, pcep_filter[PCEPF_OBJ_EXPLICIT_ROUTE], tvb, offset, -1, FALSE);
+		pcep_object_item = proto_tree_add_item(pcep_tree, pcep_filter[PCEPF_OBJ_EXPLICIT_ROUTE], tvb, offset, -1, ENC_NA);
 		pcep_object_tree = proto_item_add_subtree(pcep_object_item, ett_pcep_obj_explicit_route);
 		break;
 
 	case PCEP_RECORD_ROUTE_OBJ:
-		pcep_object_item = proto_tree_add_item(pcep_tree, pcep_filter[PCEPF_OBJ_RECORD_ROUTE], tvb, offset, -1, FALSE);
+		pcep_object_item = proto_tree_add_item(pcep_tree, pcep_filter[PCEPF_OBJ_RECORD_ROUTE], tvb, offset, -1, ENC_NA);
 		pcep_object_tree = proto_item_add_subtree(pcep_object_item, ett_pcep_obj_record_route);
 		break;
 
 	case PCEP_LSPA_OBJ:
-		pcep_object_item = proto_tree_add_item(pcep_tree, pcep_filter[PCEPF_OBJ_LSPA], tvb, offset, -1, FALSE);
+		pcep_object_item = proto_tree_add_item(pcep_tree, pcep_filter[PCEPF_OBJ_LSPA], tvb, offset, -1, ENC_NA);
 		pcep_object_tree = proto_item_add_subtree(pcep_object_item, ett_pcep_obj_lspa);
 		break;
 
 	case PCEP_IRO_OBJ:
-		pcep_object_item = proto_tree_add_item(pcep_tree, pcep_filter[PCEPF_OBJ_IRO], tvb, offset, -1, FALSE);
+		pcep_object_item = proto_tree_add_item(pcep_tree, pcep_filter[PCEPF_OBJ_IRO], tvb, offset, -1, ENC_NA);
 		pcep_object_tree = proto_item_add_subtree(pcep_object_item, ett_pcep_obj_iro);
 		break;
 
 	case PCEP_SVEC_OBJ:
-		pcep_object_item = proto_tree_add_item(pcep_tree, pcep_filter[PCEPF_OBJ_SVEC], tvb, offset, -1, FALSE);
+		pcep_object_item = proto_tree_add_item(pcep_tree, pcep_filter[PCEPF_OBJ_SVEC], tvb, offset, -1, ENC_NA);
 		pcep_object_tree = proto_item_add_subtree(pcep_object_item, ett_pcep_obj_svec);
 		break;
 
 	case PCEP_NOTIFICATION_OBJ:
-		pcep_object_item = proto_tree_add_item(pcep_tree, pcep_filter[PCEPF_OBJ_NOTIFICATION], tvb, offset, -1, FALSE);
+		pcep_object_item = proto_tree_add_item(pcep_tree, pcep_filter[PCEPF_OBJ_NOTIFICATION], tvb, offset, -1, ENC_NA);
 		pcep_object_tree = proto_item_add_subtree(pcep_object_item, ett_pcep_obj_notification);
 		break;
 
 	case PCEP_PCEP_ERROR_OBJ:
-		pcep_object_item = proto_tree_add_item(pcep_tree, pcep_filter[PCEPF_OBJ_PCEP_ERROR], tvb, offset, -1, FALSE);
+		pcep_object_item = proto_tree_add_item(pcep_tree, pcep_filter[PCEPF_OBJ_PCEP_ERROR], tvb, offset, -1, ENC_NA);
 		pcep_object_tree = proto_item_add_subtree(pcep_object_item, ett_pcep_obj_error);
 		break;
 
 	case PCEP_LOAD_BALANCING_OBJ:
-		pcep_object_item = proto_tree_add_item(pcep_tree, pcep_filter[PCEPF_OBJ_LOAD_BALANCING], tvb, offset, -1, FALSE);
+		pcep_object_item = proto_tree_add_item(pcep_tree, pcep_filter[PCEPF_OBJ_LOAD_BALANCING], tvb, offset, -1, ENC_NA);
 		pcep_object_tree = proto_item_add_subtree(pcep_object_item, ett_pcep_obj_load_balancing);
 		break;
 
 	case PCEP_CLOSE_OBJ:
-		pcep_object_item = proto_tree_add_item(pcep_tree, pcep_filter[PCEPF_OBJ_CLOSE], tvb, offset, -1, FALSE);
+		pcep_object_item = proto_tree_add_item(pcep_tree, pcep_filter[PCEPF_OBJ_CLOSE], tvb, offset, -1, ENC_NA);
 		pcep_object_tree = proto_item_add_subtree(pcep_object_item, ett_pcep_obj_close);
 		break;
 
 	case PCEP_PATH_KEY_OBJ:
-		pcep_object_item = proto_tree_add_item(pcep_tree, pcep_filter[PCEPF_OBJ_PATH_KEY], tvb, offset, -1, FALSE);
+		pcep_object_item = proto_tree_add_item(pcep_tree, pcep_filter[PCEPF_OBJ_PATH_KEY], tvb, offset, -1, ENC_NA);
 		pcep_object_tree = proto_item_add_subtree(pcep_object_item, ett_pcep_obj_path_key);
 		break;
 
 	case PCEP_XRO_OBJ:
-		pcep_object_item = proto_tree_add_item(pcep_tree, pcep_filter[PCEPF_OBJ_XRO], tvb, offset, -1, FALSE);
+		pcep_object_item = proto_tree_add_item(pcep_tree, pcep_filter[PCEPF_OBJ_XRO], tvb, offset, -1, ENC_NA);
 		pcep_object_tree = proto_item_add_subtree(pcep_object_item, ett_pcep_obj_xro);
 		break;
 
 	case PCEP_OF_OBJ:
-		pcep_object_item = proto_tree_add_item(pcep_tree, pcep_filter[PCEPF_OBJ_OF], tvb, offset, -1, FALSE);
+		pcep_object_item = proto_tree_add_item(pcep_tree, pcep_filter[PCEPF_OBJ_OF], tvb, offset, -1, ENC_NA);
 		pcep_object_tree = proto_item_add_subtree(pcep_object_item, ett_pcep_obj_of);
 		break;
 
diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c
index 8a5262628b..cfc4f49519 100644
--- a/epan/dissectors/packet-rsvp.c
+++ b/epan/dissectors/packet-rsvp.c
@@ -1651,17 +1651,17 @@ dissect_rsvp_session (proto_item *ti, proto_tree *rsvp_object_tree,
 			    "C-type: 1 - IPv4");
 	proto_tree_add_item(rsvp_object_tree,
                             hf_rsvp_filter[RSVPF_SESSION_IP],
-			    tvb, offset2, 4, FALSE);
+			    tvb, offset2, 4, ENC_BIG_ENDIAN);
 
 	proto_tree_add_item(rsvp_object_tree,
 			    hf_rsvp_filter[RSVPF_SESSION_PROTO], tvb,
-			    offset2+4, 1, FALSE);
+			    offset2+4, 1, ENC_BIG_ENDIAN);
 	proto_tree_add_text(rsvp_object_tree, tvb, offset2+5, 1,
 			    "Flags: %x",
 			    tvb_get_guint8(tvb, offset2+5));
 	proto_tree_add_item(rsvp_object_tree,
 			    hf_rsvp_filter[RSVPF_SESSION_PORT], tvb,
-			    offset2+6, 2, FALSE);
+			    offset2+6, 2, ENC_BIG_ENDIAN);
 
 	/*
 	 * Save this information to build the conversation request key
@@ -1704,11 +1704,11 @@ dissect_rsvp_session (proto_item *ti, proto_tree *rsvp_object_tree,
 			    "C-type: 7 - IPv4 LSP");
 	proto_tree_add_item(rsvp_object_tree,
 			    hf_rsvp_filter[RSVPF_SESSION_IP],
-			    tvb, offset2, 4, FALSE);
+			    tvb, offset2, 4, ENC_BIG_ENDIAN);
 
 	proto_tree_add_item(rsvp_object_tree,
 			    hf_rsvp_filter[RSVPF_SESSION_TUNNEL_ID],
-			    tvb, offset2+6, 2, FALSE);
+			    tvb, offset2+6, 2, ENC_BIG_ENDIAN);
 
 	proto_tree_add_text(rsvp_object_tree, tvb, offset2+8, 4,
 			    "Extended Tunnel ID: %u (%s)",
@@ -1716,7 +1716,7 @@ dissect_rsvp_session (proto_item *ti, proto_tree *rsvp_object_tree,
 			    tvb_ip_to_str(tvb, offset2+8));
 	hidden_item = proto_tree_add_item(rsvp_object_tree,
 				   hf_rsvp_filter[RSVPF_SESSION_EXT_TUNNEL_ID],
-				   tvb, offset2+8, 4, FALSE);
+				   tvb, offset2+8, 4, ENC_BIG_ENDIAN);
 	PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 	/*
@@ -1735,7 +1735,7 @@ dissect_rsvp_session (proto_item *ti, proto_tree *rsvp_object_tree,
 			    "C-type: 9 - IPv4 Aggregate");
 	proto_tree_add_item(rsvp_object_tree,
 			    hf_rsvp_filter[RSVPF_SESSION_IP],
-			    tvb, offset2, 4, FALSE);
+			    tvb, offset2, 4, ENC_BIG_ENDIAN);
 
 	proto_tree_add_text(rsvp_object_tree, tvb, offset2+7, 1,
 			    "DSCP: %u (%s)",
@@ -1758,18 +1758,18 @@ dissect_rsvp_session (proto_item *ti, proto_tree *rsvp_object_tree,
 			    "C-type: 11 - IPv4 UNI");
 	proto_tree_add_item(rsvp_object_tree,
 			    hf_rsvp_filter[RSVPF_SESSION_IP],
-			    tvb, offset2, 4, FALSE);
+			    tvb, offset2, 4, ENC_BIG_ENDIAN);
 
 	proto_tree_add_item(rsvp_object_tree,
 			    hf_rsvp_filter[RSVPF_SESSION_TUNNEL_ID],
-			    tvb, offset2+6, 2, FALSE);
+			    tvb, offset2+6, 2, ENC_BIG_ENDIAN);
 
 	proto_tree_add_text(rsvp_object_tree, tvb, offset2+8, 4,
 			    "Extended IPv4 Address: %s",
 			    tvb_ip_to_str(tvb, offset2+8));
 	hidden_item = proto_tree_add_item(rsvp_object_tree,
 				   hf_rsvp_filter[RSVPF_SESSION_EXT_TUNNEL_ID],
-				   tvb, offset2+8, 4, FALSE);
+				   tvb, offset2+8, 4, ENC_BIG_ENDIAN);
 	PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 	/*
@@ -1789,18 +1789,18 @@ dissect_rsvp_session (proto_item *ti, proto_tree *rsvp_object_tree,
 			    "C-type: 15 - IPv4 E-NNI");
 	proto_tree_add_item(rsvp_object_tree,
 			    hf_rsvp_filter[RSVPF_SESSION_IP],
-			    tvb, offset2, 4, FALSE);
+			    tvb, offset2, 4, ENC_BIG_ENDIAN);
 
 	proto_tree_add_item(rsvp_object_tree,
 			    hf_rsvp_filter[RSVPF_SESSION_TUNNEL_ID],
-			    tvb, offset2+6, 2, FALSE);
+			    tvb, offset2+6, 2, ENC_BIG_ENDIAN);
 
 	proto_tree_add_text(rsvp_object_tree, tvb, offset2+8, 4,
 			    "Extended IPv4 Address: %s",
 			    tvb_ip_to_str(tvb, offset2+8));
 	hidden_item = proto_tree_add_item(rsvp_object_tree,
 				   hf_rsvp_filter[RSVPF_SESSION_EXT_TUNNEL_ID],
-				   tvb, offset2+8, 4, FALSE);
+				   tvb, offset2+8, 4, ENC_BIG_ENDIAN);
 	PROTO_ITEM_SET_HIDDEN(hidden_item);
 
 	/*
@@ -2562,10 +2562,10 @@ dissect_rsvp_template_filter (proto_item *ti, proto_tree *rsvp_object_tree,
 			     "C-type: 1 - IPv4");
 	 proto_tree_add_item(rsvp_object_tree,
 			     hf_rsvp_filter[RSVPF_SENDER_IP],
-			     tvb, offset2, 4, FALSE);
+			     tvb, offset2, 4, ENC_BIG_ENDIAN);
 	 proto_tree_add_item(rsvp_object_tree,
 			     hf_rsvp_filter[RSVPF_SENDER_PORT],
-			     tvb, offset2+6, 2, FALSE);
+			     tvb, offset2+6, 2, ENC_BIG_ENDIAN);
 
 	 /*
 	  * Save this information to build the conversation request key later.
@@ -2590,10 +2590,10 @@ dissect_rsvp_template_filter (proto_item *ti, proto_tree *rsvp_object_tree,
 			     "C-type: 7 - IPv4 LSP");
 	 proto_tree_add_item(rsvp_object_tree,
 			     hf_rsvp_filter[RSVPF_SENDER_IP],
-			     tvb, offset2, 4, FALSE);
+			     tvb, offset2, 4, ENC_BIG_ENDIAN);
 	 proto_tree_add_item(rsvp_object_tree,
 			     hf_rsvp_filter[RSVPF_SENDER_LSP_ID],
-			     tvb, offset2+6, 2, FALSE);
+			     tvb, offset2+6, 2, ENC_BIG_ENDIAN);
 
 	 /*
 	  * Save this information to build the conversation request key later.
@@ -2607,7 +2607,7 @@ dissect_rsvp_template_filter (proto_item *ti, proto_tree *rsvp_object_tree,
 			     "C-type: 9 - IPv4 Aggregate");
 	 proto_tree_add_item(rsvp_object_tree,
 			     hf_rsvp_filter[RSVPF_SENDER_IP],
-			     tvb, offset2, 4, FALSE);
+			     tvb, offset2, 4, ENC_BIG_ENDIAN);
 
 	 /*
 	  * Save this information to build the conversation request key later.
@@ -4519,7 +4519,7 @@ dissect_rsvp_ero_rro_subobjects (proto_tree *ti, proto_tree *rsvp_object_tree,
 
               proto_tree_add_item(rsvp_ro_subtree,
                                   hf_rsvp_filter[RSVPF_ENT_CODE],
-                                  tvb, offset+l+4, 4, FALSE);
+                                  tvb, offset+l+4, 4, ENC_BIG_ENDIAN);
               if (private_so_len > 8) {
                   /* some private data */
                   proto_tree_add_text(rsvp_ro_subtree, tvb, offset+l+8,
@@ -5353,10 +5353,10 @@ dissect_rsvp_gen_uni (proto_tree *ti, proto_tree *rsvp_object_tree,
 					"Length: %u", sobj_len);
 		    if (j==1)
 		      proto_tree_add_item(rsvp_gen_uni_subtree, hf_rsvp_filter[RSVPF_GUNI_SRC_IPV4],
-				          tvb, offset2+l+4, 4, FALSE);
+				          tvb, offset2+l+4, 4, ENC_BIG_ENDIAN);
 		    else
 		      proto_tree_add_item(rsvp_gen_uni_subtree, hf_rsvp_filter[RSVPF_GUNI_DST_IPV4],
-				          tvb, offset2+l+4, 4, FALSE);
+				          tvb, offset2+l+4, 4, ENC_BIG_ENDIAN);
 		    if (i < 4) {
 			proto_item_append_text(ti, "%s IPv4 TNA: %s", c,
 					       tvb_ip_to_str(tvb, offset2+l+4));
@@ -5377,10 +5377,10 @@ dissect_rsvp_gen_uni (proto_tree *ti, proto_tree *rsvp_object_tree,
 					"Length: %u", sobj_len);
 		    if (j==1)
 		      proto_tree_add_item(rsvp_gen_uni_subtree, hf_rsvp_filter[RSVPF_GUNI_SRC_IPV6],
-				          tvb, offset2+l+4, 16, FALSE);
+				          tvb, offset2+l+4, 16, ENC_NA);
 		    else
 		      proto_tree_add_item(rsvp_gen_uni_subtree, hf_rsvp_filter[RSVPF_GUNI_DST_IPV6],
-				          tvb, offset2+l+4, 16, FALSE);
+				          tvb, offset2+l+4, 16, ENC_NA);
 		    if (i < 4) {
 			proto_item_append_text(ti, "%s IPv6 TNA: %s", c,
 					       tvb_ip6_to_str(tvb, offset2+l+4));
@@ -5687,14 +5687,14 @@ dissect_rsvp_call_id (proto_tree *ti, proto_tree *rsvp_object_tree,
             offset4 = offset3 + 4;
             str = tvb_ip_to_str(tvb, offset3);
             proto_tree_add_item(rsvp_object_tree, hf_rsvp_filter[RSVPF_CALL_ID_SRC_ADDR_IPV4],
-                                tvb, offset3, 4, FALSE);
+                                tvb, offset3, 4, ENC_BIG_ENDIAN);
             break;
 
 	case 2:
             offset4 = offset3 + 16;
             str = tvb_ip6_to_str(tvb, offset3);
             proto_tree_add_item(rsvp_object_tree, hf_rsvp_filter[RSVPF_CALL_ID_SRC_ADDR_IPV6],
-                                tvb, offset3, 16, FALSE);
+                                tvb, offset3, 16, ENC_NA);
             break;
 
 	case 3:
@@ -6184,7 +6184,7 @@ dissect_rsvp_diffserv_aware_te(proto_tree *ti, proto_tree *rsvp_object_tree,
 
     hidden_item = proto_tree_add_item(rsvp_object_tree,
 			       hf_rsvp_filter[RSVPF_DSTE],
-			       tvb, offset, 8, FALSE);
+			       tvb, offset, 8, ENC_NA);
     PROTO_ITEM_SET_HIDDEN(hidden_item);
 
     switch(type) {
@@ -6193,7 +6193,7 @@ dissect_rsvp_diffserv_aware_te(proto_tree *ti, proto_tree *rsvp_object_tree,
 	proto_tree_add_text(rsvp_object_tree, tvb, offset+3, 1, "C-type: 1");
 	proto_tree_add_item(rsvp_object_tree,
 			    hf_rsvp_filter[RSVPF_DSTE_CLASSTYPE],
-			    tvb, offset2+3, 1, FALSE);
+			    tvb, offset2+3, 1, ENC_BIG_ENDIAN);
 	proto_item_set_text(ti, "CLASSTYPE: CT %u", ct);
 	break;
     default:
@@ -6231,13 +6231,13 @@ dissect_rsvp_vendor_private_use(proto_tree *ti _U_,
 
     hidden_item = proto_tree_add_item(rsvp_object_tree,
                                       hf_rsvp_filter[RSVPF_PRIVATE_OBJ],
-                                      tvb, offset, obj_length, FALSE);
+                                      tvb, offset, obj_length, ENC_NA);
     PROTO_ITEM_SET_HIDDEN(hidden_item);
     proto_tree_add_text(rsvp_object_tree, tvb, offset + 3, 1,
                         "C-type: %u", type);
     proto_tree_add_item(rsvp_object_tree,
                         hf_rsvp_filter[RSVPF_ENT_CODE],
-                        tvb, offset + 4, 4, FALSE);
+                        tvb, offset + 4, 4, ENC_BIG_ENDIAN);
     proto_tree_add_text(rsvp_object_tree, tvb, offset + 8, obj_length - 8,
                         "Data (%d bytes)", obj_length - 8);
 }