diff options
-rw-r--r-- | epan/dissectors/packet-dcm.c | 24 | ||||
-rw-r--r-- | epan/dissectors/packet-diameter.c | 18 | ||||
-rw-r--r-- | epan/dissectors/packet-dtls.c | 19 | ||||
-rw-r--r-- | epan/dissectors/packet-fcswils.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-ieee80211.c | 29 | ||||
-rw-r--r-- | epan/dissectors/packet-isakmp.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-ismp.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-ldss.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-mac-lte.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-netflow.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-ntp.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-olsr.c | 92 | ||||
-rw-r--r-- | epan/dissectors/packet-p_mul.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-packetbb.c | 32 | ||||
-rw-r--r-- | epan/dissectors/packet-smb-pipe.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-smb.c | 5 | ||||
-rw-r--r-- | epan/dissectors/packet-ssl.c | 6 | ||||
-rw-r--r-- | epan/proto.c | 16 |
18 files changed, 127 insertions, 145 deletions
diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c index 81bb3fd855..a31d6b0c7f 100644 --- a/epan/dissectors/packet-dcm.c +++ b/epan/dissectors/packet-dcm.c @@ -5325,7 +5325,7 @@ dissect_dcm_tag_value(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, dcm_s /* Array of Bytes, Float or Words. Don't perform any decoding */ proto_tree_add_bytes_format(tree, hf_dcm_tag_value_byte, tvb, offset, vl_max, - tvb_get_ptr(tvb, offset, vl_max), "%-8.8s%s", "Value:", "(binary)"); + NULL, "%-8.8s%s", "Value:", "(binary)"); g_snprintf(*tag_value, MAX_BUF_LEN, "(binary)"); } @@ -5367,7 +5367,7 @@ dissect_dcm_tag_value(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, dcm_s } else { proto_tree_add_bytes_format(tree, hf_dcm_tag_value_byte, tvb, offset, vl_max, - tvb_get_ptr(tvb, offset, vl_max), "%-8.8s%s", "Value:", "(binary)"); + NULL, "%-8.8s%s", "Value:", "(binary)"); g_snprintf(*tag_value, MAX_BUF_LEN, "(binary)"); } @@ -5401,7 +5401,7 @@ dissect_dcm_tag_value(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, dcm_s else valf = tvb_get_ntohieee_float(tvb, offset); proto_tree_add_bytes_format(tree, hf_dcm_tag_value_byte, tvb, offset, 4, - tvb_get_ptr(tvb, offset, 4), "%-8.8s%f", "Value:", valf); + NULL, "%-8.8s%f", "Value:", valf); g_snprintf(*tag_value, MAX_BUF_LEN, "%f", valf); } @@ -5413,7 +5413,7 @@ dissect_dcm_tag_value(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, dcm_s else vald = tvb_get_ntohieee_double(tvb, offset); proto_tree_add_bytes_format(tree, hf_dcm_tag_value_byte, tvb, offset, 8, - tvb_get_ptr(tvb, offset, 8), "%-8.8s%f", "Value:", vald); + NULL, "%-8.8s%f", "Value:", vald); g_snprintf(*tag_value, MAX_BUF_LEN, "%f", vald); } @@ -5512,7 +5512,7 @@ dissect_dcm_tag_value(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, dcm_s /* Invalid VR, can only occur with Explicit syntax */ else { proto_tree_add_bytes_format(tree, hf_dcm_tag_value_byte, tvb, offset, vl_max, - tvb_get_ptr(tvb, offset, vl_max), "%-8.8s%s", "Value:", (vl > vl_max ? "" : "(unknown VR)")); + NULL, "%-8.8s%s", "Value:", (vl > vl_max ? "" : "(unknown VR)")); g_snprintf(*tag_value, MAX_BUF_LEN, "(unknown VR)"); } @@ -5978,7 +5978,7 @@ dissect_dcm_tag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gchar *tag_desc; proto_tree_add_bytes_format(tag_ptree, hf_dcm_tag_value_byte, tvb, offset, vl_max, - tvb_get_ptr(tvb, offset, vl_max), "%-8.8sBytes %d - %d [start]", "Value:", 1, vl_max); + NULL, "%-8.8sBytes %d - %d [start]", "Value:", 1, vl_max); g_snprintf(tag_value, MAX_BUF_LEN, "<Bytes %d - %d, start>", 1, vl_max); offset += vl_max; @@ -6090,9 +6090,8 @@ dissect_dcm_tag_open(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (pdv->is_corrupt) { pitem = proto_tree_add_bytes_format(tree, hf_dcm_data_tag, tvb, - offset, tag_value_fragment_len, - tvb_get_ptr(tvb, offset, tag_value_fragment_len), "%s <incomplete>", - pdv->prev->open_tag.desc); + offset, tag_value_fragment_len, NULL, + "%s <incomplete>", pdv->prev->open_tag.desc); expert_add_info_format(pinfo, pitem, PI_MALFORMED, PI_ERROR, "Early termination of tag. Data is missing"); @@ -6100,9 +6099,8 @@ dissect_dcm_tag_open(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } else { proto_tree_add_bytes_format(tree, hf_dcm_data_tag, tvb, - offset, tag_value_fragment_len, - tvb_get_ptr(tvb, offset, tag_value_fragment_len), "%s <Bytes %d - %d, %s>", - pdv->prev->open_tag.desc, + offset, tag_value_fragment_len, NULL, + "%s <Bytes %d - %d, %s>", pdv->prev->open_tag.desc, pdv->prev->open_tag.len_total - pdv->prev->open_tag.len_remaining + 1, pdv->prev->open_tag.len_total - pdv->prev->open_tag.len_remaining + tag_value_fragment_len, (pdv->prev->open_tag.len_remaining > tag_value_fragment_len ? "continuation" : "end") ); @@ -6134,7 +6132,7 @@ dissect_dcm_pdv_body(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* Eventually, we will have a syntax detector. Until then, don't decode */ proto_tree_add_bytes_format(tree, hf_dcm_data_tag, tvb, - offset, pdv_body_len, tvb_get_ptr(tvb, offset, pdv_body_len), + offset, pdv_body_len, NULL, "(%04x,%04x) %-8x Unparsed data", 0, 0, pdv_body_len); offset = endpos; } diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c index 2442d4835f..3e83d1f3d5 100644 --- a/epan/dissectors/packet-diameter.c +++ b/epan/dissectors/packet-diameter.c @@ -628,8 +628,7 @@ integer32_avp(diam_ctx_t* c, diam_avp_t* a, tvbuff_t* tvb) } else { pi = proto_tree_add_bytes_format(c->tree, hf_diameter_avp_data_wrong_length, - tvb, 0, length, - tvb_get_ptr(tvb, 0, length), + tvb, 0, length, NULL, "Error! Bad Integer32 Length"); expert_add_info_format(c->pinfo, pi, PI_MALFORMED, PI_NOTE, "Bad Integer32 Length (%u)", length); @@ -655,8 +654,7 @@ integer64_avp(diam_ctx_t* c, diam_avp_t* a, tvbuff_t* tvb) } else { pi = proto_tree_add_bytes_format(c->tree, hf_diameter_avp_data_wrong_length, - tvb, 0, length, - tvb_get_ptr(tvb, 0, length), + tvb, 0, length, NULL, "Error! Bad Integer64 Length"); expert_add_info_format(c->pinfo, pi, PI_MALFORMED, PI_NOTE, "Bad Integer64 Length (%u)", length); @@ -682,8 +680,7 @@ unsigned32_avp(diam_ctx_t* c, diam_avp_t* a, tvbuff_t* tvb) } else { pi = proto_tree_add_bytes_format(c->tree, hf_diameter_avp_data_wrong_length, - tvb, 0, length, - tvb_get_ptr(tvb, 0, length), + tvb, 0, length, NULL, "Error! Bad Unsigned32 Length"); expert_add_info_format(c->pinfo, pi, PI_MALFORMED, PI_NOTE, "Bad Unsigned32 Length (%u)", length); @@ -709,8 +706,7 @@ unsigned64_avp(diam_ctx_t* c, diam_avp_t* a, tvbuff_t* tvb) } else { pi = proto_tree_add_bytes_format(c->tree, hf_diameter_avp_data_wrong_length, - tvb, 0, length, - tvb_get_ptr(tvb, 0, length), + tvb, 0, length, NULL, "Error! Bad Unsigned64 Length"); expert_add_info_format(c->pinfo, pi, PI_MALFORMED, PI_NOTE, "Bad Unsigned64 Length (%u)", length); @@ -736,8 +732,7 @@ float32_avp(diam_ctx_t* c, diam_avp_t* a, tvbuff_t* tvb) } else { pi = proto_tree_add_bytes_format(c->tree, hf_diameter_avp_data_wrong_length, - tvb, 0, length, - tvb_get_ptr(tvb, 0, length), + tvb, 0, length, NULL, "Error! Bad Float32 Length"); expert_add_info_format(c->pinfo, pi, PI_MALFORMED, PI_NOTE, "Bad Float32 Length (%u)", length); @@ -763,8 +758,7 @@ float64_avp(diam_ctx_t* c, diam_avp_t* a, tvbuff_t* tvb) } else { pi = proto_tree_add_bytes_format(c->tree, hf_diameter_avp_data_wrong_length, - tvb, 0, length, - tvb_get_ptr(tvb, 0, length), + tvb, 0, length, NULL, "Error! Bad Float64 Length"); expert_add_info_format(c->pinfo, pi, PI_MALFORMED, PI_NOTE, "Bad Float64 Length (%u)", length); diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c index 143b104411..eea7341b95 100644 --- a/epan/dissectors/packet-dtls.c +++ b/epan/dissectors/packet-dtls.c @@ -1295,8 +1295,7 @@ dissect_dtls_hnd_hello_common(tvbuff_t *tvb, proto_tree *tree, { proto_tree_add_bytes_format(tree, hf_dtls_handshake_session_id, tvb, offset, session_id_length, - tvb_get_ptr(tvb, offset, session_id_length), - "Session ID (%u byte%s)", + NULL, "Session ID (%u byte%s)", session_id_length, plurality(session_id_length, "", "s")); offset += session_id_length; @@ -1350,10 +1349,9 @@ dissect_dtls_hnd_hello_ext(tvbuff_t *tvb, offset += 2; proto_tree_add_bytes_format(ext_tree, hf_dtls_handshake_extension_data, - tvb, offset, ext_len, - tvb_get_ptr(tvb, offset, ext_len), - "Data (%u byte%s)", - ext_len, plurality(ext_len, "", "s")); + tvb, offset, ext_len, NULL, + "Data (%u byte%s)", ext_len, + plurality(ext_len, "", "s")); offset += ext_len; left -= 2 + 2 + ext_len; } @@ -1412,8 +1410,7 @@ dissect_dtls_hnd_cli_hello(tvbuff_t *tvb, { proto_tree_add_bytes_format(tree, hf_dtls_handshake_cookie, tvb, offset, cookie_length, - tvb_get_ptr(tvb, offset, cookie_length), - "Cookie (%u byte%s)", + NULL, "Cookie (%u byte%s)", cookie_length, plurality(cookie_length, "", "s")); offset += cookie_length; @@ -1541,8 +1538,7 @@ dissect_dtls_hnd_hello_verify_request(tvbuff_t *tvb, proto_tree *tree, { proto_tree_add_bytes_format(tree, hf_dtls_handshake_cookie, tvb, offset, cookie_length, - tvb_get_ptr(tvb, offset, cookie_length), - "Cookie (%u byte%s)", + NULL, "Cookie (%u byte%s)", cookie_length, plurality(cookie_length, "", "s")); offset += cookie_length; @@ -1781,8 +1777,7 @@ dissect_dtls_hnd_cert_req(tvbuff_t *tvb, proto_tree_add_bytes_format(subtree, hf_dtls_handshake_dname, - tvb, offset, name_length, - tvb_get_ptr(tvb, offset, name_length), + tvb, offset, name_length, NULL, "Distinguished Name (%u byte%s)", name_length, plurality(name_length, "", "s")); diff --git a/epan/dissectors/packet-fcswils.c b/epan/dissectors/packet-fcswils.c index a1cdee66d3..ef1d7960d1 100644 --- a/epan/dissectors/packet-fcswils.c +++ b/epan/dissectors/packet-fcswils.c @@ -797,8 +797,7 @@ dissect_swils_elp (tvbuff_t *tvb, proto_tree *elp_tree, guint8 isreq _U_) } proto_tree_add_bytes_format (elp_tree, hf_swils_elp_cls1_svcp, tvb, offset, 2, - tvb_get_ptr (tvb, offset, 2), - "Class 1 Svc Parameters: (%s)", flags); + NULL, "Class 1 Svc Parameters: (%s)", flags); offset += 2; if (elp.cls1_svcparm[0] & 0x80) { proto_tree_add_item (elp_tree, hf_swils_elp_cls1_rcvsz, tvb, offset, 2, 0); diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 29168b4890..3097dcac65 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -2583,7 +2583,7 @@ prism_rate_return(guint32 rate) result = ep_alloc(SHORT_STR); result[0] = '\0'; prism_rate_base_custom(result, rate); - + return result; } @@ -3075,7 +3075,7 @@ add_fixed_field(proto_tree * tree, tvbuff_t * tvb, int offset, int lfcode) break; case FIELD_ASSOC_ID: - proto_tree_add_item(tree, hf_ieee80211_ff_assoc_id, tvb, offset, 2, TRUE); + proto_tree_add_item(tree, hf_ieee80211_ff_assoc_id, tvb, offset, 2, TRUE); length += 2; break; @@ -3979,7 +3979,7 @@ add_fixed_field(proto_tree * tree, tvbuff_t * tvb, int offset, int lfcode) offset = dissect_vendor_action_marvell(action_tree, tvb, offset); break; case OUI_WFA: - subtype = tvb_get_guint8(tvb, offset); + subtype = tvb_get_guint8(tvb, offset); proto_tree_add_text(action_tree, tvb, offset, 1, "Subtype %u", subtype); offset++; @@ -4235,7 +4235,7 @@ rsn_pcs_return(guint32 pcs) result = ep_alloc(SHORT_STR); result[0] = '\0'; rsn_pcs_base_custom(result, pcs); - + return result; } @@ -4246,7 +4246,7 @@ rsn_akms_return(guint32 akms) result = ep_alloc(SHORT_STR); result[0] = '\0'; rsn_akms_base_custom(result, akms); - + return result; } @@ -4616,8 +4616,7 @@ dissect_vendor_ie_aironet(proto_item * aironet_item, proto_tree * ietree, byte1 = tvb_get_guint8(tvb, offset); byte2 = tvb_get_guint8(tvb, offset + 1); txop = tvb_get_letohs(tvb, offset + 2); - proto_tree_add_bytes_format(ietree, hf_ieee80211_aironet_ie_qos_val, tvb, offset, 4, - tvb_get_ptr(tvb, offset, 4), + proto_tree_add_bytes_format(ietree, hf_ieee80211_aironet_ie_qos_val, tvb, offset, 4, NULL, "CCX QoS Parameters??: ACI %u (%s), Admission Control %sMandatory, AIFSN %u, ECWmin %u, ECWmax %u, TXOP %u", (byte1 & 0x60) >> 5, match_strval((byte1 & 0x60) >> 5, wme_acs), (byte1 & 0x10) ? "" : "not ", byte1 & 0x0f, @@ -4664,7 +4663,7 @@ dissect_rsn_ie(proto_tree * tree, tvbuff_t * tvb, int offset, guint32 tag_len) /* Check if OUI is 00:0F:AC (ieee80211) */ if(tvb_get_ntoh24(tvb, offset) == 0x000FAC) { - proto_tree_add_item(rsn_gcs_tree, hf_ieee80211_rsn_gcs_80211_type, tvb, offset + 3, 1, FALSE); + proto_tree_add_item(rsn_gcs_tree, hf_ieee80211_rsn_gcs_80211_type, tvb, offset + 3, 1, FALSE); } else { proto_tree_add_item(rsn_gcs_tree, hf_ieee80211_rsn_gcs_type, tvb, offset + 3, 1, FALSE); } @@ -4685,7 +4684,7 @@ dissect_rsn_ie(proto_tree * tree, tvbuff_t * tvb, int offset, guint32 tag_len) if(tvb_get_ntoh24(tvb, offset) == 0x000FAC) { proto_tree_add_item(rsn_sub_pcs_tree, hf_ieee80211_rsn_pcs_80211_type, tvb, offset+3, 1, FALSE); - proto_item_append_text(rsn_pcs_item, " %s", rsn_pcs_return(tvb_get_ntohl(tvb, offset))); + proto_item_append_text(rsn_pcs_item, " %s", rsn_pcs_return(tvb_get_ntohl(tvb, offset))); } else { proto_tree_add_item(rsn_sub_pcs_tree, hf_ieee80211_rsn_pcs_type, tvb, offset+3, 1, FALSE); } @@ -4749,14 +4748,14 @@ dissect_rsn_ie(proto_tree * tree, tvbuff_t * tvb, int offset, guint32 tag_len) { return; } - /* Group Management Cipher Suite (802.11w)*/ + /* Group Management Cipher Suite (802.11w)*/ rsn_gmcs_item = proto_tree_add_item(tree, hf_ieee80211_rsn_gmcs, tvb, offset, 4, FALSE); rsn_gmcs_tree = proto_item_add_subtree(rsn_gmcs_item, ett_rsn_gmcs_tree); proto_tree_add_item(rsn_gmcs_tree, hf_ieee80211_rsn_gmcs_oui, tvb, offset, 3, FALSE); /* Check if OUI is 00:0F:AC (ieee80211) */ if(tvb_get_ntoh24(tvb, offset) == 0x000FAC) { - proto_tree_add_item(rsn_gmcs_tree, hf_ieee80211_rsn_gmcs_80211_type, tvb, offset + 3, 1, FALSE); + proto_tree_add_item(rsn_gmcs_tree, hf_ieee80211_rsn_gmcs_80211_type, tvb, offset + 3, 1, FALSE); } else { proto_tree_add_item(rsn_gmcs_tree, hf_ieee80211_rsn_gmcs_type, tvb, offset + 3, 1, FALSE); } @@ -9305,14 +9304,14 @@ dissect_prism(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) did = tvb_get_letohl(tvb, offset); proto_item_append_text(ti_did, " %s", val_to_str(did, prism_did_vals, "Unknown %x") ); } - offset += 4; + offset += 4; /* Status */ if(tree) { proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_status, tvb, offset, 2, TRUE); } - offset += 2; + offset += 2; /* Length */ if(tree) { @@ -9390,7 +9389,7 @@ dissect_prism(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(tree){ proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_unknown, tvb, offset, 4, TRUE); } - break; + break; } offset += 4; } @@ -14038,7 +14037,7 @@ proto_register_ieee80211 (void) &ett_rsn_sub_pcs_tree, &ett_rsn_akms_tree, &ett_rsn_sub_akms_tree, - &ett_rsn_cap_tree, + &ett_rsn_cap_tree, &ett_rsn_pmkid_tree, &ett_rsn_gmcs_tree, &ett_ht_cap_tree, diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index b73a5ce53e..950f2ff42b 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -2923,7 +2923,7 @@ dissect_sa(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakmp_v /* IPSEC */ if (length < 4) { proto_tree_add_bytes_format(tree, hf_isakmp_sa_situation, tvb, offset, length, - tvb_get_ptr(tvb, offset, length), + NULL, "Situation: %s (length is %u, should be >= 4)", tvb_bytes_to_str(tvb, offset, length), length); return; diff --git a/epan/dissectors/packet-ismp.c b/epan/dissectors/packet-ismp.c index da82c80f37..02e74018fb 100644 --- a/epan/dissectors/packet-ismp.c +++ b/epan/dissectors/packet-ismp.c @@ -414,8 +414,7 @@ dissect_ismp_edp(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *ismp if (num_tuples && tvb_reported_length_remaining(tvb, offset) >= 4) { edp_tuples_ti = proto_tree_add_bytes_format(edp_tree, hf_ismp_edp_tuples, tvb, - offset, tvb_reported_length_remaining(tvb, offset), - tvb_get_ptr(tvb, offset, tvb_reported_length_remaining(tvb, offset)), "Tuples"); + offset, tvb_reported_length_remaining(tvb, offset), NULL, "Tuples"); edp_tuples_tree = proto_item_add_subtree(edp_tuples_ti, ett_ismp_edp_tuples); while ( (tuples_count < num_tuples) && (tvb_reported_length_remaining(tvb, offset) >= 4) ) diff --git a/epan/dissectors/packet-ldss.c b/epan/dissectors/packet-ldss.c index e01feeabcc..9977db0169 100644 --- a/epan/dissectors/packet-ldss.c +++ b/epan/dissectors/packet-ldss.c @@ -692,8 +692,7 @@ dissect_ldss_transfer (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, 0, tvb_reported_length(tvb), FALSE); ldss_tree = proto_item_add_subtree(ti, ett_ldss_transfer); ti = proto_tree_add_bytes_format(ldss_tree, hf_ldss_file_data, - tvb, 0, tvb_length(tvb), - tvb_get_ptr (tvb, 0, tvb_length(tvb)), + tvb, 0, tvb_length(tvb), NULL, compression == COMPRESSION_GZIP ? "Gzip compressed data: %d bytes" : "File data: %d bytes", @@ -706,8 +705,7 @@ dissect_ldss_transfer (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (uncomp_tvb != NULL) { ti = proto_tree_add_bytes_format_value(ldss_tree, hf_ldss_file_data, uncomp_tvb, 0, tvb_length(uncomp_tvb), - tvb_get_ptr (uncomp_tvb, 0, tvb_length(uncomp_tvb)), - "Uncompressed data: %d bytes", + NULL, "Uncompressed data: %d bytes", tvb_length(uncomp_tvb)); } } diff --git a/epan/dissectors/packet-mac-lte.c b/epan/dissectors/packet-mac-lte.c index 9045993061..dae15f9699 100644 --- a/epan/dissectors/packet-mac-lte.c +++ b/epan/dissectors/packet-mac-lte.c @@ -2664,8 +2664,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* Dissect SDU as raw bytes */ sdu_ti = proto_tree_add_bytes_format(tree, hf_mac_lte_sch_sdu, tvb, offset, pdu_lengths[n], - tvb_get_ptr(tvb, offset, pdu_lengths[n]), - "SDU (%s, length=%u bytes): ", + NULL, "SDU (%s, length=%u bytes): ", val_to_str_const(lcids[n], (direction == DIRECTION_UPLINK) ? ulsch_lcid_vals : diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index f1e4e7d84b..300696fd09 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -4697,15 +4697,13 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, default: /* Unknown Field ID */ if ((hdrinfo->vspec == 9) || (pen == REVPEN)) { ti = proto_tree_add_bytes_format_value(pdutree, hf_cflow_unknown_field_type, - tvb, offset, length, - tvb_get_ptr(tvb, offset, length), + tvb, offset, length, NULL, "Type %u: Value (hex bytes): %s", masked_type, tvb_bytes_to_str_punct(tvb, offset, length, ' ')); } else { /* v10 PEN */ ti = proto_tree_add_bytes_format_value(pdutree, hf_ipfix_enterprise_private_entry, - tvb, offset, length, - tvb_get_ptr(tvb, offset, length), + tvb, offset, length, NULL, "(%s) Type %u: Value (hex bytes): %s", pen_str, masked_type, diff --git a/epan/dissectors/packet-ntp.c b/epan/dissectors/packet-ntp.c index 3188576432..5da497e9c2 100644 --- a/epan/dissectors/packet-ntp.c +++ b/epan/dissectors/packet-ntp.c @@ -779,8 +779,7 @@ dissect_ntp_std(tvbuff_t *tvb, proto_tree *ntp_tree, guint8 flags) } } proto_tree_add_bytes_format(ntp_tree, hf_ntp_refid, tvb, 12, 4, - tvb_get_ptr(tvb, 12, 4), - "Reference Clock ID: %s", buff); + NULL, "Reference Clock ID: %s", buff); /* Reference Timestamp: This is the time at which the local clock was * last set or corrected. diff --git a/epan/dissectors/packet-olsr.c b/epan/dissectors/packet-olsr.c index e309601a34..bb20433a2c 100644 --- a/epan/dissectors/packet-olsr.c +++ b/epan/dissectors/packet-olsr.c @@ -171,8 +171,8 @@ static double getOlsrTime(guint8 timeval) { /*------------------------- TC Dissecting Code-------------------------*/ static int dissect_olsr_tc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *olsr_tree, int offset, int message_end) { if (message_end - offset < 4) { - proto_tree_add_bytes_format(olsr_tree, hf_olsr_ansn, tvb, offset, message_end - offset, tvb_get_ptr(tvb, offset, - message_end - offset), "Not enough bytes for TC"); + proto_tree_add_bytes_format(olsr_tree, hf_olsr_ansn, tvb, offset, message_end - offset, + NULL, "Not enough bytes for TC"); return message_end; } @@ -181,8 +181,8 @@ static int dissect_olsr_tc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *olsr_t while (offset < message_end) { if (message_end - offset < pinfo->src.len) { - proto_tree_add_bytes_format(olsr_tree, hf_olsr_neighbor_addr, tvb, offset, message_end - offset, tvb_get_ptr(tvb, - offset, message_end - offset), "Not enough bytes for last neighbor"); + proto_tree_add_bytes_format(olsr_tree, hf_olsr_neighbor_addr, tvb, offset, message_end - offset, + NULL, "Not enough bytes for last neighbor"); return message_end; } if (pinfo->src.type == AT_IPv4) { @@ -201,8 +201,8 @@ static int dissect_olsr_tc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *olsr_t static int dissect_olsrorg_lq_tc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *olsr_tree, int offset, int message_end) { if (message_end - offset < 4) { - proto_tree_add_bytes_format(olsr_tree, hf_olsr_ansn, tvb, offset, message_end - offset, tvb_get_ptr(tvb, offset, - message_end - offset), "Not enough bytes for Olsr.org LQ-TC"); + proto_tree_add_bytes_format(olsr_tree, hf_olsr_ansn, tvb, offset, message_end - offset, + NULL, "Not enough bytes for Olsr.org LQ-TC"); return message_end; } proto_tree_add_item(olsr_tree, hf_olsr_ansn, tvb, offset, 2, FALSE); @@ -215,16 +215,15 @@ static int dissect_olsrorg_lq_tc(tvbuff_t *tvb, packet_info *pinfo, proto_tree * if (pinfo->src.type == AT_IPv4) { if (message_end - offset < 8) { - proto_tree_add_bytes_format(olsr_tree, hf_olsr_neighbor, tvb, offset, message_end - offset, tvb_get_ptr(tvb, - offset, message_end - offset), "Not enough bytes for last entry (need 8 bytes)"); + proto_tree_add_bytes_format(olsr_tree, hf_olsr_neighbor, tvb, offset, message_end - offset, + NULL, "Not enough bytes for last entry (need 8 bytes)"); return message_end; } lq = tvb_get_guint8(tvb, offset + 4); nlq = tvb_get_guint8(tvb, offset + 5); address_group = proto_tree_add_bytes_format(olsr_tree, hf_olsr_neighbor, tvb, offset, 8, - tvb_get_ptr(tvb, offset, 8), "Neighbor Address: %s (%d/%d)", - tvb_ip_to_str(tvb, offset), lq, nlq); + NULL, "Neighbor Address: %s (%d/%d)", tvb_ip_to_str(tvb, offset), lq, nlq); address_tree = proto_item_add_subtree(address_group, ett_olsr_message_neigh); @@ -233,15 +232,14 @@ static int dissect_olsrorg_lq_tc(tvbuff_t *tvb, packet_info *pinfo, proto_tree * } else if (pinfo->src.type == AT_IPv6) { if (message_end - offset < 20) { proto_tree_add_bytes_format(olsr_tree, hf_olsr_neighbor, tvb, offset, message_end - offset, - tvb_get_ptr(tvb, offset, message_end - offset), "Not enough bytes for last entry (need 20 bytes)"); + NULL, "Not enough bytes for last entry (need 20 bytes)"); return message_end; } lq = tvb_get_guint8(tvb, offset + 16); nlq = tvb_get_guint8(tvb, offset + 17); address_group = proto_tree_add_bytes_format(olsr_tree, hf_olsr_neighbor, tvb, offset, 20, - tvb_get_ptr(tvb, offset, 20), "Neighbor Address: %s (%d/%d)", - tvb_ip6_to_str(tvb, offset), lq, nlq); + NULL, "Neighbor Address: %s (%d/%d)", tvb_ip6_to_str(tvb, offset), lq, nlq); address_tree = proto_item_add_subtree(address_group, ett_olsr_message_neigh); @@ -261,8 +259,8 @@ static int dissect_olsrorg_lq_tc(tvbuff_t *tvb, packet_info *pinfo, proto_tree * static int dissect_nrlolsr_tc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *olsr_tree, int offset, int message_end) { int field1Ptr, field2Ptr, saneEnd; if (message_end - offset < 4) { - proto_tree_add_bytes_format(olsr_tree, hf_olsr_ansn, tvb, offset, message_end - offset, tvb_get_ptr(tvb, offset, - message_end - offset), "Not enough bytes for NRLOLSR LQ-TC"); + proto_tree_add_bytes_format(olsr_tree, hf_olsr_ansn, tvb, offset, message_end - offset, + NULL, "Not enough bytes for NRLOLSR LQ-TC"); return message_end; } @@ -300,8 +298,8 @@ static int dissect_olsr_hello(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ols guint16 message_size = 0; if (message_end - offset < 4) { - proto_tree_add_bytes_format(olsr_tree, hf_olsr_htime, tvb, offset, message_end - offset, tvb_get_ptr(tvb, offset, - message_end - offset), "Not enough bytes for Hello"); + proto_tree_add_bytes_format(olsr_tree, hf_olsr_htime, tvb, offset, message_end - offset, + NULL, "Not enough bytes for Hello"); return message_end; } @@ -318,8 +316,8 @@ static int dissect_olsr_hello(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ols while (offset < message_end) { if (message_end - offset < 4) { - proto_tree_add_bytes_format(olsr_tree, hf_olsr_link_type, tvb, offset, message_end - offset, tvb_get_ptr(tvb, - offset, message_end - offset), "Not enough bytes for last Hello entry"); + proto_tree_add_bytes_format(olsr_tree, hf_olsr_link_type, tvb, offset, message_end - offset, + NULL, "Not enough bytes for last Hello entry"); return message_end; } @@ -349,8 +347,8 @@ static int handle_olsr_hello_rfc(tvbuff_t *tvb, packet_info *pinfo, proto_tree * /*-------------------Dissect Neighbor Addresses--------------------*/ while (offset < link_message_end) { if (link_message_end - offset < pinfo->src.len) { - proto_tree_add_bytes_format(olsr_tree, hf_olsr_neighbor, tvb, offset, link_message_end - offset, tvb_get_ptr(tvb, - offset, link_message_end - offset), "Not enough bytes for last Hello entry"); + proto_tree_add_bytes_format(olsr_tree, hf_olsr_neighbor, tvb, offset, link_message_end - offset, + NULL, "Not enough bytes for last Hello entry"); return link_message_end; } if (pinfo->src.type == AT_IPv4) { @@ -376,8 +374,8 @@ static int handle_olsr_hello_olsrorg(tvbuff_t *tvb, packet_info *pinfo, proto_tr guint8 lq, nlq; if (link_message_end - offset < pinfo->src.len + 4) { - proto_tree_add_bytes_format(olsr_tree, hf_olsr_neighbor, tvb, offset, link_message_end - offset, tvb_get_ptr(tvb, - offset, link_message_end - offset), "Not enough bytes for last Olsr.org LQ-Hello entry"); + proto_tree_add_bytes_format(olsr_tree, hf_olsr_neighbor, tvb, offset, link_message_end - offset, + NULL, "Not enough bytes for last Olsr.org LQ-Hello entry"); return link_message_end; } @@ -386,8 +384,7 @@ static int handle_olsr_hello_olsrorg(tvbuff_t *tvb, packet_info *pinfo, proto_tr nlq = tvb_get_guint8(tvb, offset + 5); address_group = proto_tree_add_bytes_format(olsr_tree, hf_olsr_neighbor, tvb, offset, 8, - tvb_get_ptr(tvb, offset, 8), "Neighbor Address: %s (%d/%d)", - tvb_ip_to_str(tvb, offset), lq, nlq); + NULL, "Neighbor Address: %s (%d/%d)", tvb_ip_to_str(tvb, offset), lq, nlq); address_tree = proto_item_add_subtree(address_group, ett_olsr_message_neigh); @@ -398,8 +395,7 @@ static int handle_olsr_hello_olsrorg(tvbuff_t *tvb, packet_info *pinfo, proto_tr nlq = tvb_get_guint8(tvb, offset + 17); address_group = proto_tree_add_bytes_format(olsr_tree, hf_olsr_neighbor, tvb, offset, 20, - tvb_get_ptr(tvb, offset, 20), "Neighbor Address: %s (%d/%d)", - tvb_ip6_to_str(tvb, offset), lq, nlq); + NULL, "Neighbor Address: %s (%d/%d)", tvb_ip6_to_str(tvb, offset), lq, nlq); address_tree = proto_item_add_subtree(address_group, ett_olsr_message_neigh); @@ -420,8 +416,8 @@ static int handle_olsr_hello_olsrorg(tvbuff_t *tvb, packet_info *pinfo, proto_tr static int dissect_olsr_mid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *olsr_tree, int offset, int message_end) { while (offset < message_end) { if (message_end - offset < pinfo->src.len) { - proto_tree_add_bytes_format(olsr_tree, hf_olsr_interface_addr, tvb, offset, message_end - offset, tvb_get_ptr( - tvb, offset, message_end - offset), "Not enough bytes for last MID entry"); + proto_tree_add_bytes_format(olsr_tree, hf_olsr_interface_addr, tvb, offset, message_end - offset, + NULL, "Not enough bytes for last MID entry"); return message_end; } if (pinfo->src.type == AT_IPv4) { @@ -441,8 +437,8 @@ static int dissect_olsr_mid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *olsr_ static int dissect_olsr_hna(tvbuff_t *tvb, packet_info *pinfo, proto_tree *olsr_tree, int offset, int message_end) { while (offset < message_end) { if (message_end - offset < pinfo->src.len * 2) { - proto_tree_add_bytes_format(olsr_tree, hf_olsr_network_addr, tvb, offset, message_end - offset, tvb_get_ptr(tvb, - offset, message_end - offset), "Not enough bytes for last HNA entry"); + proto_tree_add_bytes_format(olsr_tree, hf_olsr_network_addr, tvb, offset, message_end - offset, + NULL, "Not enough bytes for last HNA entry"); return message_end; } @@ -472,8 +468,8 @@ static int dissect_olsrorg_nameservice(tvbuff_t *tvb, packet_info *pinfo, proto_ proto_tree *olsr_ns_tree; if (message_end - offset < 4) { - proto_tree_add_bytes_format(olsr_tree, hf_olsrorg_ns_version, tvb, offset, message_end - offset, tvb_get_ptr(tvb, - offset, message_end - offset), "Not enough bytes for Olsr.org Nameservice message"); + proto_tree_add_bytes_format(olsr_tree, hf_olsrorg_ns_version, tvb, offset, message_end - offset, + NULL, "Not enough bytes for Olsr.org Nameservice message"); return message_end; } @@ -486,8 +482,8 @@ static int dissect_olsrorg_nameservice(tvbuff_t *tvb, packet_info *pinfo, proto_ offset += 4; if (version != 1) { - proto_tree_add_bytes_format(olsr_tree, hf_olsr_data, tvb, offset, message_end - offset, tvb_get_ptr(tvb, offset, - message_end - offset), "Unkown nameservice protocol version %d", version); + proto_tree_add_bytes_format(olsr_tree, hf_olsr_data, tvb, offset, message_end - offset, + NULL, "Unkown nameservice protocol version %d", version); return message_end; } @@ -496,8 +492,8 @@ static int dissect_olsrorg_nameservice(tvbuff_t *tvb, packet_info *pinfo, proto_ int total_length; if (message_end - offset < 20) { - proto_tree_add_bytes_format(olsr_tree, hf_olsrorg_ns, tvb, offset, message_end - offset, tvb_get_ptr(tvb, offset, - message_end - offset), "Not enough bytes for last nameservice entry"); + proto_tree_add_bytes_format(olsr_tree, hf_olsrorg_ns, tvb, offset, message_end - offset, + NULL, "Not enough bytes for last nameservice entry"); return message_end; } @@ -506,8 +502,8 @@ static int dissect_olsrorg_nameservice(tvbuff_t *tvb, packet_info *pinfo, proto_ total_length = 4 + 16 + ((length - 1) | 3) + 1; - olsr_ns_item = proto_tree_add_bytes_format(olsr_tree, hf_olsrorg_ns, tvb, offset, total_length, tvb_get_ptr(tvb, - offset, total_length), "Nameservice: %s (%d)", val_to_str(type, nameservice_type_vals, "UNKNOWN"), type); + olsr_ns_item = proto_tree_add_bytes_format(olsr_tree, hf_olsrorg_ns, tvb, offset, total_length, + NULL, "Nameservice: %s (%d)", val_to_str(type, nameservice_type_vals, "UNKNOWN"), type); olsr_ns_tree = proto_item_add_subtree(olsr_ns_item, ett_olsr_message_ns); @@ -523,8 +519,8 @@ static int dissect_olsrorg_nameservice(tvbuff_t *tvb, packet_info *pinfo, proto_ } if (message_end - offset < total_length) { - proto_tree_add_bytes_format(olsr_tree, hf_olsrorg_ns, tvb, offset, message_end - offset, tvb_get_ptr(tvb, offset, - message_end - offset), "Not enough bytes for content of last nameservice entry"); + proto_tree_add_bytes_format(olsr_tree, hf_olsrorg_ns, tvb, offset, message_end - offset, + NULL, "Not enough bytes for content of last nameservice entry"); return message_end; } proto_tree_add_item(olsr_ns_tree, hf_olsrorg_ns_content, tvb, offset + 20, length, FALSE); @@ -591,7 +587,7 @@ static int dissect_olsr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if (packet_len - offset < 4) { proto_tree_add_bytes_format(olsr_tree, hf_olsr_message, tvb, offset, packet_len - offset, - tvb_get_ptr(tvb, offset, packet_len - offset), "Message too short !"); + NULL, "Message too short !"); break; } @@ -599,8 +595,8 @@ static int dissect_olsr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { vTime = getOlsrTime(tvb_get_guint8(tvb, offset + 1)); message_len = tvb_get_ntohs(tvb, offset + 2); - message_item = proto_tree_add_bytes_format(olsr_tree, hf_olsr_message, tvb, offset, message_len, tvb_get_ptr(tvb, - offset, message_len), "Message: %s (%d)", val_to_str(message_type, message_type_vals, "UNKNOWN"), + message_item = proto_tree_add_bytes_format(olsr_tree, hf_olsr_message, tvb, offset, message_len, + NULL, "Message: %s (%d)", val_to_str(message_type, message_type_vals, "UNKNOWN"), message_type); message_tree = proto_item_add_subtree(message_item, ett_olsr_message[message_type]); @@ -681,12 +677,12 @@ static int dissect_olsr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /*-----------------------------Undefined message types-----------------------------*/ else { if ((message_len - 12) % 4) { - proto_tree_add_bytes_format(message_tree, hf_olsr_data, tvb, offset, message_len - 12, tvb_get_ptr(tvb, - offset, message_len - 12), "Data (%u bytes) (must be aligned on 32 bits)", message_len - 12); + proto_tree_add_bytes_format(message_tree, hf_olsr_data, tvb, offset, message_len - 12, + NULL, "Data (%u bytes) (must be aligned on 32 bits)", message_len - 12); break; } - proto_tree_add_bytes_format(message_tree, hf_olsr_data, tvb, offset, message_len - 12, tvb_get_ptr(tvb, - offset, message_len - 12), "Data (%u bytes)", message_len - 12); + proto_tree_add_bytes_format(message_tree, hf_olsr_data, tvb, offset, message_len - 12, + NULL, "Data (%u bytes)", message_len - 12); offset += message_len - 12; } /* end if for undefined message types */ } diff --git a/epan/dissectors/packet-p_mul.c b/epan/dissectors/packet-p_mul.c index a1336ad12b..9435dfce22 100644 --- a/epan/dissectors/packet-p_mul.c +++ b/epan/dissectors/packet-p_mul.c @@ -1146,8 +1146,7 @@ static void dissect_p_mul (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 end_seq_no = tvb_get_ntohs (tvb, offset + 4); en = proto_tree_add_bytes_format (field_tree, hf_miss_seq_range, - tvb, offset, 6, - tvb_get_ptr (tvb, offset, 6), + tvb, offset, 6, NULL, "Missing Data PDU Seq Range: %d - %d", ack_seq_no, end_seq_no); if (ack_seq_no >= end_seq_no) { diff --git a/epan/dissectors/packet-packetbb.c b/epan/dissectors/packet-packetbb.c index 0c35441b57..8171bdc38a 100644 --- a/epan/dissectors/packet-packetbb.c +++ b/epan/dissectors/packet-packetbb.c @@ -149,7 +149,7 @@ static int dissect_pbb_tlvblock(tvbuff_t *tvb, proto_tree *tree, guint offset, if (maxoffset < offset + 2) { proto_tree_add_bytes_format(tree, hf_packetbb_error, tvb, offset, maxoffset - offset, - tvb_get_ptr(tvb, offset, maxoffset - offset), "Not enough octets for minimal tlvblock"); + NULL, "Not enough octets for minimal tlvblock"); return maxoffset; } @@ -158,7 +158,7 @@ static int dissect_pbb_tlvblock(tvbuff_t *tvb, proto_tree *tree, guint offset, tlvblockEnd = offset + 2 + tlvblockLength; if (maxoffset < tlvblockEnd) { proto_tree_add_bytes_format(tree, hf_packetbb_error, tvb, offset, maxoffset - offset, - tvb_get_ptr(tvb, offset, maxoffset - offset), "Not enough octets for tlvblock"); + NULL, "Not enough octets for tlvblock"); return maxoffset; } @@ -319,7 +319,7 @@ static int dissect_pbb_addressblock(tvbuff_t *tvb, proto_tree *tree, guint offse if (maxoffset - offset < 2) { proto_tree_add_bytes_format(tree, hf_packetbb_error, tvb, offset, maxoffset - offset, - tvb_get_ptr(tvb, offset, maxoffset - offset), "Not enough octets for minimal addressblock header"); + NULL, "Not enough octets for minimal addressblock header"); return tvb_reported_length(tvb); } @@ -339,19 +339,19 @@ static int dissect_pbb_addressblock(tvbuff_t *tvb, proto_tree *tree, guint offse if (maxoffset - offset <= 0) { proto_tree_add_bytes_format(tree, hf_packetbb_error, tvb, offset, maxoffset - offset, - tvb_get_ptr(tvb, offset, maxoffset - offset), "Not enough octets for addressblock head"); + NULL, "Not enough octets for addressblock head"); return tvb_reported_length(tvb); } head_length = tvb_get_guint8(tvb, offset++); if (head_length > addressSize-1) { proto_tree_add_bytes_format(tree, hf_packetbb_error, tvb, offset, maxoffset - offset, - tvb_get_ptr(tvb, offset, maxoffset - offset), "address head length is too long"); + NULL, "address head length is too long"); return tvb_reported_length(tvb); } if (maxoffset - offset < head_length) { proto_tree_add_bytes_format(tree, hf_packetbb_error, tvb, offset, maxoffset - offset, - tvb_get_ptr(tvb, offset, maxoffset - offset), "Not enough octets for addressblock head"); + NULL, "Not enough octets for addressblock head"); return tvb_reported_length(tvb); } tvb_memcpy(tvb, addr, offset, head_length); @@ -365,13 +365,13 @@ static int dissect_pbb_addressblock(tvbuff_t *tvb, proto_tree *tree, guint offse if (maxoffset - offset <= 0) { proto_tree_add_bytes_format(tree, hf_packetbb_error, tvb, offset, maxoffset - offset, - tvb_get_ptr(tvb, offset, maxoffset - offset), "Not enough octets for addressblock tail"); + NULL, "Not enough octets for addressblock tail"); return tvb_reported_length(tvb); } tail_length = tvb_get_guint8(tvb, offset++); if (tail_length > addressSize-1-head_length) { proto_tree_add_bytes_format(tree, hf_packetbb_error, tvb, offset, maxoffset - offset, - tvb_get_ptr(tvb, offset, maxoffset - offset), "address tail length is too long"); + NULL, "address tail length is too long"); return tvb_reported_length(tvb); } midSize -= tail_length; @@ -382,19 +382,19 @@ static int dissect_pbb_addressblock(tvbuff_t *tvb, proto_tree *tree, guint offse if (maxoffset - offset <= 0) { proto_tree_add_bytes_format(tree, hf_packetbb_error, tvb, offset, maxoffset - offset, - tvb_get_ptr(tvb, offset, maxoffset - offset), "Not enough octets for addressblock tail"); + NULL, "Not enough octets for addressblock tail"); return tvb_reported_length(tvb); } tail_length = tvb_get_guint8(tvb, offset++); if (tail_length > addressSize-1-head_length) { proto_tree_add_bytes_format(tree, hf_packetbb_error, tvb, offset, maxoffset - offset, - tvb_get_ptr(tvb, offset, maxoffset - offset), "address tail length is too long"); + NULL, "address tail length is too long"); return tvb_reported_length(tvb); } if (maxoffset - offset < tail_length) { proto_tree_add_bytes_format(tree, hf_packetbb_error, tvb, offset, maxoffset - offset, - tvb_get_ptr(tvb, offset, maxoffset - offset), "Not enough octets for addressblock tail"); + NULL, "Not enough octets for addressblock tail"); return tvb_reported_length(tvb); } tvb_memcpy(tvb, &addr[addressSize - tail_length], offset, tail_length); @@ -419,7 +419,7 @@ static int dissect_pbb_addressblock(tvbuff_t *tvb, proto_tree *tree, guint offse if (maxoffset < block_index + block_length) { proto_tree_add_bytes_format(tree, hf_packetbb_error, tvb, offset, maxoffset - offset, - tvb_get_ptr(tvb, offset, maxoffset - offset), "Not enough octets for address block"); + NULL, "Not enough octets for address block"); return maxoffset; } @@ -514,7 +514,7 @@ static int dissect_pbb_message(tvbuff_t *tvb, proto_tree *tree, guint offset) { if (tvb_reported_length(tvb) - offset < 6) { proto_tree_add_bytes_format(tree, hf_packetbb_error, tvb, offset, -1, - tvb_get_ptr(tvb, offset, -1), "Not enough octets for minimal message header"); + NULL, "Not enough octets for minimal message header"); return tvb_reported_length(tvb); } @@ -559,7 +559,7 @@ static int dissect_pbb_message(tvbuff_t *tvb, proto_tree *tree, guint offset) { /* test length for message size */ if (tvb_reported_length(tvb) - offset < messageLength) { proto_tree_add_bytes_format(tree, hf_packetbb_error, tvb, offset, -1, - tvb_get_ptr(tvb, offset, -1), "Not enough octets for message"); + NULL, "Not enough octets for message"); return tvb_reported_length(tvb); } @@ -648,7 +648,7 @@ static int dissect_pbb_header(tvbuff_t *tvb, proto_tree *tree) { if (tvb_reported_length(tvb) < headerLength) { proto_tree_add_bytes_format(tree, hf_packetbb_error, tvb, 0, -1, - tvb_get_ptr(tvb, 0, -1), "Not enough octets for packetbb header"); + NULL, "Not enough octets for packetbb header"); return tvb_reported_length(tvb); } if ((packet_flags & PACKET_HEADER_HASTLV) != 0) { @@ -656,7 +656,7 @@ static int dissect_pbb_header(tvbuff_t *tvb, proto_tree *tree) { } if (tvb_reported_length(tvb) < headerLength) { proto_tree_add_bytes_format(tree, hf_packetbb_error, tvb, 0, -1, - tvb_get_ptr(tvb, 0, -1), "Not enough octets for packetbb tlvblock"); + NULL, "Not enough octets for packetbb tlvblock"); return tvb_reported_length(tvb); } diff --git a/epan/dissectors/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c index 2b973f37e2..8a313edee6 100644 --- a/epan/dissectors/packet-smb-pipe.c +++ b/epan/dissectors/packet-smb-pipe.c @@ -627,7 +627,7 @@ add_logon_hours(tvbuff_t *tvb, int offset, int count, packet_info *pinfo _U_, TRUE); } else { proto_tree_add_bytes_format(tree, hf_index, tvb, - cptr, count, tvb_get_ptr(tvb, cptr, count), + cptr, count, NULL, "%s: %s (wrong length, should be 21, is %d", proto_registrar_get_name(hf_index), tvb_bytes_to_str(tvb, cptr, count), count); diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index f0173a710a..d37cb9c89f 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -4128,7 +4128,7 @@ dissect_file_data(tvbuff_t *tvb, proto_tree *tree, int offset, guint16 bc, guint } tvblen = tvb_length_remaining(tvb, offset); if(bc>tvblen){ - proto_tree_add_bytes_format(tree, hf_smb_file_data, tvb, offset, tvblen, tvb_get_ptr(tvb, offset, tvblen),"File Data: Incomplete. Only %d of %u bytes", tvblen, bc); + proto_tree_add_bytes_format(tree, hf_smb_file_data, tvb, offset, tvblen, NULL,"File Data: Incomplete. Only %d of %u bytes", tvblen, bc); offset += tvblen; } else { proto_tree_add_item(tree, hf_smb_file_data, tvb, offset, bc, TRUE); @@ -15158,8 +15158,7 @@ dissect_qfsi_vals(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, /* Finder Info ... */ CHECK_BYTE_COUNT_TRANS_SUBR(32); proto_tree_add_bytes_format(tree, hf_smb_mac_fndrinfo, tvb, - offset, 32, - tvb_get_ptr(tvb, offset,32), + offset, 32, NULL, "Finder Info: %s", tvb_format_text(tvb, offset, 32)); COUNT_BYTES_TRANS_SUBR(32); diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index 4107398dcf..f82b844e99 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -2113,8 +2113,7 @@ dissect_ssl3_hnd_hello_ext(tvbuff_t *tvb, break; default: proto_tree_add_bytes_format(ext_tree, hf_ssl_handshake_extension_data, - tvb, offset, ext_len, - tvb_get_ptr(tvb, offset, ext_len), + tvb, offset, ext_len, NULL, "Data (%u byte%s)", ext_len, plurality(ext_len, "", "s")); offset += ext_len; @@ -3164,8 +3163,7 @@ dissect_ssl2_hnd_client_hello(tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_bytes_format(tree, hf_ssl_handshake_session_id, tvb, offset, session_id_length, - tvb_get_ptr(tvb, offset, session_id_length), - "Session ID (%u byte%s)", + NULL, "Session ID (%u byte%s)", session_id_length, plurality(session_id_length, "", "s")); } diff --git a/epan/proto.c b/epan/proto.c index 88e3b3b941..46ded94858 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -1875,7 +1875,13 @@ proto_tree_add_bytes_format_value(proto_tree *tree, int hfindex, tvbuff_t *tvb, TRY_TO_FAKE_THIS_ITEM(tree, hfindex, hfinfo); - pi = proto_tree_add_bytes(tree, hfindex, tvb, start, length, start_ptr); + if (start_ptr) + pi = proto_tree_add_bytes(tree, hfindex, tvb, start, length, + start_ptr); + else + pi = proto_tree_add_bytes(tree, hfindex, tvb, start, length, + tvb_get_ptr(tvb, start, length)); + if (pi == NULL) return (NULL); @@ -1899,7 +1905,13 @@ proto_tree_add_bytes_format(proto_tree *tree, int hfindex, tvbuff_t *tvb, TRY_TO_FAKE_THIS_ITEM(tree, hfindex, hfinfo); - pi = proto_tree_add_bytes(tree, hfindex, tvb, start, length, start_ptr); + if (start_ptr) + pi = proto_tree_add_bytes(tree, hfindex, tvb, start, length, + start_ptr); + else + pi = proto_tree_add_bytes(tree, hfindex, tvb, start, length, + tvb_get_ptr(tvb, start, length)); + if (pi == NULL) return (NULL); |