diff options
| -rw-r--r-- | epan/dissectors/packet-dtls.c | 10 | ||||
| -rw-r--r-- | epan/dissectors/packet-fcdns.c | 8 | ||||
| -rw-r--r-- | epan/dissectors/packet-fcfcs.c | 24 | ||||
| -rw-r--r-- | epan/dissectors/packet-fcfzs.c | 6 | ||||
| -rw-r--r-- | epan/dissectors/packet-fcp.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-fcswils.c | 14 | ||||
| -rw-r--r-- | epan/dissectors/packet-rtps2.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-scsi-osd.c | 30 | ||||
| -rw-r--r-- | epan/dissectors/packet-scsi-sbc.c | 10 | ||||
| -rw-r--r-- | epan/dissectors/packet-scsi.c | 18 | ||||
| -rw-r--r-- | epan/dissectors/packet-ssl.c | 12 |
11 files changed, 68 insertions, 68 deletions
diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c index 6f0612d05b..1ca1c4ea4c 100644 --- a/epan/dissectors/packet-dtls.c +++ b/epan/dissectors/packet-dtls.c @@ -663,7 +663,7 @@ dissect_dtls_record(tvbuff_t *tvb, packet_info *pinfo, /* add the record layer subtree header */ tvb_ensure_bytes_exist(tvb, offset, 13 + record_length); ti = proto_tree_add_item(tree, hf_dtls_record, tvb, - offset, 13 + record_length, 0); + offset, 13 + record_length, ENC_NA); dtls_record_tree = proto_item_add_subtree(ti, ett_dtls_record); } @@ -849,7 +849,7 @@ dissect_dtls_record(tvbuff_t *tvb, packet_info *pinfo, } proto_tree_add_item(dtls_record_tree, hf_dtls_record_appdata, tvb, - offset, record_length, 0); + offset, record_length, ENC_NA); break; default: @@ -906,7 +906,7 @@ dissect_dtls_alert(tvbuff_t *tvb, packet_info *pinfo, if (tree) { ti = proto_tree_add_item(tree, hf_dtls_alert_message, tvb, - offset, 2, 0); + offset, 2, ENC_NA); ssl_alert_tree = proto_item_add_subtree(ti, ett_dtls_alert); } @@ -1130,7 +1130,7 @@ dissect_dtls_handshake(tvbuff_t *tvb, packet_info *pinfo, /* add a subtree for the handshake protocol */ ti = proto_tree_add_item(tree, hf_dtls_handshake_protocol, tvb, - offset, fragment_length + 12, 0); + offset, fragment_length + 12, ENC_NA); ssl_hand_tree = proto_item_add_subtree(ti, ett_dtls_handshake); if (ssl_hand_tree) @@ -1341,7 +1341,7 @@ dissect_dtls_hnd_hello_common(tvbuff_t *tvb, proto_tree *tree, /* show the random bytes */ proto_tree_add_item(tree, hf_dtls_handshake_random_bytes, - tvb, offset, 28, 0); + tvb, offset, 28, ENC_NA); offset += 28; /* show the session id */ diff --git a/epan/dissectors/packet-fcdns.c b/epan/dissectors/packet-fcdns.c index b790f78963..3e57a84137 100644 --- a/epan/dissectors/packet-fcdns.c +++ b/epan/dissectors/packet-fcdns.c @@ -478,7 +478,7 @@ dissect_fcdns_ganxt (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) } if (tvb_offset_exists (tvb, 556)) { proto_tree_add_item (req_tree, hf_fcdns_rply_ipa, tvb, - offset+532, 8, 0); + offset+532, 8, ENC_NA); } if (tvb_offset_exists (tvb, 572)) { proto_tree_add_item (req_tree, hf_fcdns_rply_ipnode, tvb, @@ -643,7 +643,7 @@ dissect_fcdns_gfdid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq) * to track the display by the length field */ desclen = tvb_get_guint8 (tvb, offset); proto_tree_add_item (req_tree, hf_fcdns_rply_fc4desc, tvb, - offset, desclen, 0); + offset, desclen, ENC_NA); tot_len -= 255; /* descriptors are aligned to 255 bytes */ offset += 256; } @@ -1241,7 +1241,7 @@ dissect_fcdns_swils_entries (tvbuff_t *tvb, proto_tree *tree, int offset) offset+1, len, 0); offset += 256; } - proto_tree_add_item (tree, hf_fcdns_rply_ipa, tvb, offset, 8, 0); + proto_tree_add_item (tree, hf_fcdns_rply_ipa, tvb, offset, 8, ENC_NA); proto_tree_add_item (tree, hf_fcdns_rply_ipnode, tvb, offset+8, 16, 0); dissect_cos_flags(tree, tvb, offset+24, hf_fcdns_reply_cos); @@ -1264,7 +1264,7 @@ dissect_fcdns_swils_entries (tvbuff_t *tvb, proto_tree *tree, int offset) proto_tree_add_item (tree, hf_fcdns_rply_fc4desclen, tvb, offset+132, 1, 0); proto_tree_add_item (tree, hf_fcdns_rply_fc4desc, tvb, - offset+133, len, 0); + offset+133, len, ENC_NA); } else { proto_tree_add_item (tree, hf_fcdns_num_fc4desc, tvb, diff --git a/epan/dissectors/packet-fcfcs.c b/epan/dissectors/packet-fcfcs.c index 3b23dc448b..e1c60b159b 100644 --- a/epan/dissectors/packet-fcfcs.c +++ b/epan/dissectors/packet-fcfcs.c @@ -376,7 +376,7 @@ dissect_fcfcs_gppn (tvbuff_t *tvb, proto_tree *tree, gboolean isreq) tvb_fcwwn_to_str (tvb, offset)); } else { - proto_tree_add_item (tree, hf_fcs_physportnum, tvb, offset, 4, 0); + proto_tree_add_item (tree, hf_fcs_physportnum, tvb, offset, 4, ENC_NA); } } } @@ -440,7 +440,7 @@ dissect_fcfcs_gplnl (tvbuff_t *tvb, proto_tree *tree, gboolean isreq) proto_tree_add_text (tree, tvb, offset, 1, "Platform Name Length: %d", len); proto_tree_add_item (tree, hf_fcs_platformname, tvb, offset+1, - len, 0); + len, ENC_NA); } else { numelem = tvb_get_ntohl (tvb, offset); @@ -469,7 +469,7 @@ dissect_fcfcs_gplt (tvbuff_t *tvb, proto_tree *tree, gboolean isreq) proto_tree_add_text (tree, tvb, offset, 1, "Platform Name Length: %d", len); proto_tree_add_item (tree, hf_fcs_platformname, tvb, offset+1, - len, 0); + len, ENC_NA); } else { proto_tree_add_item (tree, hf_fcs_platformtype, tvb, offset+3, @@ -490,7 +490,7 @@ dissect_fcfcs_gplml (tvbuff_t *tvb, proto_tree *tree, gboolean isreq) proto_tree_add_text (tree, tvb, offset, 1, "Platform Name Length: %d", len); proto_tree_add_item (tree, hf_fcs_platformname, tvb, offset+1, - len, 0); + len, ENC_NA); } else { numelem = tvb_get_ntohl (tvb, offset); @@ -527,7 +527,7 @@ dissect_fcfcs_gnpl (tvbuff_t *tvb, proto_tree *tree, gboolean isreq) proto_tree_add_text (tree, tvb, offset, 1, "Platform Name Length: %d", len); proto_tree_add_item (tree, hf_fcs_platformname, tvb, offset+1, - len, 0); + len, ENC_NA); } } } @@ -552,7 +552,7 @@ dissect_fcfcs_gpnl (tvbuff_t *tvb, proto_tree *tree, gboolean isreq) "Platform Name Length: %d", len); proto_tree_add_item (tree, hf_fcs_platformname, tvb, offset+1, - len, 0); + len, ENC_NA); offset += 256; } } @@ -589,7 +589,7 @@ dissect_fcfcs_rpl (tvbuff_t *tvb, proto_tree *tree, gboolean isreq) proto_tree_add_text (tree, tvb, offset, 1, "Platform Name Length: %d", len); proto_tree_add_item (tree, hf_fcs_platformname, tvb, offset+1, - len, 0); + len, ENC_NA); proto_tree_add_item (tree, hf_fcs_platformtype, tvb, offset+256, 4, 0); numelem = tvb_get_ntohl (tvb, offset+260); @@ -631,7 +631,7 @@ dissect_fcfcs_rpln (tvbuff_t *tvb, proto_tree *tree, gboolean isreq) proto_tree_add_text (tree, tvb, offset, 1, "Platform Name Length: %d", len); proto_tree_add_item (tree, hf_fcs_platformname, tvb, offset+1, - len, 0); + len, ENC_NA); proto_tree_add_string (tree, hf_fcs_platformnname, tvb, offset+256, 8, tvb_fcwwn_to_str (tvb, offset+256)); } @@ -650,7 +650,7 @@ dissect_fcfcs_rplt (tvbuff_t *tvb, proto_tree *tree, gboolean isreq) proto_tree_add_text (tree, tvb, offset, 1, "Platform Name Length: %d", len); proto_tree_add_item (tree, hf_fcs_platformname, tvb, offset+1, - len, 0); + len, ENC_NA); proto_tree_add_item (tree, hf_fcs_platformtype, tvb, offset+256, 4, 0); } @@ -669,7 +669,7 @@ dissect_fcfcs_rplm (tvbuff_t *tvb, proto_tree *tree, gboolean isreq) proto_tree_add_text (tree, tvb, offset, 1, "Platform Name Length: %d", len); proto_tree_add_item (tree, hf_fcs_platformname, tvb, offset+1, - len, 0); + len, ENC_NA); len = tvb_get_guint8 (tvb, offset+256); proto_tree_add_text (tree, tvb, offset+256, 1, "Platform Mgmt. Address Length: %d", len); @@ -691,7 +691,7 @@ dissect_fcfcs_dpl (tvbuff_t *tvb, proto_tree *tree, gboolean isreq) proto_tree_add_text (tree, tvb, offset, 1, "Platform Name Length: %d", len); proto_tree_add_item (tree, hf_fcs_platformname, tvb, offset+1, - len, 0); + len, ENC_NA); } } } @@ -721,7 +721,7 @@ dissect_fcfcs_dplml (tvbuff_t *tvb, proto_tree *tree, gboolean isreq) proto_tree_add_text (tree, tvb, offset, 1, "Platform Name Length: %d", len); proto_tree_add_item (tree, hf_fcs_platformname, tvb, offset+1, - len, 0); + len, ENC_NA); } } } diff --git a/epan/dissectors/packet-fcfzs.c b/epan/dissectors/packet-fcfzs.c index 391fd620d7..89f5b0efe5 100644 --- a/epan/dissectors/packet-fcfzs.c +++ b/epan/dissectors/packet-fcfzs.c @@ -208,7 +208,7 @@ dissect_fcfzs_zoneset (tvbuff_t *tvb, proto_tree *tree, int offset) offset+4, 8, tvb_fcwwn_to_str (tvb, offset+4)); proto_tree_add_item (tree, hf_fcfzs_mbrid_lun, tvb, - offset+8, 8, 0); + offset+8, 8, ENC_NA); break; case FC_FZS_ZONEMBR_DP_LUN: proto_tree_add_string_format (tree, @@ -218,14 +218,14 @@ dissect_fcfzs_zoneset (tvbuff_t *tvb, proto_tree *tree, int offset) tvb_get_ntoh24 (tvb, offset+4)); proto_tree_add_item (tree, hf_fcfzs_mbrid_lun, tvb, - offset+4, 8, 0); + offset+4, 8, ENC_NA); break; case FC_FZS_ZONEMBR_FCID_LUN: proto_tree_add_string (tree, hf_fcfzs_mbrid, tvb, offset+4, 4, tvb_fc_to_str (tvb, offset+4)); proto_tree_add_item (tree, hf_fcfzs_mbrid_lun, tvb, - offset+4, 8, 0); + offset+4, 8, ENC_NA); break; default: proto_tree_add_string (tree, hf_fcfzs_mbrid, tvb, diff --git a/epan/dissectors/packet-fcp.c b/epan/dissectors/packet-fcp.c index 2aa2a1507d..66db2ed914 100644 --- a/epan/dissectors/packet-fcp.c +++ b/epan/dissectors/packet-fcp.c @@ -413,7 +413,7 @@ dissect_fcp_cmnd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, pro * real single-level LUN, all 8 bytes except byte 1 must be 0. */ if (lun0) { - proto_tree_add_item(tree, hf_fcp_multilun, tvb, offset, 8, 0); + proto_tree_add_item(tree, hf_fcp_multilun, tvb, offset, 8, ENC_NA); lun=tvb_get_guint8(tvb, offset)&0x3f; lun<<=8; lun|=tvb_get_guint8(tvb, offset+1); diff --git a/epan/dissectors/packet-fcswils.c b/epan/dissectors/packet-fcswils.c index 88871ffa10..b0fa579a50 100644 --- a/epan/dissectors/packet-fcswils.c +++ b/epan/dissectors/packet-fcswils.c @@ -687,7 +687,7 @@ dissect_swils_ess_capability_obj (tvbuff_t *tvb, proto_tree *tree, int offset) while ((i > 0) && tvb_bytes_exist (tvb, offset, 8)) { proto_tree_add_item (capinfo_tree, hf_swils_ess_cap_vendorobj, - tvb, offset, 8, 0); + tvb, offset, 8, ENC_NA); i -= 8; offset += 8; len += 12; @@ -726,7 +726,7 @@ dissect_swils_elp (tvbuff_t *tvb, proto_tree *elp_tree, guint8 isreq _U_) if (elp_tree) { offset += 4; proto_tree_add_item (elp_tree, hf_swils_elp_rev, tvb, offset++, 1, 0); - proto_tree_add_item (elp_tree, hf_swils_elp_flags, tvb, offset, 2, 0); + proto_tree_add_item (elp_tree, hf_swils_elp_flags, tvb, offset, 2, ENC_NA); offset += 3; proto_tree_add_uint_format (elp_tree, hf_swils_elp_r_a_tov, tvb, offset, 4, elp.r_a_tov, "R_A_TOV: %d msecs", elp.r_a_tov); @@ -1005,7 +1005,7 @@ dissect_swils_fspf_hdr (tvbuff_t *tvb, proto_tree *tree, int offset) proto_tree_add_item (fspfh_tree, hf_swils_fspfh_dom_id, tvb, offset+11, 1, 0); proto_tree_add_item (fspfh_tree, hf_swils_fspfh_auth, tvb, offset+12, - 8, 0); + 8, ENC_NA); } } @@ -1085,7 +1085,7 @@ dissect_swils_hello (tvbuff_t *tvb, proto_tree *hlo_tree, guint8 isreq _U_) if (hlo_tree) { dissect_swils_fspf_hdr (tvb, hlo_tree, offset); - proto_tree_add_item (hlo_tree, hf_swils_hlo_options, tvb, offset+20, 4, 0); + proto_tree_add_item (hlo_tree, hf_swils_hlo_options, tvb, offset+20, 4, ENC_NA); proto_tree_add_item (hlo_tree, hf_swils_hlo_hloint, tvb, offset+24, 4, 0); proto_tree_add_item (hlo_tree, hf_swils_hlo_deadint, tvb, offset+28, 4, 0); proto_tree_add_item (hlo_tree, hf_swils_hlo_rcv_domid, tvb, offset+35, 1, 0); @@ -1255,7 +1255,7 @@ dissect_swils_zone_mbr (tvbuff_t *tvb, proto_tree *zmbr_tree, int offset) offset+4, 8, tvb_fcwwn_to_str (tvb, offset+4)); proto_tree_add_item (zmbr_tree, hf_swils_zone_mbrid_lun, tvb, - offset+12, 8, 0); + offset+12, 8, ENC_NA); break; case FC_SWILS_ZONEMBR_DP_LUN: g_snprintf(dpbuf, sizeof(dpbuf), "0x%08x", tvb_get_ntohl (tvb, offset+4)); @@ -1269,7 +1269,7 @@ dissect_swils_zone_mbr (tvbuff_t *tvb, proto_tree *zmbr_tree, int offset) offset+4, 4, tvb_fc_to_str (tvb, offset+5)); proto_tree_add_item (zmbr_tree, hf_swils_zone_mbrid_lun, tvb, - offset+8, 8, 0); + offset+8, 8, ENC_NA); break; default: proto_tree_add_string (zmbr_tree, hf_swils_zone_mbrid, tvb, @@ -1700,7 +1700,7 @@ dissect_swils_mrra (tvbuff_t *tvb, proto_tree *tree, guint8 isreq) proto_tree_add_item (tree, hf_swils_mrra_size, tvb, offset+8, 4, 0); proto_tree_add_item (tree, hf_swils_mrra_vendorid, tvb, offset+12, 8, 0); proto_tree_add_item (tree, hf_swils_mrra_vendorinfo, tvb, offset+20, - 8, 0); + 8, ENC_NA); } else { proto_tree_add_item (tree, hf_swils_mrra_vendorid, tvb, offset+4, 8, 0); diff --git a/epan/dissectors/packet-rtps2.c b/epan/dissectors/packet-rtps2.c index f50116a157..eb3225ea58 100644 --- a/epan/dissectors/packet-rtps2.c +++ b/epan/dissectors/packet-rtps2.c @@ -3514,7 +3514,7 @@ static void dissect_octet_seq(proto_tree *tree, tvb, offset, length, - 0); + ENC_NA); } diff --git a/epan/dissectors/packet-scsi-osd.c b/epan/dissectors/packet-scsi-osd.c index 267d3a07a7..adf382cb9a 100644 --- a/epan/dissectors/packet-scsi-osd.c +++ b/epan/dissectors/packet-scsi-osd.c @@ -190,7 +190,7 @@ static void dissect_osd_user_object_id(tvbuff_t *tvb, int offset, proto_tree *tree) { /* user object id */ - proto_tree_add_item(tree, hf_scsi_osd_user_object_id, tvb, offset, 8, 0); + proto_tree_add_item(tree, hf_scsi_osd_user_object_id, tvb, offset, 8, ENC_NA); offset+=8; } @@ -738,19 +738,19 @@ dissect_osd_capability(tvbuff_t *tvb, int offset, proto_tree *parent_tree) offset++; /* capability expiration time */ - proto_tree_add_item(tree, hf_scsi_osd_capability_expiration_time, tvb, offset, 6, 0); + proto_tree_add_item(tree, hf_scsi_osd_capability_expiration_time, tvb, offset, 6, ENC_NA); offset+=6; /* audit */ - proto_tree_add_item(tree, hf_scsi_osd_audit, tvb, offset, 20, 0); + proto_tree_add_item(tree, hf_scsi_osd_audit, tvb, offset, 20, ENC_NA); offset+=20; /* capability discriminator */ - proto_tree_add_item(tree, hf_scsi_osd_capability_discriminator, tvb, offset, 12, 0); + proto_tree_add_item(tree, hf_scsi_osd_capability_discriminator, tvb, offset, 12, ENC_NA); offset+=12; /* object created time */ - proto_tree_add_item(tree, hf_scsi_osd_object_created_time, tvb, offset, 6, 0); + proto_tree_add_item(tree, hf_scsi_osd_object_created_time, tvb, offset, 6, ENC_NA); offset+=6; /* object type */ @@ -769,7 +769,7 @@ dissect_osd_capability(tvbuff_t *tvb, int offset, proto_tree *parent_tree) offset++; /* object descriptor */ - proto_tree_add_item(tree, hf_scsi_osd_object_descriptor, tvb, offset, 24, 0); + proto_tree_add_item(tree, hf_scsi_osd_object_descriptor, tvb, offset, 24, ENC_NA); offset+=24; } @@ -789,11 +789,11 @@ dissect_osd_security_parameters(tvbuff_t *tvb, int offset, proto_tree *parent_tr } /* request integrity check value */ - proto_tree_add_item(tree, hf_scsi_osd_ricv, tvb, offset, 20, 0); + proto_tree_add_item(tree, hf_scsi_osd_ricv, tvb, offset, 20, ENC_NA); offset+=20; /* request nonce */ - proto_tree_add_item(tree, hf_scsi_osd_request_nonce, tvb, offset, 12, 0); + proto_tree_add_item(tree, hf_scsi_osd_request_nonce, tvb, offset, 12, ENC_NA); offset+=12; /* data in integrity check value offset */ @@ -1018,7 +1018,7 @@ static void dissect_osd_initial_object_id(tvbuff_t *tvb, int offset, proto_tree *tree) { /* initial object id */ - proto_tree_add_item(tree, hf_scsi_osd_initial_object_id, tvb, offset, 8, 0); + proto_tree_add_item(tree, hf_scsi_osd_initial_object_id, tvb, offset, 8, ENC_NA); offset+=8; } @@ -1035,7 +1035,7 @@ static void dissect_osd_continuation_object_id(tvbuff_t *tvb, int offset, proto_tree *tree) { /* continuation object id */ - proto_tree_add_item(tree, hf_scsi_osd_continuation_object_id, tvb, offset, 8, 0); + proto_tree_add_item(tree, hf_scsi_osd_continuation_object_id, tvb, offset, 8, ENC_NA); offset+=8; } @@ -1163,7 +1163,7 @@ static void dissect_osd_requested_user_object_id(tvbuff_t *tvb, int offset, proto_tree *tree) { /* request user object id */ - proto_tree_add_item(tree, hf_scsi_osd_requested_user_object_id, tvb, offset, 8, 0); + proto_tree_add_item(tree, hf_scsi_osd_requested_user_object_id, tvb, offset, 8, ENC_NA); offset+=8; } @@ -1332,13 +1332,13 @@ dissect_osd_set_key_version(tvbuff_t *tvb, int offset, proto_tree *tree) static void dissect_osd_key_identifier(tvbuff_t *tvb, int offset, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_osd_key_identifier, tvb, offset, 7, 0); + proto_tree_add_item(tree, hf_scsi_osd_key_identifier, tvb, offset, 7, ENC_NA); } static void dissect_osd_seed(tvbuff_t *tvb, int offset, proto_tree *tree) { - proto_tree_add_item(tree, hf_scsi_osd_seed, tvb, offset, 20, 0); + proto_tree_add_item(tree, hf_scsi_osd_seed, tvb, offset, 20, ENC_NA); } static void @@ -1492,7 +1492,7 @@ static void dissect_osd_collection_object_id(tvbuff_t *tvb, int offset, proto_tree *tree) { /* collection object id */ - proto_tree_add_item(tree, hf_scsi_osd_collection_object_id, tvb, offset, 8, 0); + proto_tree_add_item(tree, hf_scsi_osd_collection_object_id, tvb, offset, 8, ENC_NA); offset+=8; } @@ -1661,7 +1661,7 @@ static void dissect_osd_requested_collection_object_id(tvbuff_t *tvb, int offset, proto_tree *tree) { /* requested collection object id */ - proto_tree_add_item(tree, hf_scsi_osd_requested_collection_object_id, tvb, offset, 8, 0); + proto_tree_add_item(tree, hf_scsi_osd_requested_collection_object_id, tvb, offset, 8, ENC_NA); offset+=8; } diff --git a/epan/dissectors/packet-scsi-sbc.c b/epan/dissectors/packet-scsi-sbc.c index 118b798245..65e8cf3a40 100644 --- a/epan/dissectors/packet-scsi-sbc.c +++ b/epan/dissectors/packet-scsi-sbc.c @@ -311,7 +311,7 @@ dissect_sbc_synchronizecache16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre if (tree && isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_synccache_flags, ett_scsi_synccache, sync_fields, FALSE); - proto_tree_add_item (tree, hf_scsi_sbc_rdwr16_lba, tvb, offset+1, 8, 0); + proto_tree_add_item (tree, hf_scsi_sbc_rdwr16_lba, tvb, offset+1, 8, ENC_NA); proto_tree_add_item (tree, hf_scsi_sbc_rdwr12_xferlen, tvb, offset+9, 4, 0); proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+13, 1, 0); proto_tree_add_bitmask(tree, tvb, offset+14, hf_scsi_control, @@ -340,7 +340,7 @@ dissect_sbc_prefetch16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree && isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_prefetch_flags, ett_scsi_prefetch, prefetch_fields, FALSE); - proto_tree_add_item (tree, hf_scsi_sbc_rdwr16_lba, tvb, offset+1, 8, 0); + proto_tree_add_item (tree, hf_scsi_sbc_rdwr16_lba, tvb, offset+1, 8, ENC_NA); proto_tree_add_item (tree, hf_scsi_sbc_rdwr12_xferlen, tvb, offset+9, 4, 0); proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+13, 1, 0); proto_tree_add_bitmask(tree, tvb, offset+14, hf_scsi_control, @@ -624,7 +624,7 @@ dissect_sbc_read16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree && isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_read_flags, ett_scsi_rdwr, rdwr16_fields, FALSE); - proto_tree_add_item (tree, hf_scsi_sbc_rdwr16_lba, tvb, offset+1, 8, 0); + proto_tree_add_item (tree, hf_scsi_sbc_rdwr16_lba, tvb, offset+1, 8, ENC_NA); proto_tree_add_item (tree, hf_scsi_sbc_rdwr12_xferlen, tvb, offset+9, 4, 0); proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+13, 1, 0); proto_tree_add_bitmask(tree, tvb, offset+14, hf_scsi_control, @@ -654,7 +654,7 @@ dissect_sbc_write16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, if (tree && isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_read_flags, ett_scsi_rdwr, rdwr16_fields, FALSE); - proto_tree_add_item (tree, hf_scsi_sbc_rdwr16_lba, tvb, offset+1, 8, 0); + proto_tree_add_item (tree, hf_scsi_sbc_rdwr16_lba, tvb, offset+1, 8, ENC_NA); proto_tree_add_item (tree, hf_scsi_sbc_rdwr12_xferlen, tvb, offset+9, 4, 0); proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+13, 1, 0); proto_tree_add_bitmask(tree, tvb, offset+14, hf_scsi_control, @@ -1047,7 +1047,7 @@ dissect_sbc_writesame16 (tvbuff_t *tvb, packet_info *pinfo _U_, if (isreq && iscdb) { proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_sbc_writesame_flags, ett_scsi_writesame, writesame16_fields, FALSE); - proto_tree_add_item (tree, hf_scsi_sbc_rdwr16_lba, tvb, offset+1, 8, 0); + proto_tree_add_item (tree, hf_scsi_sbc_rdwr16_lba, tvb, offset+1, 8, ENC_NA); proto_tree_add_item (tree, hf_scsi_sbc_rdwr12_xferlen, tvb, offset+9, 4, 0); proto_tree_add_item (tree, hf_scsi_sbc_group, tvb, offset+13, 1, 0); proto_tree_add_bitmask(tree, tvb, offset+14, hf_scsi_control, diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c index de947ecc03..d7dac8f9ff 100644 --- a/epan/dissectors/packet-scsi.c +++ b/epan/dissectors/packet-scsi.c @@ -2435,10 +2435,10 @@ dissect_spc_inquiry (tvbuff_t *tvb, packet_info *pinfo, offset_v+=4; /* vendor specific, 20 bytes */ - proto_tree_add_item(tree, hf_scsi_inq_vendor_specific, tvb_v, offset_v, 20, 0); + proto_tree_add_item(tree, hf_scsi_inq_vendor_specific, tvb_v, offset_v, 20, ENC_NA); offset_v+=20; - proto_tree_add_item(tree, hf_scsi_inq_reserved, tvb_v, offset_v, 2, 0); + proto_tree_add_item(tree, hf_scsi_inq_reserved, tvb_v, offset_v, 2, ENC_NA); /* clocking, qas, ius */ offset_v++; @@ -2563,7 +2563,7 @@ dissect_scsi_log_page (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, /* We did not have a dissector for this page/parameter so * just display it as data. */ - proto_tree_add_item(log_tree, hf_scsi_log_param_data, tvb, offset, paramlen, 0); + proto_tree_add_item(log_tree, hf_scsi_log_param_data, tvb, offset, paramlen, ENC_NA); } offset+=paramlen; } @@ -3931,15 +3931,15 @@ dissect_spc_persistentreservein (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr for (i = 0; i < numrec; i++) { proto_tree_add_item (tree, hf_scsi_persresv_key, tvb, offset, - 8, 0); + 8, ENC_NA); offset += 8; } } else if ((flags & 0x1F) == SCSI_SPC_RESVIN_SVCA_RDRESV) { proto_tree_add_item (tree, hf_scsi_persresv_key, tvb, offset+8, - 8, 0); + 8, ENC_NA); proto_tree_add_item (tree, hf_scsi_persresv_scopeaddr, tvb, - offset+8, 4, 0); + offset+8, 4, ENC_NA); proto_tree_add_item (tree, hf_scsi_persresv_scope, tvb, offset+13, 1, 0); proto_tree_add_item (tree, hf_scsi_persresv_type, tvb, offset+13, @@ -4037,7 +4037,7 @@ dissect_spc_release10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, flags & 0x10, flags & 0x2); if ((flags & 0x12) == 0x10) { proto_tree_add_item (tree, hf_scsi_release_thirdpartyid, tvb, - offset+2, 1, 0); + offset+2, 1, ENC_NA); } proto_tree_add_item (tree, hf_scsi_paramlen16, tvb, offset+6, 2, 0); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, @@ -4089,7 +4089,7 @@ dissect_spc_reportluns (tvbuff_t *tvb, packet_info *pinfo _U_, 0); else proto_tree_add_item (tree, hf_scsi_rluns_multilun, tvb_v, offset_v, - 8, 0); + 8, ENC_NA); offset_v+=8; listlen-=8; } @@ -4179,7 +4179,7 @@ dissect_spc_reserve10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, flags & 0x10, flags & 0x2); if ((flags & 0x12) == 0x10) { proto_tree_add_item (tree, hf_scsi_release_thirdpartyid, tvb, - offset+2, 1, 0); + offset+2, 1, ENC_NA); } proto_tree_add_item (tree, hf_scsi_paramlen16, tvb, offset+6, 2, 0); proto_tree_add_bitmask(tree, tvb, offset+8, hf_scsi_control, diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index 2990f7ebc8..1a6b4f0f51 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -1451,7 +1451,7 @@ dissect_ssl3_record(tvbuff_t *tvb, packet_info *pinfo, /* add the record layer subtree header */ tvb_ensure_bytes_exist(tvb, offset, 5 + record_length); ti = proto_tree_add_item(tree, hf_ssl_record, tvb, - offset, 5 + record_length, 0); + offset, 5 + record_length, ENC_NA); ssl_record_tree = proto_item_add_subtree(ti, ett_ssl_record); /* show the one-byte content type */ @@ -1627,7 +1627,7 @@ dissect_ssl3_record(tvbuff_t *tvb, packet_info *pinfo, association?association->info:"Application Data"); proto_tree_add_item(ssl_record_tree, hf_ssl_record_appdata, tvb, - offset, record_length, 0); + offset, record_length, ENC_NA); dissect_ssl_payload(tvb, pinfo, offset, tree, association); @@ -1686,7 +1686,7 @@ dissect_ssl3_alert(tvbuff_t *tvb, packet_info *pinfo, if (tree) { ti = proto_tree_add_item(tree, hf_ssl_alert_message, tvb, - offset, 2, 0); + offset, 2, ENC_NA); ssl_alert_tree = proto_item_add_subtree(ti, ett_ssl_alert); } @@ -1843,7 +1843,7 @@ dissect_ssl3_handshake(tvbuff_t *tvb, packet_info *pinfo, /* add a subtree for the handshake protocol */ ti = proto_tree_add_item(tree, hf_ssl_handshake_protocol, tvb, - offset, length + 4, 0); + offset, length + 4, ENC_NA); ssl_hand_tree = proto_item_add_subtree(ti, ett_ssl_handshake); if (ssl_hand_tree) @@ -3047,7 +3047,7 @@ dissect_ssl2_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* add the record layer subtree header */ ti = proto_tree_add_item(tree, hf_ssl2_record, tvb, initial_offset, - record_length_length + record_length, 0); + record_length_length + record_length, ENC_NA); ssl_record_tree = proto_item_add_subtree(ti, ett_ssl_record); /* pull the msg_type so we can bail if it's unknown */ @@ -3371,7 +3371,7 @@ dissect_ssl2_hnd_client_hello(tvbuff_t *tvb, packet_info *pinfo, if (tree) proto_tree_add_item(tree, hf_ssl2_handshake_challenge, - tvb, offset, challenge_length, 0); + tvb, offset, challenge_length, ENC_NA); if (ssl) { /* PAOLO: get client random data; we get at most 32 bytes from |