From 30cee9900941e991a3c52285dbdd0751b13a0254 Mon Sep 17 00:00:00 2001 From: Bill Meier Date: Wed, 9 Nov 2011 17:33:18 +0000 Subject: [PATCH] Fix a number of proto_tree_add_item() encoding args. svn path=/trunk/; revision=39774 --- epan/dissectors/packet-dcerpc-ndr.c | 2 +- epan/dissectors/packet-dcerpc-netlogon.c | 2 +- epan/dissectors/packet-dcerpc.c | 2 +- epan/dissectors/packet-dcm.c | 2 +- epan/dissectors/packet-h223.c | 2 +- epan/dissectors/packet-h248_annex_c.c | 2 +- epan/dissectors/packet-h248_q1950.c | 2 +- epan/dissectors/packet-imf.c | 2 +- epan/dissectors/packet-ipv6.c | 2 +- epan/dissectors/packet-iscsi.c | 2 +- epan/dissectors/packet-ismp.c | 2 +- epan/dissectors/packet-jxta.c | 2 +- epan/dissectors/packet-kerberos4.c | 2 +- epan/dissectors/packet-maccontrol.c | 2 +- epan/dissectors/packet-mip6.c | 2 +- epan/dissectors/packet-ndps.c | 2 +- epan/dissectors/packet-ntlmssp.c | 2 +- epan/dissectors/packet-opsi.c | 2 +- epan/dissectors/packet-pnrp.c | 2 +- epan/dissectors/packet-q931.c | 2 +- epan/dissectors/packet-q933.c | 2 +- epan/dissectors/packet-redbackli.c | 2 +- epan/dissectors/packet-rlc-lte.c | 2 +- epan/dissectors/packet-rmt-fec.c | 2 +- epan/dissectors/packet-rmt-lct.c | 6 +++--- epan/dissectors/packet-rudp.c | 2 +- epan/dissectors/packet-sgsap.c | 2 +- epan/dissectors/packet-turbocell.c | 2 +- epan/dissectors/packet-udp.c | 2 +- epan/dissectors/packet-vnc.c | 2 +- epan/dissectors/packet-wps.c | 2 +- 31 files changed, 33 insertions(+), 33 deletions(-) diff --git a/epan/dissectors/packet-dcerpc-ndr.c b/epan/dissectors/packet-dcerpc-ndr.c index 0d92d69a3e..44867f08a5 100644 --- a/epan/dissectors/packet-dcerpc-ndr.c +++ b/epan/dissectors/packet-dcerpc-ndr.c @@ -538,7 +538,7 @@ dissect_ndr_ctx_hnd (tvbuff_t *tvb, gint offset, packet_info *pinfo, dcerpc_tvb_get_uuid (tvb, offset+4, drep, &ctx_hnd.uuid); if (tree) { /* Bytes is bytes - don't worry about the data representation */ - proto_tree_add_item (tree, hfindex, tvb, offset, 20, FALSE); + proto_tree_add_item (tree, hfindex, tvb, offset, 20, ENC_NA); } if (pdata) { *pdata = ctx_hnd; diff --git a/epan/dissectors/packet-dcerpc-netlogon.c b/epan/dissectors/packet-dcerpc-netlogon.c index bf2cc5bd45..47fd19734f 100644 --- a/epan/dissectors/packet-dcerpc-netlogon.c +++ b/epan/dissectors/packet-dcerpc-netlogon.c @@ -3804,7 +3804,7 @@ netlogon_dissect_CIPHER_VALUE_DATA(tvbuff_t *tvb, int offset, hf_netlogon_cipher_len, &data_len); proto_tree_add_item(tree, di->hf_index, tvb, offset, - data_len, FALSE); + data_len, ENC_NA); offset += data_len; return offset; diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index 17445a3b24..da3637133e 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -2448,7 +2448,7 @@ dcerpc_try_handoff (packet_info *pinfo, proto_tree *tree, if (tree) { sub_item = proto_tree_add_item (tree, sub_proto->proto_id, (decrypted_tvb != NULL)?decrypted_tvb:tvb, - 0, -1, FALSE); + 0, -1, ENC_NA); if (sub_item) { sub_tree = proto_item_add_subtree (sub_item, sub_proto->ett); diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c index f2b1268a73..2582a67fcb 100644 --- a/epan/dissectors/packet-dcm.c +++ b/epan/dissectors/packet-dcm.c @@ -4728,7 +4728,7 @@ dissect_dcm_assoc_item(tvbuff_t *tvb, proto_tree *tree, guint32 offset, g_snprintf(*item_value, MAX_BUF_LEN, "%d", item_number); proto_item_append_text(assoc_item_pitem, "%s", *item_value); - proto_tree_add_item(assoc_item_ptree, *hf_value, tvb, offset+4, 4, FALSE); + proto_tree_add_item(assoc_item_ptree, *hf_value, tvb, offset+4, 4, ENC_BIG_ENDIAN); break; diff --git a/epan/dissectors/packet-h223.c b/epan/dissectors/packet-h223.c index e1c64ed928..c71f6bb6da 100644 --- a/epan/dissectors/packet-h223.c +++ b/epan/dissectors/packet-h223.c @@ -673,7 +673,7 @@ dissect_mux_al_pdu( tvbuff_t *tvb, packet_info *pinfo, proto_tree *vc_tree, al_item = proto_tree_add_item(vc_tree, al2_sequenced?hf_h223_al2_sequenced:hf_h223_al2_unsequenced, - tvb, 0, -1,FALSE); + tvb, 0, -1, ENC_NA); al_tree = proto_item_add_subtree (al_item, ett_h223_al2); PROTO_ITEM_SET_GENERATED(tmp_item); diff --git a/epan/dissectors/packet-h248_annex_c.c b/epan/dissectors/packet-h248_annex_c.c index 8896f80a13..c5230b53f9 100644 --- a/epan/dissectors/packet-h248_annex_c.c +++ b/epan/dissectors/packet-h248_annex_c.c @@ -788,7 +788,7 @@ static void dissect_h248_annexc_NSAP(proto_tree* tree, } static void dissect_h248_annexc_vpvc(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo _U_, int hfid, h248_curr_info_t* h248_info _U_, void* unused _U_) { - proto_item* pi = proto_tree_add_item(tree,hfid,tvb,0,2,FALSE); + proto_item* pi = proto_tree_add_item(tree,hfid,tvb,0,2,ENC_BIG_ENDIAN); proto_tree* pt = proto_item_add_subtree(pi,ett_vpvc); proto_tree_add_item(pt,hf_h248_pkg_annexc_vp,tvb,0,2,ENC_BIG_ENDIAN); proto_tree_add_item(pt,hf_h248_pkg_annexc_vc,tvb,2,2,ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-h248_q1950.c b/epan/dissectors/packet-h248_q1950.c index da1a2a7167..57e8a66fed 100644 --- a/epan/dissectors/packet-h248_q1950.c +++ b/epan/dissectors/packet-h248_q1950.c @@ -298,7 +298,7 @@ static void dissect_bt_tunneled_proto(proto_tree* tree, tvbuff_t* tvb, packet_in call_dissector(bctp_dissector,bctp_tvb,pinfo,tree); } } else { - proto_tree_add_item(tree,hfid,tvb,0,-1,FALSE); + proto_tree_add_item(tree,hfid,tvb,0,-1,ENC_NA); } } diff --git a/epan/dissectors/packet-imf.c b/epan/dissectors/packet-imf.c index 82a3f85f9e..d636d02931 100644 --- a/epan/dissectors/packet-imf.c +++ b/epan/dissectors/packet-imf.c @@ -758,7 +758,7 @@ dissect_imf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else { /* remove 2 bytes to take off the final CRLF to make things a little prettier */ - item = proto_tree_add_item(tree, hf_id, tvb, value_offset, end_offset - value_offset - 2, FALSE); + item = proto_tree_add_item(tree, hf_id, tvb, value_offset, end_offset - value_offset - 2, ENC_ASCII|ENC_NA); } if(f_info->add_to_col_info && check_col(pinfo->cinfo, COL_INFO)) { diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index e2927aee72..d59720f20a 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -922,7 +922,7 @@ dissect_opts(tvbuff_t *tvb, int offset, proto_tree *tree, packet_info * pinfo, c if (tree) { /* !!! specify length */ - ti = proto_tree_add_item(tree, hf_option_item, tvb, offset, len, FALSE); + ti = proto_tree_add_item(tree, hf_option_item, tvb, offset, len, ENC_NA); dstopt_tree = proto_item_add_subtree(ti, ett_ipv6); diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c index 41b52999a1..000e088926 100644 --- a/epan/dissectors/packet-iscsi.c +++ b/epan/dissectors/packet-iscsi.c @@ -680,7 +680,7 @@ handleDataSegment(proto_item *ti, tvbuff_t *tvb, guint offset, guint dataSegment int dataOffset = offset; int dataLen = MIN(dataSegmentLen, endOffset - offset); if(dataLen > 0) { - proto_tree_add_item(ti, hf_id, tvb, offset, dataLen, FALSE); + proto_tree_add_item(ti, hf_id, tvb, offset, dataLen, ENC_NA); offset += dataLen; } if(offset < endOffset && (offset & 3) != 0) { diff --git a/epan/dissectors/packet-ismp.c b/epan/dissectors/packet-ismp.c index a073a53487..a6e8475b2a 100644 --- a/epan/dissectors/packet-ismp.c +++ b/epan/dissectors/packet-ismp.c @@ -255,7 +255,7 @@ dissect_ismp_edp(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *ismp /* create display subtree for EDP */ if (ismp_tree) { edp_ti = proto_tree_add_item(ismp_tree, hf_ismp_edp, tvb, offset, - tvb_length_remaining(tvb, offset), FALSE); + tvb_length_remaining(tvb, offset), ENC_NA); edp_tree = proto_item_add_subtree(edp_ti, ett_ismp_edp); col_add_fstr(pinfo->cinfo, COL_INFO, "MIP %s, MMAC %s, ifIdx %d", diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c index 82a9c79346..a0a40e8d41 100644 --- a/epan/dissectors/packet-jxta.c +++ b/epan/dissectors/packet-jxta.c @@ -947,7 +947,7 @@ static int dissect_jxta_welcome(tvbuff_t * tvb, packet_info * pinfo, proto_tree if (jxta_welcome_tree) { jxta_welcome_tree_item = proto_tree_add_item(jxta_welcome_tree, (each_variable_token < (variable_tokens -1) ? hf_jxta_welcome_variable : hf_jxta_welcome_version), - tvb, token_offset, (gint) strlen(*current_token), FALSE); + tvb, token_offset, (gint) strlen(*current_token), ENC_ASCII|ENC_NA); proto_item_append_text(jxta_welcome_tree_item, " (UNRECOGNIZED)"); } diff --git a/epan/dissectors/packet-kerberos4.c b/epan/dissectors/packet-kerberos4.c index 90153f717a..424d0af2b7 100644 --- a/epan/dissectors/packet-kerberos4.c +++ b/epan/dissectors/packet-kerberos4.c @@ -101,7 +101,7 @@ static const value_string m_type_vals[] = { static int dissect_krb4_string(packet_info *pinfo _U_, int hf_index, proto_tree *tree, tvbuff_t *tvb, int offset) { - proto_tree_add_item(tree, hf_index, tvb, offset, -1, FALSE); + proto_tree_add_item(tree, hf_index, tvb, offset, -1, ENC_ASCII|ENC_NA); while(tvb_get_guint8(tvb, offset)!=0){ offset++; } diff --git a/epan/dissectors/packet-maccontrol.c b/epan/dissectors/packet-maccontrol.c index a97f71500e..16eb7d3489 100644 --- a/epan/dissectors/packet-maccontrol.c +++ b/epan/dissectors/packet-maccontrol.c @@ -137,7 +137,7 @@ dissect_macctrl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pause_times_tree = proto_item_add_subtree(ti, ett_macctrl_cbfc_pause_times); for (i=0; i<8; i++) { - proto_tree_add_item(pause_times_tree, *macctrl_cbfc_pause_times_list[i], tvb, 4+i*2, 2, FALSE); + proto_tree_add_item(pause_times_tree, *macctrl_cbfc_pause_times_list[i], tvb, 4+i*2, 2, ENC_BIG_ENDIAN); } } break; diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c index 351af9b927..be131b1fea 100644 --- a/epan/dissectors/packet-mip6.c +++ b/epan/dissectors/packet-mip6.c @@ -1487,7 +1487,7 @@ dissect_mip6_opt_vsm(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, int offset, break; } proto_tree_add_item(field_tree, hf_mip6_vsm_subtype_local, tvb, - offset + MIP6_VSM_SUBTYPE_OFF, MIP6_VSM_SUBTYPE_LEN, FALSE); + offset + MIP6_VSM_SUBTYPE_OFF, MIP6_VSM_SUBTYPE_LEN, ENC_BIG_ENDIAN); p = offset + MIP6_VSM_DATA_OFF; len = optlen - MIP6_VSM_DATA_OFF; diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c index 709459b7b3..2619521999 100644 --- a/epan/dissectors/packet-ndps.c +++ b/epan/dissectors/packet-ndps.c @@ -4270,7 +4270,7 @@ dissect_ndps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree) } if(ndps_hfname != 0) { - proto_tree_add_item(ndps_tree, ndps_hfname, tvb, foffset, 4, FALSE); + proto_tree_add_item(ndps_tree, ndps_hfname, tvb, foffset, 4, ENC_BIG_ENDIAN); if (ndps_func_string != NULL) { if (check_col(pinfo->cinfo, COL_INFO)) diff --git a/epan/dissectors/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c index 49e6dfe581..4a2dae064b 100644 --- a/epan/dissectors/packet-ntlmssp.c +++ b/epan/dissectors/packet-ntlmssp.c @@ -949,7 +949,7 @@ dissect_ntlmssp_blob (tvbuff_t *tvb, int offset, if (ntlmssp_tree) { tf = proto_tree_add_item (ntlmssp_tree, blob_hf, tvb, - blob_offset, blob_length, FALSE); + blob_offset, blob_length, ENC_NA); tree = proto_item_add_subtree(tf, ett_ntlmssp_blob); } proto_tree_add_uint(tree, hf_ntlmssp_blob_len, diff --git a/epan/dissectors/packet-opsi.c b/epan/dissectors/packet-opsi.c index d02347fec5..9904200d22 100644 --- a/epan/dissectors/packet-opsi.c +++ b/epan/dissectors/packet-opsi.c @@ -468,7 +468,7 @@ decode_value_string_attribute(tvbuff_t *tvb, proto_tree *tree, int* hfValue, int proto_tree_add_text(tree, tvb, offset, length, "Too short attribute!"); return; } - proto_tree_add_item(tree, *hfValue, tvb, offset+4, 4, FALSE); + proto_tree_add_item(tree, *hfValue, tvb, offset+4, 4, ENC_BIG_ENDIAN); } static void diff --git a/epan/dissectors/packet-pnrp.c b/epan/dissectors/packet-pnrp.c index f697d409b1..817d41517f 100644 --- a/epan/dissectors/packet-pnrp.c +++ b/epan/dissectors/packet-pnrp.c @@ -1009,7 +1009,7 @@ static void dissect_payload_structure(tvbuff_t *tvb, gint offset, gint length, p dissect_ipv6_address(tvb, offset, 16, pnrp_payload_tree); offset += 16; proto_tree_add_text(pnrp_payload_tree, tvb, offset,2, "Port Number : %d",tvb_get_letohs(tvb,offset)); - /* proto_tree_add_item(pnrp_payload_tree, hf_pnrp_payload_port, tvb, offset, 2, FALSE); */ + /* proto_tree_add_item(pnrp_payload_tree, hf_pnrp_payload_port, tvb, offset, 2, ENC_BIG_ENDIAN); */ offset += 2; proto_tree_add_text(pnrp_payload_tree, tvb, offset,2, "IANA Protocol Number : %d",tvb_get_letohs(tvb,offset)); offset += 2; diff --git a/epan/dissectors/packet-q931.c b/epan/dissectors/packet-q931.c index c5ae68d8a3..9640cbaf01 100644 --- a/epan/dissectors/packet-q931.c +++ b/epan/dissectors/packet-q931.c @@ -2237,7 +2237,7 @@ dissect_q931_number_ie(tvbuff_t *tvb, int offset, int len, if (len == 0) return; - proto_tree_add_item(tree, hfindex, tvb, offset, len, FALSE); + proto_tree_add_item(tree, hfindex, tvb, offset, len, ENC_ASCII|ENC_NA); proto_item_append_text(proto_tree_get_parent(tree), ": '%s'", tvb_format_text(tvb, offset, len)); if ( number_plan == 1 ) { diff --git a/epan/dissectors/packet-q933.c b/epan/dissectors/packet-q933.c index 396766299c..da5fb96c84 100644 --- a/epan/dissectors/packet-q933.c +++ b/epan/dissectors/packet-q933.c @@ -1682,7 +1682,7 @@ dissect_q933_number_ie(tvbuff_t *tvb, int offset, int len, if (len == 0) return; - proto_tree_add_item(tree, hfindex, tvb, offset, len, FALSE); + proto_tree_add_item(tree, hfindex, tvb, offset, len, ENC_ASCII|ENC_NA); } /* diff --git a/epan/dissectors/packet-redbackli.c b/epan/dissectors/packet-redbackli.c index 1433da6414..2a9660c267 100644 --- a/epan/dissectors/packet-redbackli.c +++ b/epan/dissectors/packet-redbackli.c @@ -118,7 +118,7 @@ redbackli_dissect_avp(guint8 avptype, guint8 avplen, tvbuff_t *tvb, gint offset, break; case(RB_AVP_DIR): proto_tree_add_item(st, hf_redbackli_dir, tvb, - offset+2, avplen, FALSE); + offset+2, avplen, ENC_NA); break; case(RB_AVP_ACCTID): proto_tree_add_item(st, hf_redbackli_acctid, tvb, diff --git a/epan/dissectors/packet-rlc-lte.c b/epan/dissectors/packet-rlc-lte.c index 4cba546f7f..4d93bd50fb 100644 --- a/epan/dissectors/packet-rlc-lte.c +++ b/epan/dissectors/packet-rlc-lte.c @@ -695,7 +695,7 @@ static void show_PDU_in_tree(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb (rlc_info->rlcMode == RLC_AM_MODE) ? hf_rlc_lte_am_data : hf_rlc_lte_um_data, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_NA); /* Send whole PDU to PDCP */ if ((whole_pdu || (reassembly_info != NULL)) && diff --git a/epan/dissectors/packet-rmt-fec.c b/epan/dissectors/packet-rmt-fec.c index 811c86bc2a..47f59e5272 100644 --- a/epan/dissectors/packet-rmt-fec.c +++ b/epan/dissectors/packet-rmt-fec.c @@ -176,7 +176,7 @@ void fec_dissector(struct _fec_ptr f, tvbuff_t *tvb, proto_tree *tree, guint *of /* Create the FEC subtree */ if (tree) { - ti = proto_tree_add_item(tree, f.hf->header, tvb, *offset, -1, FALSE); + ti = proto_tree_add_item(tree, f.hf->header, tvb, *offset, -1, ENC_NA); fec_tree = proto_item_add_subtree(ti, f.ett->main); } else { diff --git a/epan/dissectors/packet-rmt-lct.c b/epan/dissectors/packet-rmt-lct.c index ea27477d69..c8e96b31a7 100644 --- a/epan/dissectors/packet-rmt-lct.c +++ b/epan/dissectors/packet-rmt-lct.c @@ -302,16 +302,16 @@ gboolean lct_dissector(struct _lct_ptr l, struct _fec_ptr f, tvbuff_t *tvb, prot if (tree) { /* Create the LCT subtree */ - ti = proto_tree_add_item(tree, l.hf->header, tvb, *offset, l.lct->hlen, FALSE); + ti = proto_tree_add_item(tree, l.hf->header, tvb, *offset, l.lct->hlen, ENC_NA); lct_tree = proto_item_add_subtree(ti, l.ett->main); /* Fill the LCT subtree */ proto_tree_add_uint(lct_tree, l.hf->version, tvb, *offset, 1, l.lct->version); - ti = proto_tree_add_item(lct_tree, l.hf->fsize_header, tvb, *offset, 2, FALSE); + ti = proto_tree_add_item(lct_tree, l.hf->fsize_header, tvb, *offset, 2, ENC_NA); lct_fsize_tree = proto_item_add_subtree(ti, l.ett->fsize); - ti = proto_tree_add_item(lct_tree, l.hf->flags_header, tvb, *offset, 2, FALSE); + ti = proto_tree_add_item(lct_tree, l.hf->flags_header, tvb, *offset, 2, ENC_NA); lct_flags_tree = proto_item_add_subtree(ti, l.ett->flags); proto_tree_add_uint(lct_tree, l.hf->hlen, tvb, *offset+2, 1, l.lct->hlen); diff --git a/epan/dissectors/packet-rudp.c b/epan/dissectors/packet-rudp.c index 87ff255751..853b5864be 100644 --- a/epan/dissectors/packet-rudp.c +++ b/epan/dissectors/packet-rudp.c @@ -117,7 +117,7 @@ dissect_rudp(tvbuff_t *tvb, packet_info *pinfo _U_ , proto_tree *tree) flags_tree = proto_item_add_subtree(ti, ett_rudp_flags); for (i = 0; i < 8; i++) - proto_tree_add_item(flags_tree, flags[i], tvb, 0, 1, FALSE); + proto_tree_add_item(flags_tree, flags[i], tvb, 0, 1, ENC_BIG_ENDIAN); proto_tree_add_item(rudp_tree, hf_rudp_hlen, tvb, 1, 1, ENC_BIG_ENDIAN); proto_tree_add_item(rudp_tree, hf_rudp_seq, tvb, 2, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-sgsap.c b/epan/dissectors/packet-sgsap.c index 16ec92a6ce..0e2b4e4944 100644 --- a/epan/dissectors/packet-sgsap.c +++ b/epan/dissectors/packet-sgsap.c @@ -1419,7 +1419,7 @@ dissect_sgsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* * Add SGSAP message name */ - proto_tree_add_item(sgsap_tree, hf_idx, tvb, offset, 1, FALSE); + proto_tree_add_item(sgsap_tree, hf_idx, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; diff --git a/epan/dissectors/packet-turbocell.c b/epan/dissectors/packet-turbocell.c index 570732c3bc..b34b61a4b2 100644 --- a/epan/dissectors/packet-turbocell.c +++ b/epan/dissectors/packet-turbocell.c @@ -188,7 +188,7 @@ static void dissect_turbocell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre col_append_fstr(pinfo->cinfo, COL_INFO, ", Network=\"%s\"",format_text(str_name, str_len-1)); while(tvb_get_guint8(tvb, 0x34 + 8*i)==0x00 && (tvb_length_remaining(tvb,0x34 + 8*i) > 6) && (i<32)) { - proto_tree_add_item(network_tree, hf_turbocell_station[i], tvb, 0x34+8*i, 6, FALSE); + proto_tree_add_item(network_tree, hf_turbocell_station[i], tvb, 0x34+8*i, 6, ENC_NA); i++; } diff --git a/epan/dissectors/packet-udp.c b/epan/dissectors/packet-udp.c index 575c0ddf9e..9ebfc155fd 100644 --- a/epan/dissectors/packet-udp.c +++ b/epan/dissectors/packet-udp.c @@ -329,7 +329,7 @@ dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 ip_proto) get_udp_port(udph->uh_sport), udph->uh_sport, get_udp_port(udph->uh_dport), udph->uh_dport); } } else { - ti = proto_tree_add_item(tree, (ip_proto == IP_PROTO_UDP) ? proto_udp : proto_udplite, tvb, offset, 8, FALSE); + ti = proto_tree_add_item(tree, (ip_proto == IP_PROTO_UDP) ? proto_udp : proto_udplite, tvb, offset, 8, ENC_NA); } udp_tree = proto_item_add_subtree(ti, ett_udp); diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c index 55ca47dfae..ad5c93c5c9 100644 --- a/epan/dissectors/packet-vnc.c +++ b/epan/dissectors/packet-vnc.c @@ -711,7 +711,7 @@ process_tight_capabilities(proto_tree *tree, for (i = 0; i < num_capabilities; i++) { char *name; - proto_tree_add_item(tree, type_index, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, type_index, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; offset = process_vendor(tree, vendor_index, tvb, offset); diff --git a/epan/dissectors/packet-wps.c b/epan/dissectors/packet-wps.c index 3c6d4f4368..8e19992d8c 100644 --- a/epan/dissectors/packet-wps.c +++ b/epan/dissectors/packet-wps.c @@ -1467,7 +1467,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, guint16 dev_cat = tvb_get_ntohs(tvb, offset+4); if (dev_cat > 0 && dev_cat <= WPS_DEVICE_TYPE_CATEGORY_MAX) { proto_tree_add_item(tlv_root, hf_eapwps_tlv_primary_device_type_category, tvb, offset+4, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(tlv_root, hf_eapwps_tlv_primary_device_type_subcategory[dev_cat-1], tvb, offset+10, 2, FALSE); + proto_tree_add_item(tlv_root, hf_eapwps_tlv_primary_device_type_subcategory[dev_cat-1], tvb, offset+10, 2, ENC_BIG_ENDIAN); } }