diff options
| author | Evan Huus <eapache@gmail.com> | 2013-12-19 15:49:09 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2013-12-19 15:49:09 +0000 |
| commit | a6415ece0ad102d30ac5dce59b127bcf1bd6d3f1 (patch) | |
| tree | 0eff98882fe8c8a9db6f064b87330b8060fe37b2 /epan/dissectors | |
| parent | b7ab4db2108fda5a1370b807d1b03ad93b1ca8f8 (diff) | |
Rename a couple of to_str functions to have ep_ in the name. This makes it
obvious that the returned string is ephemeral, and opens up the original names
in the API for versions that take a wmem pool (and thus can work in any scope).
svn path=/trunk/; revision=54249
Diffstat (limited to 'epan/dissectors')
89 files changed, 308 insertions, 308 deletions
diff --git a/epan/dissectors/packet-aarp.c b/epan/dissectors/packet-aarp.c index 5ed3b09d21..48b7f1836a 100644 --- a/epan/dissectors/packet-aarp.c +++ b/epan/dissectors/packet-aarp.c @@ -124,7 +124,7 @@ tvb_aarphrdaddr_to_str(tvbuff_t *tvb, gint offset, int ad_len, guint16 type) of address). */ return tvb_ether_to_str(tvb, offset); } - return tvb_bytes_to_str(tvb, offset, ad_len); + return tvb_bytes_to_ep_str(tvb, offset, ad_len); } static gchar * @@ -134,7 +134,7 @@ tvb_aarpproaddr_to_str(tvbuff_t *tvb, gint offset, int ad_len, guint16 type) /* Appletalk address. */ return tvb_atalkid_to_str(tvb, offset); } - return tvb_bytes_to_str(tvb, offset, ad_len); + return tvb_bytes_to_ep_str(tvb, offset, ad_len); } /* Offsets of fields within an AARP packet. */ diff --git a/epan/dissectors/packet-alcap.c b/epan/dissectors/packet-alcap.c index 66b8873301..4f634db195 100644 --- a/epan/dissectors/packet-alcap.c +++ b/epan/dissectors/packet-alcap.c @@ -590,7 +590,7 @@ static const gchar* dissect_fields_dnsea(packet_info* pinfo _U_, tvbuff_t *tvb, return NULL; } - msg_info->dest_nsap = tvb_bytes_to_str(tvb,offset,20); + msg_info->dest_nsap = tvb_bytes_to_ep_str(tvb,offset,20); proto_tree_add_item(tree, hf_alcap_dnsea, tvb, offset, 20, ENC_NA); dissect_nsap(tvb, offset,20, tree); @@ -610,7 +610,7 @@ static const gchar* dissect_fields_onsea(packet_info* pinfo _U_, tvbuff_t *tvb, return NULL; } - msg_info->orig_nsap = tvb_bytes_to_str(tvb,offset,20); + msg_info->orig_nsap = tvb_bytes_to_ep_str(tvb,offset,20); proto_tree_add_item(tree, hf_alcap_onsea, tvb, offset, 20, ENC_NA); dissect_nsap(tvb, offset,20, tree); diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c index 409f602f9d..05db6f9210 100644 --- a/epan/dissectors/packet-amqp.c +++ b/epan/dissectors/packet-amqp.c @@ -8527,7 +8527,7 @@ format_amqp_0_10_bin(tvbuff_t *tvb, guint offset, guint bound _U_, guint length, const char **value) { - *value = tvb_bytes_to_str(tvb, offset, length); + *value = tvb_bytes_to_ep_str(tvb, offset, length); return length; } @@ -8612,7 +8612,7 @@ format_amqp_0_10_vbin(tvbuff_t *tvb, return length; } AMQP_INCREMENT(offset, length, bound); - *value = tvb_bytes_to_str(tvb, offset, bin_length); + *value = tvb_bytes_to_ep_str(tvb, offset, bin_length); AMQP_INCREMENT(offset, bin_length, bound); return (bin_length + length); } diff --git a/epan/dissectors/packet-ansi_tcap.c b/epan/dissectors/packet-ansi_tcap.c index 43de2a7b87..efe18a3093 100644 --- a/epan/dissectors/packet-ansi_tcap.c +++ b/epan/dissectors/packet-ansi_tcap.c @@ -619,9 +619,9 @@ if(next_tvb) { * in the 8 octets case. */ if (len > 4){ - ansi_tcap_private.TransactionID_str = tvb_bytes_to_str(next_tvb, 4,len-4); + ansi_tcap_private.TransactionID_str = tvb_bytes_to_ep_str(next_tvb, 4,len-4); }else{ - ansi_tcap_private.TransactionID_str = tvb_bytes_to_str(next_tvb, 0,len); + ansi_tcap_private.TransactionID_str = tvb_bytes_to_ep_str(next_tvb, 0,len); } } switch(len) { diff --git a/epan/dissectors/packet-ap1394.c b/epan/dissectors/packet-ap1394.c index 67af76528d..4b2949457d 100644 --- a/epan/dissectors/packet-ap1394.c +++ b/epan/dissectors/packet-ap1394.c @@ -87,7 +87,7 @@ dissect_ap1394(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { ti = proto_tree_add_protocol_format(tree, proto_ap1394, tvb, 0, 18, "Apple IP-over-IEEE 1394, Src: %s, Dst: %s", - bytes_to_str(src_addr, 8), bytes_to_str(dst_addr, 8)); + bytes_to_ep_str(src_addr, 8), bytes_to_ep_str(dst_addr, 8)); fh_tree = proto_item_add_subtree(ti, ett_ap1394); proto_tree_add_bytes(fh_tree, hf_ap1394_dst, tvb, 0, 8, dst_addr); proto_tree_add_bytes(fh_tree, hf_ap1394_src, tvb, 8, 8, src_addr); diff --git a/epan/dissectors/packet-arp.c b/epan/dissectors/packet-arp.c index 0bab08f90f..0e0fa007b6 100644 --- a/epan/dissectors/packet-arp.c +++ b/epan/dissectors/packet-arp.c @@ -366,7 +366,7 @@ tvb_arphrdaddr_to_str(tvbuff_t *tvb, gint offset, int ad_len, guint16 type) address). */ return tvb_ether_to_str(tvb, offset); } - return tvb_bytes_to_str(tvb, offset, ad_len); + return tvb_bytes_to_ep_str(tvb, offset, ad_len); } static const gchar * @@ -383,7 +383,7 @@ arpproaddr_to_str(const guint8 *ad, int ad_len, guint16 type) return get_ax25_name(ad); /*return ax25_to_str(ad);*/ } - return bytes_to_str(ad, ad_len); + return bytes_to_ep_str(ad, ad_len); } #define MAX_E164_STR_LEN 20 @@ -417,7 +417,7 @@ atmarpnum_to_str(const guint8 *ad, int ad_tl) * * XXX - break down into subcomponents. */ - return bytes_to_str(ad, ad_len); + return bytes_to_ep_str(ad, ad_len); } } @@ -438,7 +438,7 @@ atmarpsubaddr_to_str(const guint8 *ad, int ad_tl) * * XXX - break down into subcomponents? */ - return bytes_to_str(ad, ad_len); + return bytes_to_ep_str(ad, ad_len); } const value_string arp_hrd_vals[] = { @@ -543,10 +543,10 @@ dissect_atm_nsap(tvbuff_t *tvb, int offset, int len, proto_tree *tree) tvb_get_ntohs(tvb, offset + 1)); proto_tree_add_text(tree, tvb, offset + 3, 10, "High Order DSP: %s", - tvb_bytes_to_str(tvb, offset + 3, 10)); + tvb_bytes_to_ep_str(tvb, offset + 3, 10)); proto_tree_add_text(tree, tvb, offset + 13, 6, "End System Identifier: %s", - tvb_bytes_to_str(tvb, offset + 13, 6)); + tvb_bytes_to_ep_str(tvb, offset + 13, 6)); proto_tree_add_text(tree, tvb, offset + 19, 1, "Selector: 0x%02X", tvb_get_guint8(tvb, offset + 19)); break; @@ -559,10 +559,10 @@ dissect_atm_nsap(tvbuff_t *tvb, int offset, int len, proto_tree *tree) tvb_get_ntohs(tvb, offset + 1)); proto_tree_add_text(tree, tvb, offset + 3, 10, "High Order DSP: %s", - tvb_bytes_to_str(tvb, offset + 3, 10)); + tvb_bytes_to_ep_str(tvb, offset + 3, 10)); proto_tree_add_text(tree, tvb, offset + 13, 6, "End System Identifier: %s", - tvb_bytes_to_str(tvb, offset + 13, 6)); + tvb_bytes_to_ep_str(tvb, offset + 13, 6)); proto_tree_add_text(tree, tvb, offset + 19, 1, "Selector: 0x%02X", tvb_get_guint8(tvb, offset + 19)); break; @@ -572,13 +572,13 @@ dissect_atm_nsap(tvbuff_t *tvb, int offset, int len, proto_tree *tree) proto_tree_add_text(tree, tvb, offset + 0, 9, "E.164 ISDN%s: %s", (afi == 0xC3) ? " (group)" : "", - tvb_bytes_to_str(tvb, offset + 1, 8)); + tvb_bytes_to_ep_str(tvb, offset + 1, 8)); proto_tree_add_text(tree, tvb, offset + 9, 4, "High Order DSP: %s", - tvb_bytes_to_str(tvb, offset + 3, 10)); + tvb_bytes_to_ep_str(tvb, offset + 3, 10)); proto_tree_add_text(tree, tvb, offset + 13, 6, "End System Identifier: %s", - tvb_bytes_to_str(tvb, offset + 13, 6)); + tvb_bytes_to_ep_str(tvb, offset + 13, 6)); proto_tree_add_text(tree, tvb, offset + 19, 1, "Selector: 0x%02X", tvb_get_guint8(tvb, offset + 19)); break; @@ -588,7 +588,7 @@ dissect_atm_nsap(tvbuff_t *tvb, int offset, int len, proto_tree *tree) "Unknown AFI: 0x%02X", afi); proto_tree_add_text(tree, tvb, offset + 1, len - 1, "Rest of address: %s", - tvb_bytes_to_str(tvb, offset + 1, len - 1)); + tvb_bytes_to_ep_str(tvb, offset + 1, len - 1)); break; } } diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c index d33d9d5731..d8ddddd3a8 100644 --- a/epan/dissectors/packet-bacapp.c +++ b/epan/dissectors/packet-bacapp.c @@ -5823,7 +5823,7 @@ fOctetString(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offset, offset += fTagHeader(tvb, pinfo, offset, &tag_no, &tag_info, &lvt); if (lvt > 0) { - tmp = tvb_bytes_to_str(tvb, offset, lvt); + tmp = tvb_bytes_to_ep_str(tvb, offset, lvt); ti = proto_tree_add_text(tree, tvb, offset, lvt, "%s %s", label, tmp); offset += lvt; } @@ -5868,7 +5868,7 @@ fMacAddress(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offset, c proto_tree_add_uint(tree, hf_bacapp_tag_PORT, tvb, offset+16, 2, port); } else { /* we have 1 Byte MS/TP Address or anything else interpreted as an address */ - tmp = tvb_bytes_to_str(tvb, offset, lvt); + tmp = tvb_bytes_to_ep_str(tvb, offset, lvt); ti = proto_tree_add_text(tree, tvb, offset, lvt, "%s", tmp); } } diff --git a/epan/dissectors/packet-bacnet.c b/epan/dissectors/packet-bacnet.c index cf47efa1a0..46d75eb735 100644 --- a/epan/dissectors/packet-bacnet.c +++ b/epan/dissectors/packet-bacnet.c @@ -420,7 +420,7 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset ++; proto_tree_add_text(bacnet_tree, tvb, offset, bacnet_pinfolen, "Port Info: %s", - tvb_bytes_to_str(tvb, offset, bacnet_pinfolen)); + tvb_bytes_to_ep_str(tvb, offset, bacnet_pinfolen)); offset += bacnet_pinfolen; } } diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c index f8dad61126..1c7943f220 100644 --- a/epan/dissectors/packet-ber.c +++ b/epan/dissectors/packet-ber.c @@ -4930,7 +4930,7 @@ dissect_ber_constrained_bitstring(gboolean implicit_tag, asn1_ctx_t *actx, proto if (bitstring[byteno]) { expert_add_info_format( actx->pinfo, item, &ei_ber_bits_unknown, - "Unknown bit(s): 0x%s", bytes_to_str(bitstring, len)); + "Unknown bit(s): 0x%s", bytes_to_ep_str(bitstring, len)); break; } } diff --git a/epan/dissectors/packet-bfd.c b/epan/dissectors/packet-bfd.c index 1dabdc7a47..70d9af2252 100644 --- a/epan/dissectors/packet-bfd.c +++ b/epan/dissectors/packet-bfd.c @@ -371,7 +371,7 @@ dissect_bfd_authentication(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(auth_tree, hf_bfd_auth_seq_num, tvb, offset+4, 4, ENC_BIG_ENDIAN); proto_tree_add_text(auth_tree, tvb, offset+8, get_bfd_checksum_len(auth_type), "Checksum: 0x%s", - tvb_bytes_to_str(tvb, offset+8, get_bfd_checksum_len(auth_type)) ); + tvb_bytes_to_ep_str(tvb, offset+8, get_bfd_checksum_len(auth_type)) ); } break; default: diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c index 1e87c3f60a..c56d758c9c 100644 --- a/epan/dissectors/packet-bgp.c +++ b/epan/dissectors/packet-bgp.c @@ -4029,7 +4029,7 @@ dissect_bgp_update(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo) case TUNNEL_SUBTLV_ENCAPSULATION: if (encaps_tunnel_type == TUNNEL_TYPE_L2TP_OVER_IP) { proto_tree_add_text(subtree6, tvb, q + 2, 4, "Session ID: %u", tvb_get_letohl(tvb, q + 2)); - proto_tree_add_text(subtree6, tvb, q + 6, encaps_tunnel_sublen - 4, "Cookie: %s", tvb_bytes_to_str(tvb, q + 6, encaps_tunnel_sublen - 4)); + proto_tree_add_text(subtree6, tvb, q + 6, encaps_tunnel_sublen - 4, "Cookie: %s", tvb_bytes_to_ep_str(tvb, q + 6, encaps_tunnel_sublen - 4)); } else if (encaps_tunnel_type == TUNNEL_TYPE_GRE) { proto_tree_add_text(subtree6, tvb, q + 2, encaps_tunnel_sublen, "GRE key: %x", tvb_get_letohl(tvb, q + 2)); } diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c index 15da0e53f2..31b1fc6c6c 100644 --- a/epan/dissectors/packet-bootp.c +++ b/epan/dissectors/packet-bootp.c @@ -1864,7 +1864,7 @@ bootp_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, int voff, val_to_str_ext_const( enterprise, &sminmpec_values_ext, "Unknown"), enterprise); if (optlen > 6) { - buf = tvb_bytes_to_str(tvb, optoff + 6, optlen - 11); + buf = tvb_bytes_to_ep_str(tvb, optoff + 6, optlen - 11); proto_tree_add_text(v_tree, tvb, optoff + 6, optlen - 11, "identifier: %s", buf); } diff --git a/epan/dissectors/packet-bt-dht.c b/epan/dissectors/packet-bt-dht.c index 0d610b799b..06962b769d 100644 --- a/epan/dissectors/packet-bt-dht.c +++ b/epan/dissectors/packet-bt-dht.c @@ -130,7 +130,7 @@ dissect_bencoded_string(tvbuff_t *tvb, packet_info _U_*pinfo, proto_tree *tree, /* fill the return data */ if( tohex ) - *result = tvb_bytes_to_str(tvb, offset, string_len ); + *result = tvb_bytes_to_ep_str(tvb, offset, string_len ); else *result = tvb_get_string( wmem_packet_scope(), tvb, offset, string_len ); @@ -320,7 +320,7 @@ dissect_bt_dht_nodes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint node_tree = proto_item_add_subtree( node_ti, ett_bt_dht_peers); proto_tree_add_item( node_tree, hf_bt_dht_id, tvb, offset, 20, ENC_NA); - proto_item_append_text(node_ti, " (id: %s", tvb_bytes_to_str(tvb, offset, 20)); + proto_item_append_text(node_ti, " (id: %s", tvb_bytes_to_ep_str(tvb, offset, 20)); proto_tree_add_item( node_tree, hf_ip, tvb, offset+20, 4, ENC_BIG_ENDIAN); proto_item_append_text(node_ti, ", IP/Port: %s", tvb_ip_to_str(tvb, offset+20)); proto_tree_add_item( node_tree, hf_port, tvb, offset+24, 2, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c index 5244b109d8..018d54edce 100644 --- a/epan/dissectors/packet-btsdp.c +++ b/epan/dissectors/packet-btsdp.c @@ -1009,7 +1009,7 @@ print_uuid(uuid_t *uuid) } } - return bytes_to_str(uuid->data, uuid->size); + return bytes_to_ep_str(uuid->data, uuid->size); } } @@ -1542,7 +1542,7 @@ reassemble_continuation_state(tvbuff_t *tvb, packet_info *pinfo, offset++; continuation_state = (guint8 *) wmem_alloc(wmem_file_scope(), continuation_state_length); - packet_scope_string = tvb_bytes_to_str(tvb, offset, continuation_state_length); + packet_scope_string = tvb_bytes_to_ep_str(tvb, offset, continuation_state_length); memcpy(continuation_state, packet_scope_string, continuation_state_length); if (!pinfo->fd->flags.visited) { @@ -2984,7 +2984,7 @@ dissect_sdp_type(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, break; case 0x352: proto_tree_add_item(next_tree, hf_bpp_character_repertoires_support, tvb, offset, size, ENC_ASCII | ENC_NA); - new_str = tvb_bytes_to_str(tvb, offset, size); + new_str = tvb_bytes_to_ep_str(tvb, offset, size); wmem_strbuf_append(info_buf, new_str); break; case 0x354: diff --git a/epan/dissectors/packet-c1222.c b/epan/dissectors/packet-c1222.c index df980877f4..606cef559e 100644 --- a/epan/dissectors/packet-c1222.c +++ b/epan/dissectors/packet-c1222.c @@ -501,7 +501,7 @@ parse_c1222_detailed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int cm proto_tree_add_uint(tree, hf_c1222_auth_len, tvb, *offset, 1, auth_len); *offset += 1; if (*length >= auth_len) { - auth_req = tvb_bytes_to_str(tvb, *offset, auth_len); + auth_req = tvb_bytes_to_ep_str(tvb, *offset, auth_len); proto_tree_add_item(tree, hf_c1222_auth_data, tvb, *offset, auth_len, ENC_NA); *offset += auth_len; *length -= auth_len + 1; diff --git a/epan/dissectors/packet-canopen.c b/epan/dissectors/packet-canopen.c index a84c293011..6fdbb839bc 100644 --- a/epan/dissectors/packet-canopen.c +++ b/epan/dissectors/packet-canopen.c @@ -231,7 +231,7 @@ dissect_canopen(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) col_add_fstr(pinfo->cinfo, COL_INFO, "p2p %s", function_code_str); } col_append_fstr(pinfo->cinfo, COL_INFO, " %s", - tvb_bytes_to_str_punct(tvb, offset, can_data_len, ' ')); + tvb_bytes_to_ep_str_punct(tvb, offset, can_data_len, ' ')); if (tree) { proto_item *ti, *cob_ti, *type_ti; diff --git a/epan/dissectors/packet-cdp.c b/epan/dissectors/packet-cdp.c index 0325a39f22..73416f768d 100644 --- a/epan/dissectors/packet-cdp.c +++ b/epan/dissectors/packet-cdp.c @@ -726,7 +726,7 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); proto_tree_add_text(tlv_tree, tvb, offset + 4, length - 4, "System Object Identifier: %s", - tvb_bytes_to_str(tvb, offset + 4, length - 4)); + tvb_bytes_to_ep_str(tvb, offset + 4, length - 4)); } offset += length; break; @@ -986,7 +986,7 @@ dissect_address_tlv(tvbuff_t *tvb, int offset, int length, proto_tree *tree) if (length != 0) { proto_tree_add_text(address_tree, tvb, offset, length, "Protocol: %s (truncated)", - tvb_bytes_to_str(tvb, offset, length)); + tvb_bytes_to_ep_str(tvb, offset, length)); } return -1; } @@ -997,7 +997,7 @@ dissect_address_tlv(tvbuff_t *tvb, int offset, int length, proto_tree *tree) } else nlpid = -1; if (protocol_str == NULL) - protocol_str = tvb_bytes_to_str(tvb, offset, protocol_length); + protocol_str = tvb_bytes_to_ep_str(tvb, offset, protocol_length); proto_tree_add_text(address_tree, tvb, offset, protocol_length, "Protocol: %s", protocol_str); offset += protocol_length; @@ -1015,7 +1015,7 @@ dissect_address_tlv(tvbuff_t *tvb, int offset, int length, proto_tree *tree) if (length != 0) { proto_tree_add_text(address_tree, tvb, offset, length, "Address: %s (truncated)", - tvb_bytes_to_str(tvb, offset, length)); + tvb_bytes_to_ep_str(tvb, offset, length)); } return -1; } @@ -1041,7 +1041,7 @@ dissect_address_tlv(tvbuff_t *tvb, int offset, int length, proto_tree *tree) if (address_type_str == NULL) address_type_str = "Address"; if (address_str == NULL) { - address_str = tvb_bytes_to_str(tvb, offset, address_length); + address_str = tvb_bytes_to_ep_str(tvb, offset, address_length); } proto_item_set_text(ti, "%s: %s", address_type_str, address_str); proto_tree_add_text(address_tree, tvb, offset, address_length, "%s: %s", diff --git a/epan/dissectors/packet-coap.c b/epan/dissectors/packet-coap.c index 40d60d89b6..406222c782 100644 --- a/epan/dissectors/packet-coap.c +++ b/epan/dissectors/packet-coap.c @@ -305,7 +305,7 @@ dissect_coap_opt_hex_string(tvbuff_t *tvb, proto_item *item, proto_tree *subtree if (opt_length == 0) str = nullstr; else - str = tvb_bytes_to_str_punct(tvb, offset, opt_length, ' '); + str = tvb_bytes_to_ep_str_punct(tvb, offset, opt_length, ' '); proto_tree_add_item(subtree, hf, tvb, offset, opt_length, ENC_NA); @@ -825,7 +825,7 @@ dissect_coap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) if (token_len > 0) { - g_strlcat(coap_token_str, tvb_bytes_to_str_punct(tvb, offset, token_len, ' '), sizeof(coap_token_str)); + g_strlcat(coap_token_str, tvb_bytes_to_ep_str_punct(tvb, offset, token_len, ' '), sizeof(coap_token_str)); proto_tree_add_item(coap_tree, hf_coap_token, tvb, offset, token_len, ENC_NA); offset += token_len; diff --git a/epan/dissectors/packet-data.c b/epan/dissectors/packet-data.c index e6a2830c92..e6f77db027 100644 --- a/epan/dissectors/packet-data.c +++ b/epan/dissectors/packet-data.c @@ -105,7 +105,7 @@ dissect_data(tvbuff_t *tvb, packet_info *pinfo _U_ , proto_tree *tree) md5_append(&md_ctx, cp, bytes); md5_finish(&md_ctx, digest); - digest_string = bytestring_to_str(digest, 16, '\0'); + digest_string = bytestring_to_ep_str(digest, 16, '\0'); ti = proto_tree_add_string(data_tree, &hfi_data_md5_hash, tvb, 0, 0, digest_string); PROTO_ITEM_SET_GENERATED(ti); } diff --git a/epan/dissectors/packet-dcerpc-netlogon.c b/epan/dissectors/packet-dcerpc-netlogon.c index 99ad64d409..6366b66c1c 100644 --- a/epan/dissectors/packet-dcerpc-netlogon.c +++ b/epan/dissectors/packet-dcerpc-netlogon.c @@ -1172,7 +1172,7 @@ static void dissect_nt_chal_resp_cb(packet_info *pinfo _U_, proto_tree *tree, start_offset += 12; len = end_offset - start_offset; - s = tvb_bytes_to_str(tvb, start_offset, len); + s = tvb_bytes_to_ep_str(tvb, start_offset, len); /* Append string to upper-level proto_items */ diff --git a/epan/dissectors/packet-dcerpc-nt.c b/epan/dissectors/packet-dcerpc-nt.c index 75fd2ff1a6..ecb436c87b 100644 --- a/epan/dissectors/packet-dcerpc-nt.c +++ b/epan/dissectors/packet-dcerpc-nt.c @@ -302,7 +302,7 @@ static void cb_byte_array_postprocess(packet_info *pinfo, proto_tree *tree _U_, if ((end_offset - start_offset) <= 12) return; - s = tvb_bytes_to_str( + s = tvb_bytes_to_ep_str( tvb, start_offset + 12, (end_offset - start_offset - 12) ); /* Append string to COL_INFO */ diff --git a/epan/dissectors/packet-dect.c b/epan/dissectors/packet-dect.c index 63ffa3ed5f..1606ccc7ea 100644 --- a/epan/dissectors/packet-dect.c +++ b/epan/dissectors/packet-dect.c @@ -1481,9 +1481,9 @@ dissect_afield(gboolean dect_packet_type, guint8 *ba, proto_tree_add_string(ColumnsTree, hf_dect_cc_TA, tvb, offset, 1, "[Ct]"); if(ta==DECT_TA_CT0) - wmem_strbuf_append_printf(afield_str,"C-Channel Next Data: %s",tvb_bytes_to_str(tvb, offset, 5)); + wmem_strbuf_append_printf(afield_str,"C-Channel Next Data: %s",tvb_bytes_to_ep_str(tvb, offset, 5)); else - wmem_strbuf_append_printf(afield_str,"C-Channel First Data: %s",tvb_bytes_to_str(tvb, offset, 5)); + wmem_strbuf_append_printf(afield_str,"C-Channel First Data: %s",tvb_bytes_to_ep_str(tvb, offset, 5)); proto_tree_add_string(ColumnsTree, hf_dect_cc_AField, tvb, offset, 1, wmem_strbuf_get_str(afield_str)); } @@ -1492,7 +1492,7 @@ dissect_afield(gboolean dect_packet_type, guint8 *ba, /* ETSI EN 300 175-3 V2.3.0 7.2.2 */ proto_tree_add_string(ColumnsTree, hf_dect_cc_TA, tvb, offset, 1, "[Nt]"); - wmem_strbuf_append_printf(afield_str,"RFPI: %s",tvb_bytes_to_str(tvb, offset, 5)); + wmem_strbuf_append_printf(afield_str,"RFPI: %s",tvb_bytes_to_ep_str(tvb, offset, 5)); proto_tree_add_string(ColumnsTree, hf_dect_cc_AField, tvb, offset, 1, wmem_strbuf_get_str(afield_str)); proto_tree_add_item(atailti, hf_dect_A_Tail_Nt, tvb, offset, 5, ENC_NA); @@ -1662,7 +1662,7 @@ dissect_afield(gboolean dect_packet_type, guint8 *ba, proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_6_Spare, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; - wmem_strbuf_append_printf(afield_str,"Multi-Frame No.: %s",tvb_bytes_to_str(tvb, offset, 3)); + wmem_strbuf_append_printf(afield_str,"Multi-Frame No.: %s",tvb_bytes_to_ep_str(tvb, offset, 3)); proto_tree_add_string(ColumnsTree, hf_dect_cc_AField, tvb, offset, 1, wmem_strbuf_get_str(afield_str)); proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_6_Mfn, tvb, offset, 3, ENC_NA); @@ -1673,7 +1673,7 @@ dissect_afield(gboolean dect_packet_type, guint8 *ba, break; case 7: /* Escape */ /* ETSI EN 300 175-3 V2.3.0 7.2.3.8 */ - wmem_strbuf_append_printf(afield_str,"Escape Data: %s",tvb_bytes_to_str(tvb, offset, 5)); + wmem_strbuf_append_printf(afield_str,"Escape Data: %s",tvb_bytes_to_ep_str(tvb, offset, 5)); proto_tree_add_string(ColumnsTree, hf_dect_cc_AField, tvb, offset, 1, wmem_strbuf_get_str(afield_str)); break; case 8: /* Obsolete */ diff --git a/epan/dissectors/packet-devicenet.c b/epan/dissectors/packet-devicenet.c index 66cf439997..ed659fec64 100644 --- a/epan/dissectors/packet-devicenet.c +++ b/epan/dissectors/packet-devicenet.c @@ -303,7 +303,7 @@ static gint body_type_8_over_8_dissection(guint8 data_length, proto_tree *device { length = offset-start_offset; proto_tree_add_bytes_format_value(devicenet_tree, hf_devicenet_data, tvb, offset, length, - NULL, "%s", tvb_bytes_to_str_punct(tvb, offset, length, ' ')); + NULL, "%s", tvb_bytes_to_ep_str_punct(tvb, offset, length, ' ')); offset += length; } return offset; @@ -462,7 +462,7 @@ static int dissect_devicenet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(message_id, devicenet_grp_msg1_vals, "Other Group 1 Message")); proto_tree_add_bytes_format_value(devicenet_tree, hf_devicenet_data, tvb, offset, data_length, - NULL, "%s", tvb_bytes_to_str_punct(tvb, offset, data_length, ' ')); + NULL, "%s", tvb_bytes_to_ep_str_punct(tvb, offset, data_length, ' ')); } /* * Message group 2 @@ -496,12 +496,12 @@ static int dissect_devicenet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree case 0x4: case 0x5: proto_tree_add_bytes_format_value(content_tree, hf_devicenet_data, tvb, offset, data_length, - NULL, "%s", tvb_bytes_to_str_punct(tvb, offset, data_length, ' ')); + NULL, "%s", tvb_bytes_to_ep_str_punct(tvb, offset, data_length, ' ')); break; case 0x6: proto_tree_add_bytes_format_value(content_tree, hf_devicenet_data, tvb, offset, data_length, - NULL, "%s", tvb_bytes_to_str_punct(tvb, offset, data_length, ' ')); + NULL, "%s", tvb_bytes_to_ep_str_punct(tvb, offset, data_length, ' ')); break; case 0x7: @@ -657,7 +657,7 @@ static int dissect_devicenet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree if(service_rr & CIP_SC_MASK) { proto_tree_add_bytes_format_value(devicenet_tree, hf_devicenet_data, tvb, offset, data_length - 2, - NULL, "%s", tvb_bytes_to_str_punct(tvb, offset, data_length - 2, ' ')); + NULL, "%s", tvb_bytes_to_ep_str_punct(tvb, offset, data_length - 2, ' ')); } else { @@ -683,7 +683,7 @@ static int dissect_devicenet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree break; default: proto_tree_add_bytes_format_value(content_tree, hf_devicenet_data, tvb, offset, data_length, - NULL, "%s", tvb_bytes_to_str_punct(tvb, offset, data_length, ' ')); + NULL, "%s", tvb_bytes_to_ep_str_punct(tvb, offset, data_length, ' ')); break; } } diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c index d3a439cde0..6b35b8fe91 100644 --- a/epan/dissectors/packet-dhcpv6.c +++ b/epan/dissectors/packet-dhcpv6.c @@ -1200,7 +1200,7 @@ dissect_cablelabs_specific_opts(proto_tree *v_tree, proto_item *v_item, packet_i opt_len = tlv_len; if (tlv_len == 3) { proto_item_append_text(ti, "%s", - tvb_bytes_to_str_punct(tvb, sub_off, 3, ':')); + tvb_bytes_to_ep_str_punct(tvb, sub_off, 3, ':')); } else if (tlv_len == 6) { proto_item_append_text(ti, "\"%s\"", tvb_format_stringzpad(tvb, sub_off, tlv_len)); } else { @@ -1242,7 +1242,7 @@ dissect_cablelabs_specific_opts(proto_tree *v_tree, proto_item *v_item, packet_i } else { proto_item_append_text(ti, "%s", - tvb_bytes_to_str(tvb, sub_off, field_len)); + tvb_bytes_to_ep_str(tvb, sub_off, field_len)); } break; case CL_OPTION_TLV5 : @@ -1355,14 +1355,14 @@ dissect_cablelabs_specific_opts(proto_tree *v_tree, proto_item *v_item, packet_i } else { /*proto_item_append_text(ti, "CM MAC Address Option = %s", */ - proto_item_append_text(ti, "%s", tvb_bytes_to_str_punct(tvb, sub_off, opt_len, ':')); - /* tvb_bytes_to_str(tvb, sub_off, opt_len)); */ + proto_item_append_text(ti, "%s", tvb_bytes_to_ep_str_punct(tvb, sub_off, opt_len, ':')); + /* tvb_bytes_to_ep_str(tvb, sub_off, opt_len)); */ } break; case CL_EROUTER_CONTAINER_OPTION : opt_len = tlv_len; proto_item_append_text(ti, " %s (len=%d)", - tvb_bytes_to_str(tvb, sub_off, opt_len), tlv_len); + tvb_bytes_to_ep_str(tvb, sub_off, opt_len), tlv_len); break; case CL_OPTION_CCC : opt_len = tlv_len; @@ -1518,7 +1518,7 @@ dhcpv6_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, switch (opttype) { case OPTION_CLIENTID: - col_append_fstr(pinfo->cinfo, COL_INFO, "CID: %s ", tvb_bytes_to_str(tvb, off, optlen)); + col_append_fstr(pinfo->cinfo, COL_INFO, "CID: %s ", tvb_bytes_to_ep_str(tvb, off, optlen)); /* Fall through */ case OPTION_SERVERID: case OPTION_RELAYID: diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c index 989f8ec509..4ee60a8260 100644 --- a/epan/dissectors/packet-dmp.c +++ b/epan/dissectors/packet-dmp.c @@ -2664,7 +2664,7 @@ static gint dissect_mts_identifier (tvbuff_t *tvb, packet_info *pinfo _U_, proto } else if (dmp_nat_decode == NAT_DECODE_THALES) { mts_id = dissect_thales_mts_id (tvb, offset, dmp.mts_id_length); } else { - mts_id = tvb_bytes_to_str (tvb, offset, dmp.mts_id_length); + mts_id = tvb_bytes_to_ep_str (tvb, offset, dmp.mts_id_length); } proto_item_append_text (dmp.mts_id_item, " (%zu bytes decompressed)", strlen (mts_id)); mts_id = format_text (mts_id, strlen (mts_id)); @@ -2713,7 +2713,7 @@ static gint dissect_ipm_identifier (tvbuff_t *tvb, packet_info *pinfo _U_, proto } else if (dmp_nat_decode == NAT_DECODE_THALES) { ipm_id = dissect_thales_ipm_id (tvb, offset, ipm_id_length, modifier); } else { - ipm_id = tvb_bytes_to_str (tvb, offset, ipm_id_length); + ipm_id = tvb_bytes_to_ep_str (tvb, offset, ipm_id_length); } proto_item_append_text (tf, " (%zu bytes decompressed)", strlen (ipm_id)); ipm_id = format_text (ipm_id, strlen (ipm_id)); diff --git a/epan/dissectors/packet-eap.c b/epan/dissectors/packet-eap.c index 58b5966d2d..5214ba7dd7 100644 --- a/epan/dissectors/packet-eap.c +++ b/epan/dissectors/packet-eap.c @@ -498,7 +498,7 @@ dissect_eap_mschapv2(proto_tree *eap_tree, tvbuff_t *tvb, packet_info *pinfo, in } else { proto_tree_add_text(eap_tree, tvb, offset, value_size, "EAP-MS-CHAP-v2 Response (Unknown Length): %s", - tvb_bytes_to_str(tvb, offset, value_size)); + tvb_bytes_to_ep_str(tvb, offset, value_size)); offset += value_size; left -= value_size; } @@ -522,7 +522,7 @@ dissect_eap_mschapv2(proto_tree *eap_tree, tvbuff_t *tvb, packet_info *pinfo, in proto_tree_add_text(eap_tree, tvb, offset, left, "EAP-MS-CHAP-v2 Data (%d byte%s): \"%s\"", left, plurality(left, "", "s"), - tvb_bytes_to_str(tvb, offset, left)); + tvb_bytes_to_ep_str(tvb, offset, left)); break; } } @@ -1132,7 +1132,7 @@ dissect_eap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) proto_tree_add_text(eap_tree, tvb, offset, count, "EAP-LEAP Data (%d byte%s): \"%s\"", count, plurality(count, "", "s"), - tvb_bytes_to_str(tvb, offset, count)); + tvb_bytes_to_ep_str(tvb, offset, count)); break; } } @@ -1193,7 +1193,7 @@ dissect_eap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) proto_tree_add_text(eap_tree, tvb, offset, size, "EAP Data (%d byte%s): \"%s\"", size, plurality(size, "", "s"), - tvb_bytes_to_str(tvb, offset, size)); + tvb_bytes_to_ep_str(tvb, offset, size)); } break; /********************************************************************* diff --git a/epan/dissectors/packet-edonkey.c b/epan/dissectors/packet-edonkey.c index 46a1060274..7296af1e0a 100644 --- a/epan/dissectors/packet-edonkey.c +++ b/epan/dissectors/packet-edonkey.c @@ -1072,7 +1072,7 @@ static int dissect_kademlia_tag_bsob(tvbuff_t *tvb, packet_info *pinfo _U_, guint16 bsob_length; bsob_length = tvb_get_guint8(tvb, offset); - *string_value = tvb_bytes_to_str( tvb, offset + 1, bsob_length ); + *string_value = tvb_bytes_to_ep_str( tvb, offset + 1, bsob_length ); proto_tree_add_item(tree, hf_kademlia_tag_bsob, tvb, offset + 1, bsob_length, ENC_NA); return offset + 1 + bsob_length; @@ -2372,7 +2372,7 @@ static int dissect_kademlia_tag(tvbuff_t *tvb, packet_info *pinfo _U_, switch( type ) { case KADEMLIA_TAGTYPE_HASH: - proto_item_append_text( tag_node, "%s", tvb_bytes_to_str( tvb, offset, 16 )); + proto_item_append_text( tag_node, "%s", tvb_bytes_to_ep_str( tvb, offset, 16 )); offset = dissect_kademlia_tag_hash( tvb, pinfo, offset, subtree ); break; case KADEMLIA_TAGTYPE_STRING: diff --git a/epan/dissectors/packet-etsi_card_app_toolkit.c b/epan/dissectors/packet-etsi_card_app_toolkit.c index c8b8164737..182700b899 100644 --- a/epan/dissectors/packet-etsi_card_app_toolkit.c +++ b/epan/dissectors/packet-etsi_card_app_toolkit.c @@ -944,7 +944,7 @@ dissect_cat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) ti = proto_tree_add_bytes_format(cat_tree, hf_cat_tlv, tvb, pos, len, ptr, "%s: %s", val_to_str(tag, comp_tlv_tag_vals, "%02x"), - (const guint8 *)tvb_bytes_to_str(tvb, pos, len)); + (const guint8 *)tvb_bytes_to_ep_str(tvb, pos, len)); #else ti = proto_tree_add_bytes_format(cat_tree, hf_cat_tlv, tvb, pos, len, ptr, "%s: ", diff --git a/epan/dissectors/packet-fcsb3.c b/epan/dissectors/packet-fcsb3.c index f3448bb3ac..ae545f200e 100644 --- a/epan/dissectors/packet-fcsb3.c +++ b/epan/dissectors/packet-fcsb3.c @@ -826,7 +826,7 @@ static void dissect_fc_sbccs_dib_link_hdr (tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_text (tree, tvb, offset, 4, "Logical Paths %d-%d: %s", i*8, ((i+4)*8) - 1, - tvb_bytes_to_str_punct (tvb, offset, 4, ':')); + tvb_bytes_to_ep_str_punct (tvb, offset, 4, ':')); i += 4; offset += 4; } diff --git a/epan/dissectors/packet-fip.c b/epan/dissectors/packet-fip.c index 0ce44e7132..811be9f429 100644 --- a/epan/dissectors/packet-fip.c +++ b/epan/dissectors/packet-fip.c @@ -455,7 +455,7 @@ dissect_fip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(subtree, hf_fip_desc_mac, desc_tvb, 2, 6, ENC_NA); proto_item_append_text(item, "%s", - tvb_bytes_to_str_punct(desc_tvb, 2, 6, ':')); + tvb_bytes_to_ep_str_punct(desc_tvb, 2, 6, ':')); break; case FIP_DT_MAP_OUI: subtree = proto_item_add_subtree(item, ett_fip_dt_map); @@ -518,7 +518,7 @@ dissect_fip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_string(subtree, hf_fip_desc_vn_wwpn, desc_tvb, 12, 8, text); proto_item_append_text(item, "MAC %s FC_ID %6.6x", - tvb_bytes_to_str_punct(desc_tvb, 2, 6, ':'), + tvb_bytes_to_ep_str_punct(desc_tvb, 2, 6, ':'), tvb_get_ntoh24(desc_tvb, 9)); break; case FIP_DT_FKA: diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c index 3163063023..9666be4562 100644 --- a/epan/dissectors/packet-frame.c +++ b/epan/dissectors/packet-frame.c @@ -397,7 +397,7 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) md5_append(&md_ctx, cp, cap_len); md5_finish(&md_ctx, digest); - digest_string = bytestring_to_str(digest, 16, '\0'); + digest_string = bytestring_to_ep_str(digest, 16, '\0'); ti = proto_tree_add_string(fh_tree, hf_frame_md5_hash, tvb, 0, 0, digest_string); PROTO_ITEM_SET_GENERATED(ti); } diff --git a/epan/dissectors/packet-gsm_a_bssmap.c b/epan/dissectors/packet-gsm_a_bssmap.c index a3d97ca32b..d0ddb83d73 100644 --- a/epan/dissectors/packet-gsm_a_bssmap.c +++ b/epan/dissectors/packet-gsm_a_bssmap.c @@ -1238,7 +1238,7 @@ be_enc_info(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 off proto_tree_add_text(tree, tvb, curr_offset, len - (curr_offset - offset), "Key: %s", - tvb_bytes_to_str(tvb, curr_offset, len-(curr_offset-offset) )); + tvb_bytes_to_ep_str(tvb, curr_offset, len-(curr_offset-offset) )); curr_offset += len - (curr_offset - offset); diff --git a/epan/dissectors/packet-gsm_a_dtap.c b/epan/dissectors/packet-gsm_a_dtap.c index 19e2c0254e..98dd6e9c8f 100644 --- a/epan/dissectors/packet-gsm_a_dtap.c +++ b/epan/dissectors/packet-gsm_a_dtap.c @@ -2881,7 +2881,7 @@ de_cause(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset { diag_length = len - (curr_offset - offset); proto_tree_add_text(subtree, tvb, curr_offset, diag_length, - "Data: %s", tvb_bytes_to_str(tvb, curr_offset, diag_length)); + "Data: %s", tvb_bytes_to_ep_str(tvb, curr_offset, diag_length)); curr_offset += diag_length; } @@ -3367,7 +3367,7 @@ de_u2u(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, item = proto_tree_add_text(tree, tvb, curr_offset, len - 1, "User-user information"); subtree = proto_item_add_subtree(item, ett_gsm_dtap_elem[DE_USER_USER]); proto_tree_add_text(subtree, tvb, curr_offset, len - 1, - "Data: %s", tvb_bytes_to_str(tvb, curr_offset, len - 1)); + "Data: %s", tvb_bytes_to_ep_str(tvb, curr_offset, len - 1)); return(len); } diff --git a/epan/dissectors/packet-gsm_a_gm.c b/epan/dissectors/packet-gsm_a_gm.c index f752196231..0e8bf7523e 100644 --- a/epan/dissectors/packet-gsm_a_gm.c +++ b/epan/dissectors/packet-gsm_a_gm.c @@ -5262,7 +5262,7 @@ de_sm_tflow_temp(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 of switch (param) { case 0x01: proto_tree_add_text(tf_tree, tvb, curr_offset, pf_length, "Authorization token value: 0x%s", - tvb_bytes_to_str(tvb, curr_offset, pf_length)); + tvb_bytes_to_ep_str(tvb, curr_offset, pf_length)); break; case 0x02: @@ -5282,7 +5282,7 @@ de_sm_tflow_temp(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 of default: proto_tree_add_text(tf_tree, tvb, curr_offset, pf_length, "Parameter content: 0x%s", - tvb_bytes_to_str(tvb, curr_offset, pf_length)); + tvb_bytes_to_ep_str(tvb, curr_offset, pf_length)); break; } curr_offset += pf_length; diff --git a/epan/dissectors/packet-gsm_abis_om2000.c b/epan/dissectors/packet-gsm_abis_om2000.c index b0901661e2..4683304a38 100644 --- a/epan/dissectors/packet-gsm_abis_om2000.c +++ b/epan/dissectors/packet-gsm_abis_om2000.c @@ -591,7 +591,7 @@ dissect_om2k_attr_unkn(tvbuff_t *tvb, gint offset, gint len, gint iei, proto_tre offset, len, NULL, "%s: %s", val_to_str_ext(iei, &om2k_attr_vals_ext, "0x%02x"), - tvb_bytes_to_str(tvb, offset, len)); + tvb_bytes_to_ep_str(tvb, offset, len)); return len; } diff --git a/epan/dissectors/packet-gsm_sim.c b/epan/dissectors/packet-gsm_sim.c index 98676b4052..d233c4a767 100644 --- a/epan/dissectors/packet-gsm_sim.c +++ b/epan/dissectors/packet-gsm_sim.c @@ -1179,7 +1179,7 @@ dissect_gsm_apdu(guint8 ins, guint8 p1, guint8 p2, guint8 p3, tvbuff_t *tvb, break; case 0x04: /* select by AID */ col_append_fstr(pinfo->cinfo, COL_INFO, "Application %s ", - tvb_bytes_to_str(tvb, offset+DATA_OFFS, p3)); + tvb_bytes_to_ep_str(tvb, offset+DATA_OFFS, p3)); proto_tree_add_item(tree, hf_aid, tvb, offset+DATA_OFFS, p3, ENC_NA); break; diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c index 08e6fa9f9a..31daa40490 100644 --- a/epan/dissectors/packet-gtp.c +++ b/epan/dissectors/packet-gtp.c @@ -3350,9 +3350,9 @@ decode_gtp_auth_tri(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_t te = proto_tree_add_text(tree, tvb, offset, 29, "%s", val_to_str_ext_const(GTP_EXT_AUTH_TRI, >p_val_ext, "Unknown message")); ext_tree_auth_tri = proto_item_add_subtree(te, ett_gtp_ies[GTP_EXT_AUTH_TRI]); - proto_tree_add_text(ext_tree_auth_tri, tvb, offset + 1, 16, "RAND: %s", tvb_bytes_to_str(tvb, offset + 1, 16)); - proto_tree_add_text(ext_tree_auth_tri, tvb, offset + 17, 4, "SRES: %s", tvb_bytes_to_str(tvb, offset + 17, 4)); - proto_tree_add_text(ext_tree_auth_tri, tvb, offset + 21, 8, "Kc: %s", tvb_bytes_to_str(tvb, offset + 21, 8)); + proto_tree_add_text(ext_tree_auth_tri, tvb, offset + 1, 16, "RAND: %s", tvb_bytes_to_ep_str(tvb, offset + 1, 16)); + proto_tree_add_text(ext_tree_auth_tri, tvb, offset + 17, 4, "SRES: %s", tvb_bytes_to_ep_str(tvb, offset + 17, 4)); + proto_tree_add_text(ext_tree_auth_tri, tvb, offset + 21, 8, "Kc: %s", tvb_bytes_to_ep_str(tvb, offset + 21, 8)); return 1 + 16 + 4 + 8; } @@ -3927,9 +3927,9 @@ decode_triplet(tvbuff_t * tvb, int offset, proto_tree * tree, guint16 count) te_trip = proto_tree_add_text(tree, tvb, offset + i * 28, 28, "Triplet no%x", i); ext_tree_trip = proto_item_add_subtree(te_trip, ett_gtp_trip); - proto_tree_add_text(ext_tree_trip, tvb, offset + i * 28, 16, "RAND: %s", tvb_bytes_to_str(tvb, offset + i * 28, 16)); - proto_tree_add_text(ext_tree_trip, tvb, offset + i * 28 + 16, 4, "SRES: %s", tvb_bytes_to_str(tvb, offset + i * 28 + 16, 4)); - proto_tree_add_text(ext_tree_trip, tvb, offset + i * 28 + 20, 8, "Kc: %s", tvb_bytes_to_str(tvb, offset + i * 28 + 20, 8)); + proto_tree_add_text(ext_tree_trip, tvb, offset + i * 28, 16, "RAND: %s", tvb_bytes_to_ep_str(tvb, offset + i * 28, 16)); + proto_tree_add_text(ext_tree_trip, tvb, offset + i * 28 + 16, 4, "SRES: %s", tvb_bytes_to_ep_str(tvb, offset + i * 28 + 16, 4)); + proto_tree_add_text(ext_tree_trip, tvb, offset + i * 28 + 20, 8, "Kc: %s", tvb_bytes_to_ep_str(tvb, offset + i * 28 + 20, 8)); } return count * 28; @@ -3954,21 +3954,21 @@ decode_quintuplet(tvbuff_t * tvb, int offset, proto_tree * tree, guint16 count) ext_tree_quint = proto_item_add_subtree(te_quint, ett_gtp_quint); - proto_tree_add_text(ext_tree_quint, tvb, offset + q_offset, 16, "RAND: %s", tvb_bytes_to_str(tvb, offset, 16)); + proto_tree_add_text(ext_tree_quint, tvb, offset + q_offset, 16, "RAND: %s", tvb_bytes_to_ep_str(tvb, offset, 16)); q_offset = q_offset + 16; xres_len = tvb_get_guint8(tvb, offset + q_offset); proto_tree_add_text(ext_tree_quint, tvb, offset + q_offset, 1, "XRES length: %u", xres_len); q_offset++; - proto_tree_add_text(ext_tree_quint, tvb, offset + q_offset, xres_len, "XRES: %s", tvb_bytes_to_str(tvb, offset + q_offset, xres_len)); + proto_tree_add_text(ext_tree_quint, tvb, offset + q_offset, xres_len, "XRES: %s", tvb_bytes_to_ep_str(tvb, offset + q_offset, xres_len)); q_offset = q_offset + xres_len; - proto_tree_add_text(ext_tree_quint, tvb, offset + q_offset, 16, "Quintuplet Ciphering Key: %s", tvb_bytes_to_str(tvb, offset + q_offset, 16)); + proto_tree_add_text(ext_tree_quint, tvb, offset + q_offset, 16, "Quintuplet Ciphering Key: %s", tvb_bytes_to_ep_str(tvb, offset + q_offset, 16)); q_offset = q_offset + 16; - proto_tree_add_text(ext_tree_quint, tvb, offset + q_offset, 16, "Quintuplet Integrity Key: %s", tvb_bytes_to_str(tvb, offset + q_offset, 16)); + proto_tree_add_text(ext_tree_quint, tvb, offset + q_offset, 16, "Quintuplet Integrity Key: %s", tvb_bytes_to_ep_str(tvb, offset + q_offset, 16)); q_offset = q_offset + 16; auth_len = tvb_get_guint8(tvb, offset + q_offset); proto_tree_add_text(ext_tree_quint, tvb, offset + q_offset, 1, "Authentication length: %u", auth_len); q_offset++; - proto_tree_add_text(ext_tree_quint, tvb, offset + q_offset, auth_len, "AUTH: %s", tvb_bytes_to_str(tvb, offset + q_offset, auth_len)); + proto_tree_add_text(ext_tree_quint, tvb, offset + q_offset, auth_len, "AUTH: %s", tvb_bytes_to_ep_str(tvb, offset + q_offset, auth_len)); q_offset = q_offset + auth_len; proto_item_set_end(te_quint, tvb, offset + q_offset); @@ -4019,8 +4019,8 @@ decode_gtp_mm_cntxt(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree proto_tree_add_item(ext_tree_mm, hf_gtp_security_mode, tvb, offset + 4, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ext_tree_mm, hf_gtp_no_of_vectors, tvb, offset + 4, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ext_tree_mm, hf_gtp_cipher_algorithm, tvb, offset + 4, 1, ENC_BIG_ENDIAN); - proto_tree_add_text(ext_tree_mm, tvb, offset + 5, 16, "Ciphering key CK: %s", tvb_bytes_to_str(tvb, offset + 5, 16)); - proto_tree_add_text(ext_tree_mm, tvb, offset + 21, 16, "Integrity key IK: %s", tvb_bytes_to_str(tvb, offset + 21, 16)); + proto_tree_add_text(ext_tree_mm, tvb, offset + 5, 16, "Ciphering key CK: %s", tvb_bytes_to_ep_str(tvb, offset + 5, 16)); + proto_tree_add_text(ext_tree_mm, tvb, offset + 21, 16, "Integrity key IK: %s", tvb_bytes_to_ep_str(tvb, offset + 21, 16)); quint_len = tvb_get_ntohs(tvb, offset + 37); proto_tree_add_text(ext_tree_mm, tvb, offset + 37, 2, "Quintuplets length: 0x%x (%u)", quint_len, quint_len); @@ -4035,7 +4035,7 @@ decode_gtp_mm_cntxt(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree proto_tree_add_item(ext_tree_mm, hf_gtp_no_of_vectors, tvb, offset + 4, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ext_tree_mm, hf_gtp_cipher_algorithm, tvb, offset + 4, 1, ENC_BIG_ENDIAN); - proto_tree_add_text(ext_tree_mm, tvb, offset + 5, 8, "Ciphering key Kc: %s", tvb_bytes_to_str(tvb, offset + 5, 8)); + proto_tree_add_text(ext_tree_mm, tvb, offset + 5, 8, "Ciphering key Kc: %s", tvb_bytes_to_ep_str(tvb, offset + 5, 8)); offset = offset + decode_triplet(tvb, offset + 13, ext_tree_mm, count) + 13; @@ -4044,8 +4044,8 @@ decode_gtp_mm_cntxt(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree proto_tree_add_item(ext_tree_mm, hf_gtp_ksi, tvb, offset + 3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ext_tree_mm, hf_gtp_security_mode, tvb, offset + 4, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ext_tree_mm, hf_gtp_no_of_vectors, tvb, offset + 4, 1, ENC_BIG_ENDIAN); - proto_tree_add_text(ext_tree_mm, tvb, offset + 5, 16, "Ciphering key CK: %s", tvb_bytes_to_str(tvb, offset + 5, 16)); - proto_tree_add_text(ext_tree_mm, tvb, offset + 21, 16, "Integrity key IK: %s", tvb_bytes_to_str(tvb, offset + 21, 16)); + proto_tree_add_text(ext_tree_mm, tvb, offset + 5, 16, "Ciphering key CK: %s", tvb_bytes_to_ep_str(tvb, offset + 5, 16)); + proto_tree_add_text(ext_tree_mm, tvb, offset + 21, 16, "Integrity key IK: %s", tvb_bytes_to_ep_str(tvb, offset + 21, 16)); quint_len = tvb_get_ntohs(tvb, offset + 37); proto_tree_add_text(ext_tree_mm, tvb, offset + 37, 2, "Quintuplets length: 0x%x (%u)", quint_len, quint_len); @@ -4058,7 +4058,7 @@ decode_gtp_mm_cntxt(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree proto_tree_add_item(ext_tree_mm, hf_gtp_no_of_vectors, tvb, offset + 4, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ext_tree_mm, hf_gtp_cipher_algorithm, tvb, offset + 4, 1, ENC_BIG_ENDIAN); proto_tree_add_text(ext_tree_mm, tvb, offset + 5, 8, - "Ciphering key Kc: %s", tvb_bytes_to_str(tvb, offset + 5, 8)); + "Ciphering key Kc: %s", tvb_bytes_to_ep_str(tvb, offset + 5, 8)); quint_len = tvb_get_ntohs(tvb, offset + 13); proto_tree_add_text(ext_tree_mm, tvb, offset + 13, 2, "Quintuplets length: 0x%x (%u)", quint_len, quint_len); @@ -4996,21 +4996,21 @@ decode_gtp_auth_qui(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_t proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset = offset + 2; - proto_tree_add_text(ext_tree, tvb, offset, 16, "RAND: %s", tvb_bytes_to_str(tvb, offset, 16)); + proto_tree_add_text(ext_tree, tvb, offset, 16, "RAND: %s", tvb_bytes_to_ep_str(tvb, offset, 16)); offset = offset + 16; xres_len = tvb_get_guint8(tvb, offset); proto_tree_add_text(ext_tree, tvb, offset, 1, "XRES length: %u", xres_len); offset++; - proto_tree_add_text(ext_tree, tvb, offset, xres_len, "XRES: %s", tvb_bytes_to_str(tvb, offset, xres_len)); + proto_tree_add_text(ext_tree, tvb, offset, xres_len, "XRES: %s", tvb_bytes_to_ep_str(tvb, offset, xres_len)); offset = offset + xres_len; - proto_tree_add_text(ext_tree, tvb, offset, 16, "Quintuplet Ciphering Key: %s", tvb_bytes_to_str(tvb, offset, 16)); + proto_tree_add_text(ext_tree, tvb, offset, 16, "Quintuplet Ciphering Key: %s", tvb_bytes_to_ep_str(tvb, offset, 16)); offset = offset + 16; - proto_tree_add_text(ext_tree, tvb, offset, 16, "Quintuplet Integrity Key: %s", tvb_bytes_to_str(tvb, offset, 16)); + proto_tree_add_text(ext_tree, tvb, offset, 16, "Quintuplet Integrity Key: %s", tvb_bytes_to_ep_str(tvb, offset, 16)); offset = offset + 16; auth_len = tvb_get_guint8(tvb, offset); proto_tree_add_text(ext_tree, tvb, offset, 1, "Authentication length: %u", auth_len); offset++; - proto_tree_add_text(ext_tree, tvb, offset, auth_len, "AUTH: %s", tvb_bytes_to_str(tvb, offset, auth_len)); + proto_tree_add_text(ext_tree, tvb, offset, auth_len, "AUTH: %s", tvb_bytes_to_ep_str(tvb, offset, auth_len)); return (3 + length); @@ -5683,7 +5683,7 @@ gchar *dissect_radius_user_loc(proto_tree * tree, tvbuff_t * tvb, packet_info* p break; } - return tvb_bytes_to_str(tvb, 0, length); + return tvb_bytes_to_ep_str(tvb, 0, length); } /* diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c index 89f85b1b0a..1c00d4a78b 100644 --- a/epan/dissectors/packet-gtpv2.c +++ b/epan/dissectors/packet-gtpv2.c @@ -1131,7 +1131,7 @@ dissect_gtpv2_src_tgt_trans_con(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre * to Target RNC Transparent Container IE defined in 3GPP TS 25.413 [9]. The Transparent container field includes the * IE value part as it is specified in the respective specification. */ - proto_tree_add_text(tree, tvb, offset, length-1, "Transparent Container: %s", tvb_bytes_to_str(tvb, offset, length-1)); + proto_tree_add_text(tree, tvb, offset, length-1, "Transparent Container: %s", tvb_bytes_to_ep_str(tvb, offset, length-1)); /* * bssmap_old_bss_to_new_bss_info(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo); * dissect_ranap_SourceRNC_ToTargetRNC_TransparentContainer_PDU @@ -1148,7 +1148,7 @@ dissect_gtpv2_tgt_src_trans_con(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre offset += 1; /* Transparent Container */ - proto_tree_add_text(tree, tvb, offset, length-1, "Transparent Container: %s", tvb_bytes_to_str(tvb, offset, length-1)); + proto_tree_add_text(tree, tvb, offset, length-1, "Transparent Container: %s", tvb_bytes_to_ep_str(tvb, offset, length-1)); } @@ -1163,16 +1163,16 @@ dissect_gtpv2_mm_con_eutran_srvcc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t proto_tree_add_item(tree, hf_gtpv2_eksi, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_text(tree, tvb, offset , 16, "CKsrvcc: %s ", tvb_bytes_to_str(tvb, offset, 16)); + proto_tree_add_text(tree, tvb, offset , 16, "CKsrvcc: %s ", tvb_bytes_to_ep_str(tvb, offset, 16)); offset += 16; - proto_tree_add_text(tree, tvb, offset, 16, "IKsrvcc: %s ", tvb_bytes_to_str(tvb, offset, 16)); + proto_tree_add_text(tree, tvb, offset, 16, "IKsrvcc: %s ", tvb_bytes_to_ep_str(tvb, offset, 16)); offset += 16; /* Length of Mobile Station Classmark2 */ elm_len = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_gtpv2_len_ms_classmark2, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - fi = proto_tree_add_text(tree, tvb, offset, elm_len, "Mobile Station Classmark2 %s", tvb_bytes_to_str(tvb, offset, elm_len)); + fi = proto_tree_add_text(tree, tvb, offset, elm_len, "Mobile Station Classmark2 %s", tvb_bytes_to_ep_str(tvb, offset, elm_len)); ms_tree = proto_item_add_subtree(fi, ett_gtpv2_ms_mark); de_ms_cm_2(tvb, ms_tree, pinfo, offset, elm_len, NULL, 0); offset += elm_len; @@ -1181,7 +1181,7 @@ dissect_gtpv2_mm_con_eutran_srvcc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t elm_len = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_gtpv2_len_ms_classmark3, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - fi = proto_tree_add_text(tree, tvb, offset, elm_len, "Mobile Station Classmark3 %s", tvb_bytes_to_str(tvb, offset, elm_len)); + fi = proto_tree_add_text(tree, tvb, offset, elm_len, "Mobile Station Classmark3 %s", tvb_bytes_to_ep_str(tvb, offset, elm_len)); ms_tree = proto_item_add_subtree(fi, ett_gtpv2_ms_mark); de_ms_cm_3(tvb, ms_tree, pinfo, offset, elm_len, NULL, 0); offset += elm_len; @@ -1190,7 +1190,7 @@ dissect_gtpv2_mm_con_eutran_srvcc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t elm_len = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_gtpv2_len_supp_codec_list, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - fi = proto_tree_add_text(tree, tvb, offset, elm_len, "Supported Codec List %s", tvb_bytes_to_str(tvb, offset, elm_len)); + fi = proto_tree_add_text(tree, tvb, offset, elm_len, "Supported Codec List %s", tvb_bytes_to_ep_str(tvb, offset, elm_len)); ms_tree = proto_item_add_subtree(fi, ett_gtpv2_supp_codec_list); de_sup_codec_list(tvb, ms_tree, pinfo, offset, elm_len, NULL, 0); @@ -1207,11 +1207,11 @@ dissect_gtpv2_mm_con_utran_srvcc(tvbuff_t *tvb, packet_info *pinfo, proto_tree * proto_tree_add_item(tree, hf_gtpv2_ksi, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_text(tree, tvb, offset, 16, "CK'cs: %s", tvb_bytes_to_str(tvb, offset, 16)); + proto_tree_add_text(tree, tvb, offset, 16, "CK'cs: %s", tvb_bytes_to_ep_str(tvb, offset, 16)); offset += 16; - proto_tree_add_text(tree, tvb, offset, 16, "IK'cs: %s", tvb_bytes_to_str(tvb, offset, 16)); + proto_tree_add_text(tree, tvb, offset, 16, "IK'cs: %s", tvb_bytes_to_ep_str(tvb, offset, 16)); offset += 16; - proto_tree_add_text(tree, tvb, offset, 8, "Kc': %s", tvb_bytes_to_str(tvb, offset, 8)); + proto_tree_add_text(tree, tvb, offset, 8, "Kc': %s", tvb_bytes_to_ep_str(tvb, offset, 8)); offset += 8; proto_tree_add_item(tree, hf_gtpv2_cksn, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; @@ -1220,7 +1220,7 @@ dissect_gtpv2_mm_con_utran_srvcc(tvbuff_t *tvb, packet_info *pinfo, proto_tree * elm_len = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_gtpv2_len_ms_classmark2, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - fi = proto_tree_add_text(tree, tvb, offset, elm_len, "Mobile Station Classmark2 %s", tvb_bytes_to_str(tvb, offset, elm_len)); + fi = proto_tree_add_text(tree, tvb, offset, elm_len, "Mobile Station Classmark2 %s", tvb_bytes_to_ep_str(tvb, offset, elm_len)); ms_tree = proto_item_add_subtree(fi, ett_gtpv2_ms_mark); de_ms_cm_2(tvb, ms_tree, pinfo, offset, elm_len, NULL, 0); offset += elm_len; @@ -1229,7 +1229,7 @@ dissect_gtpv2_mm_con_utran_srvcc(tvbuff_t *tvb, packet_info *pinfo, proto_tree * elm_len = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_gtpv2_len_ms_classmark3, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - fi = proto_tree_add_text(tree, tvb, offset, elm_len, "Mobile Station Classmark3 %s", tvb_bytes_to_str(tvb, offset, elm_len)); + fi = proto_tree_add_text(tree, tvb, offset, elm_len, "Mobile Station Classmark3 %s", tvb_bytes_to_ep_str(tvb, offset, elm_len)); ms_tree = proto_item_add_subtree(fi, ett_gtpv2_ms_mark); de_ms_cm_3(tvb, ms_tree, pinfo, offset, elm_len, NULL, 0); offset += elm_len; @@ -1238,7 +1238,7 @@ dissect_gtpv2_mm_con_utran_srvcc(tvbuff_t *tvb, packet_info *pinfo, proto_tree * elm_len = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_gtpv2_len_supp_codec_list, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - fi = proto_tree_add_text(tree, tvb, offset, elm_len, "Supported Codec List %s", tvb_bytes_to_str(tvb, offset, elm_len)); + fi = proto_tree_add_text(tree, tvb, offset, elm_len, "Supported Codec List %s", tvb_bytes_to_ep_str(tvb, offset, elm_len)); ms_tree = proto_item_add_subtree(fi, ett_gtpv2_supp_codec_list); de_sup_codec_list(tvb, ms_tree, pinfo, offset, elm_len, NULL, 0); @@ -1389,7 +1389,7 @@ dissect_gtpv2_teid_c(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, pr proto_tree_add_item(tree, hf_gtpv2_teid_c, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; if (length > 4) - proto_tree_add_text(tree, tvb, offset, length-4, "Spare: %s", tvb_bytes_to_str(tvb, offset, length-4)); + proto_tree_add_text(tree, tvb, offset, length-4, "Spare: %s", tvb_bytes_to_ep_str(tvb, offset, length-4)); proto_item_append_text(item, "%u", tvb_get_ntohl(tvb, offset-4)); } @@ -1404,7 +1404,7 @@ dissect_gtpv2_sv_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_tree_add_item(tree, hf_gtpv2_sv_emind, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; if (length > 1) - proto_tree_add_text(tree, tvb, offset, length-1, "Spare: %s", tvb_bytes_to_str(tvb, offset, length-1)); + proto_tree_add_text(tree, tvb, offset, length-1, "Spare: %s", tvb_bytes_to_ep_str(tvb, offset, length-1)); } /* 6.12 Service Area Identifier */ @@ -2145,7 +2145,7 @@ dissect_gtpv2_f_teid(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, pr proto_tree_add_item(tree, hf_gtpv2_f_teid_gre_key, tvb, offset, 4, ENC_BIG_ENDIAN); proto_item_append_text(item, "%s, TEID/GRE Key: 0x%s", val_to_str_ext_const((flags & 0x3f), >pv2_f_teid_interface_type_vals_ext, "Unknown"), - tvb_bytes_to_str(tvb, offset, 4)); + tvb_bytes_to_ep_str(tvb, offset, 4)); offset += 4; if (flags & 0x80) @@ -2167,7 +2167,7 @@ static void dissect_gtpv2_tmsi(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item, guint16 length, guint8 message_type _U_, guint8 instance _U_) { proto_tree_add_item(tree, hf_gtpv2_tmsi, tvb, 0, 4, ENC_BIG_ENDIAN); - proto_tree_add_text(item, tvb, 0, length, "TMSI: %s", tvb_bytes_to_str(tvb, 0, 4)); + proto_tree_add_text(item, tvb, 0, length, "TMSI: %s", tvb_bytes_to_ep_str(tvb, 0, 4)); } /* * 8.24 Global CN-Id @@ -2192,7 +2192,7 @@ dissect_gtpv2_g_cn_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto /* >CN-ID M INTEGER (0..4095) */ proto_tree_add_text(tree, tvb, offset, 2, "CN-Id: %s", - tvb_bytes_to_str(tvb, offset, 2)); + tvb_bytes_to_ep_str(tvb, offset, 2)); } /* * 8.25 S103 PDN Data Forwarding Info (S103PDF) @@ -2527,7 +2527,7 @@ dissect_gtpv2_tra_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, prot * Will be displayed if length of Trace Depth Length is > 0 * The list will only contains UTF8String, RAW DATA */ - proto_tree_add_text(tree, tvb, offset, tdl, "Trace Depth List: %s", tvb_bytes_to_str(tvb, offset, tdl)); + proto_tree_add_text(tree, tvb, offset, tdl, "Trace Depth List: %s", tvb_bytes_to_ep_str(tvb, offset, tdl)); offset += tdl; /* Set up subtree interfaces and put all interfaces under it */ @@ -2687,7 +2687,7 @@ dissect_gtpv2_drx_param(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset = 0; /* 36.413 : 9.2.1.17 Paging Cause, void */ - proto_tree_add_text(tree, tvb, offset, length, "DRX parameter: %s", tvb_bytes_to_str(tvb, offset, (length ))); + proto_tree_add_text(tree, tvb, offset, length, "DRX parameter: %s", tvb_bytes_to_ep_str(tvb, offset, (length ))); } /* @@ -2780,9 +2780,9 @@ dissect_gtpv2_authentication_triplets(tvbuff_t *tvb, proto_tree *tree, int offse */ proto_tree_add_item(auth_tri_tree, hf_gtpv2_mm_context_rand, tvb, offset, 16, ENC_NA); offset += 16; - proto_tree_add_text(auth_tri_tree, tvb, offset, 4, "SRES': %s", tvb_bytes_to_str(tvb, offset, 4)); + proto_tree_add_text(auth_tri_tree, tvb, offset, 4, "SRES': %s", tvb_bytes_to_ep_str(tvb, offset, 4)); offset += 4; - proto_tree_add_text(auth_tri_tree, tvb, offset, 8, "Kc': %s", tvb_bytes_to_str(tvb, offset, 8)); + proto_tree_add_text(auth_tri_tree, tvb, offset, 8, "Kc': %s", tvb_bytes_to_ep_str(tvb, offset, 8)); offset += 8; } @@ -2846,19 +2846,19 @@ dissect_gtpv2_authentication_quadruplets(tvbuff_t *tvb, proto_tree *tree, int of auth_qua_tree = proto_item_add_subtree(auth_qua_item, ett_gtpv2_mm_context_auth_qua); proto_tree_add_text(auth_qua_tree, tvb, offset, 16, "RAND: %s", - tvb_bytes_to_str(tvb, offset, 16)); + tvb_bytes_to_ep_str(tvb, offset, 16)); offset += 16; tmp = tvb_get_guint8(tvb, offset++); proto_tree_add_text(auth_qua_tree, tvb, offset, tmp, "XRES: %s", - tvb_bytes_to_str(tvb, offset, tmp)); + tvb_bytes_to_ep_str(tvb, offset, tmp)); offset += tmp; tmp = tvb_get_guint8(tvb, offset++); proto_tree_add_text(auth_qua_tree, tvb, offset, tmp, "AUTN: %s", - tvb_bytes_to_str(tvb, offset, tmp)); + tvb_bytes_to_ep_str(tvb, offset, tmp)); offset += tmp; proto_tree_add_item(tree, hf_gtpv2_mm_context_kasme, tvb, offset, 32, ENC_BIG_ENDIAN); @@ -3018,7 +3018,7 @@ dissect_gtpv2_mm_context_gsm_t(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr offset += 1; /* 8 to 15 Kc */ - proto_tree_add_text(tree, tvb, offset, 8, "Kc': %s", tvb_bytes_to_str(tvb, offset, 8)); + proto_tree_add_text(tree, tvb, offset, 8, "Kc': %s", tvb_bytes_to_ep_str(tvb, offset, 8)); offset += 8; /* 16 to h Authentication Triplet [0..4] */ @@ -3182,7 +3182,7 @@ dissect_gtpv2_mm_context_gsm_cq(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre proto_tree_add_item(flag_tree, hf_gtpv2_mm_context_used_cipher, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* 8 to 15 Kc */ - proto_tree_add_text(tree, tvb, offset, 8, "Kc': %s", tvb_bytes_to_str(tvb, offset, 8)); + proto_tree_add_text(tree, tvb, offset, 8, "Kc': %s", tvb_bytes_to_ep_str(tvb, offset, 8)); offset += 8; /* @@ -3456,7 +3456,7 @@ dissect_gtpv2_mm_context_eps_qq(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre if ( nhi ) { proto_tree_add_text(tree, tvb, offset, 32, "NH (Next Hop): %s", - tvb_bytes_to_str(tvb, offset, 32)); + tvb_bytes_to_ep_str(tvb, offset, 32)); offset += 32; proto_tree_add_text(tree, tvb, offset, 1, "NCC (Next Hop Chaining Count): %d", @@ -3653,7 +3653,7 @@ dissect_gtpv2_p_tmsi(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, pr /* The TMSI consists of 4 octets. It can be coded using a full hexadecimal representation. */ proto_tree_add_item(tree, hf_gtpv2_p_tmsi, tvb, offset, 4, ENC_BIG_ENDIAN); - proto_item_append_text(item, "%s", tvb_bytes_to_str(tvb, offset, 4)); + proto_item_append_text(item, "%s", tvb_bytes_to_ep_str(tvb, offset, 4)); } /* @@ -3666,7 +3666,7 @@ dissect_gtpv2_p_tmsi_sig(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree /* The P-TMSI Signature consists of 3 octets and may be allocated by the SGSN. */ proto_tree_add_item(tree, hf_gtpv2_p_tmsi_sig, tvb, offset, 3, ENC_BIG_ENDIAN); - proto_item_append_text(item, "%s", tvb_bytes_to_str(tvb, offset, 3)); + proto_item_append_text(item, "%s", tvb_bytes_to_ep_str(tvb, offset, 3)); } @@ -4099,7 +4099,7 @@ dissect_gtpv2_pkt_flow_id(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre offset += 1; /* Packet Flow ID */ - proto_tree_add_text(tree, tvb, offset, length, "Packet Flow ID: %s", tvb_bytes_to_str(tvb, offset, length-1)); + proto_tree_add_text(tree, tvb, offset, length, "Packet Flow ID: %s", tvb_bytes_to_ep_str(tvb, offset, length-1)); } /* @@ -4520,7 +4520,7 @@ dissect_gtpv2_mbms_session_duration(tvbuff_t *tvb, packet_info *pinfo _U_, proto offset += 3; if (length > 3) - proto_tree_add_text(tree, tvb, offset, length-3, "Spare: %s", tvb_bytes_to_str(tvb, offset, length-3)); + proto_tree_add_text(tree, tvb, offset, length-3, "Spare: %s", tvb_bytes_to_ep_str(tvb, offset, length-3)); } /* @@ -4568,7 +4568,7 @@ dissect_gtpv2_mbms_session_id(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree offset += 1; if (length > 1) - proto_tree_add_text(tree, tvb, offset, length-1, "Spare: %s", tvb_bytes_to_str(tvb, offset, length-1)); + proto_tree_add_text(tree, tvb, offset, length-1, "Spare: %s", tvb_bytes_to_ep_str(tvb, offset, length-1)); } /* @@ -4580,11 +4580,11 @@ dissect_gtpv2_mbms_flow_id(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr int offset = 0; /* Two octets OctetString. */ proto_tree_add_item(tree, hf_gtpv2_mbms_flow_id, tvb, offset, 2, ENC_NA); - proto_item_append_text(item, " %s", tvb_bytes_to_str(tvb, offset, 2)); + proto_item_append_text(item, " %s", tvb_bytes_to_ep_str(tvb, offset, 2)); offset += 2; if (length > 2) - proto_tree_add_text(tree, tvb, offset, length-2, "Spare: %s", tvb_bytes_to_str(tvb, offset, length-2)); + proto_tree_add_text(tree, tvb, offset, length-2, "Spare: %s", tvb_bytes_to_ep_str(tvb, offset, length-2)); } /* @@ -4638,7 +4638,7 @@ dissect_gtpv2_mbms_ip_mc_dist(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree offset += 1; if (length > offset) - proto_tree_add_text(tree, tvb, offset, length-offset, "Spare: %s", tvb_bytes_to_str(tvb, offset, length-offset)); + proto_tree_add_text(tree, tvb, offset, length-offset, "Spare: %s", tvb_bytes_to_ep_str(tvb, offset, length-offset)); } @@ -4662,7 +4662,7 @@ dissect_gtpv2_mbms_dist_ack(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t offset += 1; if (length > 1) - proto_tree_add_text(tree, tvb, offset, length-1, "Spare: %s", tvb_bytes_to_str(tvb, offset, length-1)); + proto_tree_add_text(tree, tvb, offset, length-1, "Spare: %s", tvb_bytes_to_ep_str(tvb, offset, length-1)); } /* @@ -4739,7 +4739,7 @@ dissect_gtpv2_node_features(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t proto_tree_add_item(tree, hf_gtpv2_node_features_ntsr, tvb, offset, 1, ENC_BIG_ENDIAN); offset+=1; if (length > 1) - proto_tree_add_text(tree, tvb, offset, length-1, "Spare: %s", tvb_bytes_to_str(tvb, offset, length-1)); + proto_tree_add_text(tree, tvb, offset, length-1, "Spare: %s", tvb_bytes_to_ep_str(tvb, offset, length-1)); } /* 8.84 @@ -4759,7 +4759,7 @@ dissect_gtpv2_mbms_time_to_data_xfer(tvbuff_t *tvb, packet_info *pinfo _U_, prot proto_item_append_text(item, " %u second(s)", real_secs); offset += 1; if (length > 1) - proto_tree_add_text(tree, tvb, offset, length-1, "Spare: %s", tvb_bytes_to_str(tvb, offset, length-1)); + proto_tree_add_text(tree, tvb, offset, length-1, "Spare: %s", tvb_bytes_to_ep_str(tvb, offset, length-1)); } /* 8.85 Throttling */ @@ -4781,7 +4781,7 @@ dissect_gtpv2_arp(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto offset += 1; if (length > 1) - proto_tree_add_text(tree, tvb, offset, length-1, "Spare: %s", tvb_bytes_to_str(tvb, offset, length-1)); + proto_tree_add_text(tree, tvb, offset, length-1, "Spare: %s", tvb_bytes_to_ep_str(tvb, offset, length-1)); } /* 8.87 EPC Timer */ @@ -4830,7 +4830,7 @@ dissect_gtpv2_tmgi(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, prot offset += 3; if (length > offset) - proto_tree_add_text(tree, tvb, offset, length-offset, "Spare: %s", tvb_bytes_to_str(tvb, offset, length-offset)); + proto_tree_add_text(tree, tvb, offset, length-offset, "Spare: %s", tvb_bytes_to_ep_str(tvb, offset, length-offset)); } /* @@ -4849,7 +4849,7 @@ dissect_gtpv2_add_mm_cont_for_srvcc(tvbuff_t *tvb, packet_info *pinfo _U_, proto elm_len = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_gtpv2_len_ms_classmark2, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - ms_cm_item = proto_tree_add_text(tree, tvb, offset, elm_len, "Mobile Station Classmark 2 %s", tvb_bytes_to_str(tvb, offset, elm_len)); + ms_cm_item = proto_tree_add_text(tree, tvb, offset, elm_len, "Mobile Station Classmark 2 %s", tvb_bytes_to_ep_str(tvb, offset, elm_len)); ms_cm_tree = proto_item_add_subtree(ms_cm_item, ett_gtpv2_ms_mark); /* Mobile Station Classmark 2 */ de_ms_cm_2(tvb, ms_cm_tree, pinfo, offset, elm_len, NULL, 0); @@ -4859,7 +4859,7 @@ dissect_gtpv2_add_mm_cont_for_srvcc(tvbuff_t *tvb, packet_info *pinfo _U_, proto elm_len = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_gtpv2_len_ms_classmark3, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - ms_cm_item = proto_tree_add_text(tree, tvb, offset, elm_len, "Mobile Station Classmark3 %s", tvb_bytes_to_str(tvb, offset, elm_len)); + ms_cm_item = proto_tree_add_text(tree, tvb, offset, elm_len, "Mobile Station Classmark3 %s", tvb_bytes_to_ep_str(tvb, offset, elm_len)); ms_cm_tree = proto_item_add_subtree(ms_cm_item, ett_gtpv2_ms_mark); /* Mobile Station Classmark 3 */ de_ms_cm_3(tvb, ms_cm_tree, pinfo, offset, elm_len, NULL, 0); @@ -4869,14 +4869,14 @@ dissect_gtpv2_add_mm_cont_for_srvcc(tvbuff_t *tvb, packet_info *pinfo _U_, proto elm_len = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_gtpv2_len_supp_codec_list, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - ms_cm_item = proto_tree_add_text(tree, tvb, offset, elm_len, "Supported Codec List %s", tvb_bytes_to_str(tvb, offset, elm_len)); + ms_cm_item = proto_tree_add_text(tree, tvb, offset, elm_len, "Supported Codec List %s", tvb_bytes_to_ep_str(tvb, offset, elm_len)); ms_cm_tree = proto_item_add_subtree(ms_cm_item, ett_gtpv2_supp_codec_list); /* Supported Codec List */ de_sup_codec_list(tvb, ms_cm_tree, pinfo, offset, elm_len, NULL, 0); offset += elm_len; if (length > offset) - proto_tree_add_text(tree, tvb, offset, length-offset, "Spare: %s", tvb_bytes_to_str(tvb, offset, length-offset)); + proto_tree_add_text(tree, tvb, offset, length-offset, "Spare: %s", tvb_bytes_to_ep_str(tvb, offset, length-offset)); } /* 8.91 Additional flags for SRVCC */ @@ -4890,7 +4890,7 @@ dissect_gtpv2_add_flags_for_srvcc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t offset += 1; if (length > 1) - proto_tree_add_text(tree, tvb, offset, length-1, "Spare: %s", tvb_bytes_to_str(tvb, offset, length-1)); + proto_tree_add_text(tree, tvb, offset, length-1, "Spare: %s", tvb_bytes_to_ep_str(tvb, offset, length-1)); } /* 8.92 Max MBR/APN-AMBR (MMBR) */ @@ -4953,7 +4953,7 @@ dissect_gtpv2_abs_mbms_data_tf_time(tvbuff_t *tvb, packet_info *pinfo _U_, proto offset += 8; if (length > offset) - proto_tree_add_text(tree, tvb, offset, length-offset, "Spare: %s", tvb_bytes_to_str(tvb, offset, length-offset)); + proto_tree_add_text(tree, tvb, offset, length-offset, "Spare: %s", tvb_bytes_to_ep_str(tvb, offset, length-offset)); } /* 8.96 H(e)NB Information Reporting */ @@ -4971,7 +4971,7 @@ dissect_gtpv2_henb_info_report(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree offset += 1; if (length > 1) - proto_tree_add_text(tree, tvb, offset, length-1, "Spare: %s", tvb_bytes_to_str(tvb, offset, length-1)); + proto_tree_add_text(tree, tvb, offset, length-1, "Spare: %s", tvb_bytes_to_ep_str(tvb, offset, length-1)); } /* 8.97 IPv4 Configuration Parameters (IP4CP) */ @@ -4986,7 +4986,7 @@ dissect_gtpv2_ip4cp(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, pro offset += 4; if (length > offset) - proto_tree_add_text(tree, tvb, offset, length-offset, "Spare: %s", tvb_bytes_to_str(tvb, offset, length-offset)); + proto_tree_add_text(tree, tvb, offset, length-offset, "Spare: %s", tvb_bytes_to_ep_str(tvb, offset, length-offset)); } /* 8.98 Change to Report Flags */ @@ -5000,7 +5000,7 @@ dissect_gtpv2_change_report_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t offset += 1; if (length > 1) - proto_tree_add_text(tree, tvb, offset, length-1, "Spare: %s", tvb_bytes_to_str(tvb, offset, length-1)); + proto_tree_add_text(tree, tvb, offset, length-1, "Spare: %s", tvb_bytes_to_ep_str(tvb, offset, length-1)); } /* 8.99 Action Indication */ @@ -5026,7 +5026,7 @@ dissect_gtpv2_action_indication(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre offset += 1; if (length > 1) - proto_tree_add_text(tree, tvb, offset, length-1, "Spare: %s", tvb_bytes_to_str(tvb, offset, length-1)); + proto_tree_add_text(tree, tvb, offset, length-1, "Spare: %s", tvb_bytes_to_ep_str(tvb, offset, length-1)); } typedef struct _gtpv2_ie { diff --git a/epan/dissectors/packet-gvcp.c b/epan/dissectors/packet-gvcp.c index 09dc18dfab..1aed149fb2 100644 --- a/epan/dissectors/packet-gvcp.c +++ b/epan/dissectors/packet-gvcp.c @@ -178,7 +178,7 @@ dissect_gvcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ wmem_strbuf_append_printf(info, "%d.%d.%d.%d to %s", tvb_get_guint8(tvb, 28), tvb_get_guint8(tvb, 29), tvb_get_guint8(tvb, 30), tvb_get_guint8(tvb, 31), - tvb_bytes_to_str_punct(tvb, 10, 6, ':')); + tvb_bytes_to_ep_str_punct(tvb, 10, 6, ':')); } break; case 0x80: /* Register Read Request */ diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c index 4fcc3de3a5..6306ed607b 100644 --- a/epan/dissectors/packet-h248.c +++ b/epan/dissectors/packet-h248.c @@ -2234,7 +2234,7 @@ dissect_h248_T_terminationId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o if (curr_info.term->len) { curr_info.term->buffer = (guint8 *)tvb_memdup(wmem_packet_scope(),new_tvb,0,curr_info.term->len); - curr_info.term->str = bytes_to_str(curr_info.term->buffer,curr_info.term->len); + curr_info.term->str = bytes_to_ep_str(curr_info.term->buffer,curr_info.term->len); } curr_info.term = gcp_cmd_add_term(curr_info.msg, curr_info.trx, curr_info.cmd, curr_info.term, wild_term, keep_persistent_data); @@ -5353,7 +5353,7 @@ dissect_h248_ValueV1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U /* not ascii or NULL character so do string as hex string */ proto_tree_add_text(tree, tvb, offset, len,"%s: 0x%s", (proto_registrar_get_nth(hf_index))->name, - tvb_bytes_to_str(tvb, 0, len)); + tvb_bytes_to_ep_str(tvb, 0, len)); return len; }; }; diff --git a/epan/dissectors/packet-h248_annex_c.c b/epan/dissectors/packet-h248_annex_c.c index a4fc5ae646..aa619a2d91 100644 --- a/epan/dissectors/packet-h248_annex_c.c +++ b/epan/dissectors/packet-h248_annex_c.c @@ -768,7 +768,7 @@ static void dissect_h248_annexc_BIR(proto_tree* tree, dissect_ber_octet_string(implicit_p ? *((gboolean*)implicit_p) : FALSE, &asn1_ctx, tree, tvb, 0, hfid, &new_tvb); if ( new_tvb && h248_info->term && ! h248_info->term->bir ) { - h248_info->term->bir = wmem_strdup(wmem_file_scope(), tvb_bytes_to_str(new_tvb,0,tvb_length(new_tvb))); + h248_info->term->bir = wmem_strdup(wmem_file_scope(), tvb_bytes_to_ep_str(new_tvb,0,tvb_length(new_tvb))); } } @@ -786,7 +786,7 @@ static void dissect_h248_annexc_NSAP(proto_tree* tree, if (new_tvb) { dissect_nsap(new_tvb, 0,tvb_length(new_tvb), tree); if ( h248_info->term && ! h248_info->term->nsap) { - h248_info->term->nsap = wmem_strdup(wmem_file_scope(), tvb_bytes_to_str(new_tvb,0,tvb_length(new_tvb))); + h248_info->term->nsap = wmem_strdup(wmem_file_scope(), tvb_bytes_to_ep_str(new_tvb,0,tvb_length(new_tvb))); } } } diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 37192761a0..3b2ce7c9a4 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -8673,7 +8673,7 @@ dissect_vendor_ie_aruba(proto_item *item, proto_tree *ietree, default: proto_tree_add_item(ietree, hf_ieee80211_vs_aruba_data, tvb, offset, tag_len, ENC_NA); - proto_item_append_text(item, " (Data: %s)", tvb_bytes_to_str(tvb, offset, tag_len)); + proto_item_append_text(item, " (Data: %s)", tvb_bytes_to_ep_str(tvb, offset, tag_len)); break; } } diff --git a/epan/dissectors/packet-ieee802a.c b/epan/dissectors/packet-ieee802a.c index afc796152d..025a14b176 100644 --- a/epan/dissectors/packet-ieee802a.c +++ b/epan/dissectors/packet-ieee802a.c @@ -108,12 +108,12 @@ dissect_ieee802a(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pid = tvb_get_ntohs(tvb, 3); col_add_fstr(pinfo->cinfo, COL_INFO, "OUI %s (%s), PID 0x%04X", - bytes_to_str_punct(oui, 3, ':'), + bytes_to_ep_str_punct(oui, 3, ':'), manuf ? manuf : "Unknown", pid); proto_tree_add_uint_format_value(ieee802a_tree, hf_ieee802a_oui, tvb, 0, 3, oui32, "%s (%s)", - bytes_to_str_punct(oui, 3, ':'), manuf ? manuf : "Unknown"); + bytes_to_ep_str_punct(oui, 3, ':'), manuf ? manuf : "Unknown"); /* * Do we have information for this OUI? diff --git a/epan/dissectors/packet-igap.c b/epan/dissectors/packet-igap.c index 6084b194ae..40ece5f290 100644 --- a/epan/dissectors/packet-igap.c +++ b/epan/dissectors/packet-igap.c @@ -217,13 +217,13 @@ dissect_igap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int off /* Challenge field is the results of MD5 calculation */ proto_tree_add_text(tree, tvb, offset, msize, "Result of MD5 calculation: 0x%s", - bytes_to_str(message, msize)); + bytes_to_ep_str(message, msize)); break; case IGAP_SUBTYPE_CHALLENGE: /* Challenge field is the challenge value */ proto_tree_add_text(tree, tvb, offset, msize, "Challenge: 0x%s", - bytes_to_str(message, msize)); + bytes_to_ep_str(message, msize)); break; case IGAP_SUBTYPE_AUTH_MESSAGE: /* Challenge field indicates the result of the authenticaion */ diff --git a/epan/dissectors/packet-ipp.c b/epan/dissectors/packet-ipp.c index 575b8766cf..d57502063b 100644 --- a/epan/dissectors/packet-ipp.c +++ b/epan/dissectors/packet-ipp.c @@ -625,7 +625,7 @@ add_octetstring_tree(proto_tree *tree, tvbuff_t *tvb, int offset, 1 + 2 + name_length + 2 + value_length, "%s: %s", tvb_format_text(tvb, offset + 1 + 2, name_length), - tvb_bytes_to_str(tvb, offset + 1 + 2 + name_length + 2, value_length)); + tvb_bytes_to_ep_str(tvb, offset + 1 + 2 + name_length + 2, value_length)); return proto_item_add_subtree(ti, ett_ipp_attr); } @@ -636,7 +636,7 @@ add_octetstring_value(const gchar *tag_desc, proto_tree *tree, tvbuff_t *tvb, offset = add_value_head(tag_desc, tree, tvb, offset, name_length, value_length, NULL); proto_tree_add_text(tree, tvb, offset, value_length, - "Value: %s", tvb_bytes_to_str(tvb, offset, value_length)); + "Value: %s", tvb_bytes_to_ep_str(tvb, offset, value_length)); } static proto_tree * diff --git a/epan/dissectors/packet-ipx.c b/epan/dissectors/packet-ipx.c index 89a30c77b0..f13aa764dd 100644 --- a/epan/dissectors/packet-ipx.c +++ b/epan/dissectors/packet-ipx.c @@ -930,10 +930,10 @@ dissect_serialization(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } col_add_fstr(pinfo->cinfo, COL_INFO, "Serial number %s", - tvb_bytes_to_str(tvb, 0, 6)); + tvb_bytes_to_ep_str(tvb, 0, 6)); proto_tree_add_text(ser_tree, tvb, 0, 6, - "Serial number: %s", tvb_bytes_to_str(tvb, 0, 6)); + "Serial number: %s", tvb_bytes_to_ep_str(tvb, 0, 6)); } /* diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index 3a853b43c3..e3bda33933 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -2976,7 +2976,7 @@ dissect_sa(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakmp_v proto_tree_add_bytes_format_value(tree, hf_isakmp_sa_situation, tvb, offset, length, NULL, "%s (length is %u, should be >= 4)", - tvb_bytes_to_str(tvb, offset, length), length); + tvb_bytes_to_ep_str(tvb, offset, length), length); return; } sti = proto_tree_add_item(tree, hf_isakmp_sa_situation, tvb, offset, 4, ENC_NA); @@ -3720,7 +3720,7 @@ dissect_id(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakmp_v dissect_x509if_Name(FALSE, tvb, offset, &asn1_ctx, tree, hf_isakmp_id_data_cert); break; default: - proto_item_append_text(idit, "%s", tvb_bytes_to_str(tvb,offset,length)); + proto_item_append_text(idit, "%s", tvb_bytes_to_ep_str(tvb,offset,length)); break; } } @@ -4696,7 +4696,7 @@ dissect_enc(tvbuff_t *tvb, if (tvb_memeql(tvb, offset, md, icd_len) == 0) { proto_item_append_text(icd_item, "[correct]"); } else { - proto_item_append_text(icd_item, "[incorrect, should be %s]", bytes_to_str(md, icd_len)); + proto_item_append_text(icd_item, "[incorrect, should be %s]", bytes_to_ep_str(md, icd_len)); expert_add_info(pinfo, icd_item, &ei_isakmp_ikev2_integrity_checksum); } gcry_md_close(md_hd); diff --git a/epan/dissectors/packet-ismacryp.c b/epan/dissectors/packet-ismacryp.c index f5c3ab9b29..7c4954eaa3 100644 --- a/epan/dissectors/packet-ismacryp.c +++ b/epan/dissectors/packet-ismacryp.c @@ -570,7 +570,7 @@ static offset_struct* dissect_auheader( tvbuff_t *tvb, offset_struct *poffset, p ismacryp_item = proto_tree_add_item(ismacryp_header_tree, hf_ismacryp_iv, tvb, poffset->offset_bytes, iv_length, ENC_NA); proto_item_append_text(ismacryp_item, ": Length=%d bytes",iv_length); /* add IV info */ col_append_fstr( pinfo->cinfo, COL_INFO, - ", IV=0x%s", tvb_bytes_to_str_punct(tvb, poffset->offset_bytes, iv_length,' ')); + ", IV=0x%s", tvb_bytes_to_ep_str_punct(tvb, poffset->offset_bytes, iv_length,' ')); poffset->offset_bytes+=iv_length; /* add IV length to offset_bytes */ } @@ -581,7 +581,7 @@ static offset_struct* dissect_auheader( tvbuff_t *tvb, offset_struct *poffset, p tvb, poffset->offset_bytes, delta_iv_length, ENC_NA); proto_item_append_text(ismacryp_item, ": Length=%d bytes",delta_iv_length); /* add delta IV info */ col_append_fstr( pinfo->cinfo, COL_INFO, - ", Delta IV=0x%s", tvb_bytes_to_str_punct(tvb, poffset->offset_bytes, delta_iv_length,' ')); + ", Delta IV=0x%s", tvb_bytes_to_ep_str_punct(tvb, poffset->offset_bytes, delta_iv_length,' ')); poffset->offset_bytes+=iv_length; /* add IV length to offset_bytes */ } /* Key Indicator */ @@ -592,7 +592,7 @@ static offset_struct* dissect_auheader( tvbuff_t *tvb, offset_struct *poffset, p tvb, poffset->offset_bytes, key_indicator_length, ENC_NA); proto_item_append_text(ismacryp_item,": Length=%d bytes",key_indicator_length); /* add KI info */ col_append_fstr( pinfo->cinfo, COL_INFO, - ", KI=0x%s", tvb_bytes_to_str_punct(tvb, poffset->offset_bytes, key_indicator_length,' ')); + ", KI=0x%s", tvb_bytes_to_ep_str_punct(tvb, poffset->offset_bytes, key_indicator_length,' ')); poffset->offset_bytes+=key_indicator_length; /* add KI length to offset_bytes */ } /* AU size */ diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c index 0b84127e0a..3e5efd23b2 100644 --- a/epan/dissectors/packet-isup.c +++ b/epan/dissectors/packet-isup.c @@ -3800,7 +3800,7 @@ dissect_ansi_isup_cause_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree } proto_tree_add_text(parameter_tree, parameter_tvb, offset, length, "Diagnostic: %s", - tvb_bytes_to_str(parameter_tvb, offset, length)); + tvb_bytes_to_ep_str(parameter_tvb, offset, length)); return; case 2: /*ANSI*/ @@ -3823,7 +3823,7 @@ dissect_ansi_isup_cause_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree } proto_tree_add_text(parameter_tree, parameter_tvb, offset, length, "Diagnostic: %s", - tvb_bytes_to_str(parameter_tvb, offset, length)); + tvb_bytes_to_ep_str(parameter_tvb, offset, length)); return; default: proto_tree_add_item(parameter_tree, hf_ansi_isup_coding_standard, parameter_tvb, offset, 1, ENC_BIG_ENDIAN); @@ -4092,7 +4092,7 @@ dissect_nsap(tvbuff_t *parameter_tvb, gint offset, gint len, proto_tree *paramet switch (afi) { case 0x35: /* IANA ICP Binary fortmat*/ proto_tree_add_text(parameter_tree, parameter_tvb, offset, 3, - "IDP = %s", tvb_bytes_to_str(parameter_tvb, offset, 3)); + "IDP = %s", tvb_bytes_to_ep_str(parameter_tvb, offset, 3)); proto_tree_add_uint(parameter_tree, hf_afi, parameter_tvb, offset, 1, afi); offset = offset + 1; @@ -4100,7 +4100,7 @@ dissect_nsap(tvbuff_t *parameter_tvb, gint offset, gint len, proto_tree *paramet proto_tree_add_uint(parameter_tree, hf_iana_icp, parameter_tvb, offset, 1, icp); if (icp == 0) { /* IPv6 addr */ proto_tree_add_text(parameter_tree, parameter_tvb, offset + 2 , 17, - "DSP = %s", tvb_bytes_to_str(parameter_tvb, offset + 2, 17)); + "DSP = %s", tvb_bytes_to_ep_str(parameter_tvb, offset + 2, 17)); proto_tree_add_item(parameter_tree, hf_nsap_ipv6_addr, parameter_tvb, offset + 2, 16, ENC_NA); @@ -4108,7 +4108,7 @@ dissect_nsap(tvbuff_t *parameter_tvb, gint offset, gint len, proto_tree *paramet else { /* IPv4 addr */ /* XXX - this is really only for ICP 1 */ proto_tree_add_text(parameter_tree, parameter_tvb, offset + 2, 17, - "DSP = %s", tvb_bytes_to_str(parameter_tvb, offset + 2, 17)); + "DSP = %s", tvb_bytes_to_ep_str(parameter_tvb, offset + 2, 17)); proto_tree_add_item(parameter_tree, hf_nsap_ipv4_addr, parameter_tvb, offset + 2, 4, ENC_BIG_ENDIAN); } @@ -4116,12 +4116,12 @@ dissect_nsap(tvbuff_t *parameter_tvb, gint offset, gint len, proto_tree *paramet case 0x45: /* E.164 ATM format */ case 0xC3: /* E.164 ATM group format */ proto_tree_add_text(parameter_tree, parameter_tvb, offset, 9, - "IDP = %s", tvb_bytes_to_str(parameter_tvb, offset, 9)); + "IDP = %s", tvb_bytes_to_ep_str(parameter_tvb, offset, 9)); proto_tree_add_uint(parameter_tree, hf_afi, parameter_tvb, offset, 1, afi); proto_tree_add_text(parameter_tree, parameter_tvb, offset + 1, 8, - "IDI = %s", tvb_bytes_to_str(parameter_tvb, offset + 1, 8)); + "IDI = %s", tvb_bytes_to_ep_str(parameter_tvb, offset + 1, 8)); offset = offset +1; /* Dissect country code */ cc_offset = offset; @@ -4847,7 +4847,7 @@ dissect_bat_ase_Encapsulated_Application_Information(tvbuff_t *parameter_tvb, pa */ proto_tree_add_text(bat_ase_element_tree, parameter_tvb, offset, tempdata , "Network ID: %s", - tvb_bytes_to_str(parameter_tvb, offset, tempdata)); + tvb_bytes_to_ep_str(parameter_tvb, offset, tempdata)); offset = offset + tempdata; } /* end if */ diff --git a/epan/dissectors/packet-j1939.c b/epan/dissectors/packet-j1939.c index 1be20abfd6..e6c2a497b6 100644 --- a/epan/dissectors/packet-j1939.c +++ b/epan/dissectors/packet-j1939.c @@ -244,7 +244,7 @@ static int dissect_j1939(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo col_add_fstr(pinfo->cinfo, COL_INFO, "PGN: %d", pgn); /* For now just include raw bytes */ - col_append_fstr(pinfo->cinfo, COL_INFO, " %s", tvb_bytes_to_str_punct(tvb, 0, data_length, ' ')); + col_append_fstr(pinfo->cinfo, COL_INFO, " %s", tvb_bytes_to_ep_str_punct(tvb, 0, data_length, ' ')); ti = proto_tree_add_text(j1939_tree, tvb, 0, -1, "Message"); msg_tree = proto_item_add_subtree(ti, ett_j1939_message); diff --git a/epan/dissectors/packet-lldp.c b/epan/dissectors/packet-lldp.c index 0f01d791f4..9647e8263f 100644 --- a/epan/dissectors/packet-lldp.c +++ b/epan/dissectors/packet-lldp.c @@ -766,7 +766,7 @@ dissect_lldp_chassis_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui } break; default: - strPtr = tvb_bytes_to_str(tvb, (offset+4), (tempLen-2)); + strPtr = tvb_bytes_to_ep_str(tvb, (offset+4), (tempLen-2)); break; } break; @@ -794,7 +794,7 @@ dissect_lldp_chassis_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui break; } - strPtr = tvb_bytes_to_str(tvb, (offset+3), (tempLen-1)); + strPtr = tvb_bytes_to_ep_str(tvb, (offset+3), (tempLen-1)); break; } default: /* Reserved types */ @@ -939,7 +939,7 @@ dissect_lldp_port_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint3 } break; default: - strPtr = tvb_bytes_to_str(tvb, (offset+4), (tempLen-2)); + strPtr = tvb_bytes_to_ep_str(tvb, (offset+4), (tempLen-2)); break; } break; @@ -1392,7 +1392,7 @@ dissect_ieee_802_1_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, { if (tree) proto_tree_add_text(tree, tvb, tempOffset, tempByte, "Protocol Identity: %s", - tvb_bytes_to_str(tvb, tempOffset, tempByte)); + tvb_bytes_to_ep_str(tvb, tempOffset, tempByte)); } break; diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c index 68119e0b07..85c31afe59 100644 --- a/epan/dissectors/packet-mip6.c +++ b/epan/dissectors/packet-mip6.c @@ -1999,7 +1999,7 @@ dissect_fmip6_opt_lla(const mip6_opt *optp _U_, tvbuff_t *tvb, int offset, len -= 1; proto_tree_add_text(field_tree, tvb, p, len, "Link-layer address: %s", - tvb_bytes_to_str_punct(tvb, p, len, ':')); + tvb_bytes_to_ep_str_punct(tvb, p, len, ':')); } } } diff --git a/epan/dissectors/packet-mpls-echo.c b/epan/dissectors/packet-mpls-echo.c index 3865612f91..26035cee81 100644 --- a/epan/dissectors/packet-mpls-echo.c +++ b/epan/dissectors/packet-mpls-echo.c @@ -803,7 +803,7 @@ dissect_mpls_echo_tlv_fec(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_p2mp_ip_tunnel_id, tvb, offset + 22, 2, FALSE); proto_tree_add_text(tlv_fec_tree, tvb, offset + 24, 16, "Extended Tunnel ID: 0x%s (%s)", - tvb_bytes_to_str(tvb, offset + 24, 16), + tvb_bytes_to_ep_str(tvb, offset + 24, 16), tvb_ip6_to_str(tvb, offset + 24)); hidden_item = proto_tree_add_item(tlv_fec_tree, hf_mpls_echo_tlv_fec_rsvp_p2mp_ipv6_ext_tunnel_id, tvb, offset + 24, 16, FALSE); diff --git a/epan/dissectors/packet-ncp2222.inc b/epan/dissectors/packet-ncp2222.inc index 483eec5044..ee5ae7986e 100644 --- a/epan/dissectors/packet-ncp2222.inc +++ b/epan/dissectors/packet-ncp2222.inc @@ -2784,7 +2784,7 @@ build_expert_data(proto_tree *ncp_tree, const char *hf_name, char *buffer, } case 21: case 22: /* Bytes */ - g_snprintf(buffer, (gulong) buffer_size, "%s", bytes_to_str(get_finfo_value_string(PTREE_FINFO(tree_pointer)), get_finfo_length(PTREE_FINFO(tree_pointer)))); + g_snprintf(buffer, (gulong) buffer_size, "%s", bytes_to_ep_str(get_finfo_value_string(PTREE_FINFO(tree_pointer)), get_finfo_length(PTREE_FINFO(tree_pointer)))); break; default: /* Dont currently handle. Only need string, integers, and bytes */ g_snprintf(buffer, (gulong) buffer_size, "Unsupported Expert Type"); @@ -7725,7 +7725,7 @@ dissect_ncp_request(tvbuff_t *tvb, packet_info *pinfo, if (info_type != 0) { /* Is this a string or not? */ if (info_type == 1) { /* Is this bytes? */ - byte_string = bytes_to_str(get_finfo_value_string(finfo), get_finfo_length(finfo)); + byte_string = bytes_to_ep_str(get_finfo_value_string(finfo), get_finfo_length(finfo)); col_append_fstr(pinfo->cinfo, COL_INFO, (const gchar*) ncp_rec->req_info_str->first_string, byte_string); @@ -7762,7 +7762,7 @@ dissect_ncp_request(tvbuff_t *tvb, packet_info *pinfo, if (info_type != 0) { /* Is this a string or not? */ if (info_type == 1) { /* Is this bytes? */ - byte_string = bytes_to_str(get_finfo_value_string(finfo), get_finfo_length(finfo)); + byte_string = bytes_to_ep_str(get_finfo_value_string(finfo), get_finfo_length(finfo)); col_append_fstr(pinfo->cinfo, COL_INFO, (const gchar*) ncp_rec->req_info_str->repeat_string, byte_string); diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index bb62df7cd8..6ea7a27341 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -5106,14 +5106,14 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, tvb, offset, length, NULL, "Type %u: Value (hex bytes): %s", masked_type, - tvb_bytes_to_str_punct(tvb, offset, length, ' ')); + tvb_bytes_to_ep_str_punct(tvb, offset, length, ' ')); } else { /* v10 PEN */ ti = proto_tree_add_bytes_format_value(pdutree, hf_ipfix_enterprise_private_entry, tvb, offset, length, NULL, "(%s) Type %u: Value (hex bytes): %s", pen_str ? pen_str : "(null)", masked_type, - tvb_bytes_to_str_punct(tvb, offset, length, ' ')); + tvb_bytes_to_ep_str_punct(tvb, offset, length, ' ')); } break; diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c index 4f42ca27d8..eed43105f4 100644 --- a/epan/dissectors/packet-nfs.c +++ b/epan/dissectors/packet-nfs.c @@ -1589,7 +1589,7 @@ dissect_fhandle_data_LINUX_NFSD_LE(tvbuff_t* tvb, packet_info *pinfo _U_, proto_ hash_item = proto_tree_add_text(tree, tvb, offset+4, hashlen + 1, "hash path: %s", - tvb_bytes_to_str(tvb, offset+5, hashlen)); + tvb_bytes_to_ep_str(tvb, offset+5, hashlen)); hash_tree = proto_item_add_subtree(hash_item, ett_nfs_fh_hp); proto_tree_add_uint(hash_tree, @@ -1598,7 +1598,7 @@ dissect_fhandle_data_LINUX_NFSD_LE(tvbuff_t* tvb, packet_info *pinfo _U_, proto_ proto_tree_add_text(hash_tree, tvb, offset+5, hashlen, "key: %s", - tvb_bytes_to_str(tvb, offset+5, hashlen)); + tvb_bytes_to_ep_str(tvb, offset+5, hashlen)); } } } diff --git a/epan/dissectors/packet-nhrp.c b/epan/dissectors/packet-nhrp.c index 2d63946be1..ae7a6c1bdb 100644 --- a/epan/dissectors/packet-nhrp.c +++ b/epan/dissectors/packet-nhrp.c @@ -369,7 +369,7 @@ static void dissect_nhrp_hdr(tvbuff_t *tvb, */ proto_tree_add_text(nhrp_tree, tvb, offset, 5, "Protocol Type (long form): %s", - tvb_bytes_to_str(tvb, offset, 5)); + tvb_bytes_to_ep_str(tvb, offset, 5)); offset += 5; } @@ -538,14 +538,14 @@ static void dissect_cie_list(tvbuff_t *tvb, else { proto_tree_add_text(cie_tree, tvb, offset, cli_addr_len, "Client NBMA Address: %s", - tvb_bytes_to_str(tvb, offset, cli_addr_len)); + tvb_bytes_to_ep_str(tvb, offset, cli_addr_len)); } break; default: proto_tree_add_text(cie_tree, tvb, offset, cli_addr_len, "Client NBMA Address: %s", - tvb_bytes_to_str(tvb, offset, cli_addr_len)); + tvb_bytes_to_ep_str(tvb, offset, cli_addr_len)); break; } offset += cli_addr_len; @@ -554,7 +554,7 @@ static void dissect_cie_list(tvbuff_t *tvb, if (cli_saddr_len) { proto_tree_add_text(cie_tree, tvb, offset, cli_saddr_len, "Client NBMA Sub Address: %s", - tvb_bytes_to_str(tvb, offset, cli_saddr_len)); + tvb_bytes_to_ep_str(tvb, offset, cli_saddr_len)); } if (cli_prot_len) { @@ -563,7 +563,7 @@ static void dissect_cie_list(tvbuff_t *tvb, else { proto_tree_add_text(cie_tree, tvb, offset, cli_prot_len, "Client Protocol Address: %s", - tvb_bytes_to_str(tvb, offset, cli_prot_len)); + tvb_bytes_to_ep_str(tvb, offset, cli_prot_len)); } offset += cli_prot_len; } @@ -684,14 +684,14 @@ static void dissect_nhrp_mand(tvbuff_t *tvb, else { proto_tree_add_text(nhrp_tree, tvb, offset, shl, "Source NBMA Address: %s", - tvb_bytes_to_str(tvb, offset, shl)); + tvb_bytes_to_ep_str(tvb, offset, shl)); } break; default: proto_tree_add_text(nhrp_tree, tvb, offset, shl, "Source NBMA Address: %s", - tvb_bytes_to_str(tvb, offset, shl)); + tvb_bytes_to_ep_str(tvb, offset, shl)); break; } offset += shl; @@ -701,7 +701,7 @@ static void dissect_nhrp_mand(tvbuff_t *tvb, if (ssl) { proto_tree_add_text(nhrp_tree, tvb, offset, ssl, "Source NBMA Sub Address: %s", - tvb_bytes_to_str(tvb, offset, ssl)); + tvb_bytes_to_ep_str(tvb, offset, ssl)); offset += ssl; } @@ -712,7 +712,7 @@ static void dissect_nhrp_mand(tvbuff_t *tvb, else if (*srcLen) { proto_tree_add_text(nhrp_tree, tvb, offset, *srcLen, "Source Protocol Address: %s", - tvb_bytes_to_str(tvb, offset, *srcLen)); + tvb_bytes_to_ep_str(tvb, offset, *srcLen)); offset += *srcLen; } @@ -723,7 +723,7 @@ static void dissect_nhrp_mand(tvbuff_t *tvb, else if (dstLen) { proto_tree_add_text(nhrp_tree, tvb, offset, dstLen, "Destination Protocol Address: %s", - tvb_bytes_to_str(tvb, offset, dstLen)); + tvb_bytes_to_ep_str(tvb, offset, dstLen)); offset += dstLen; } @@ -903,7 +903,7 @@ static void dissect_nhrp_ext(tvbuff_t *tvb, if (len < (4 + srcLen)) { ti = proto_tree_add_text(nhrp_tree, tvb, offset, len, "Malformed Extension: %s", - tvb_bytes_to_str(tvb, offset, len)); + tvb_bytes_to_ep_str(tvb, offset, len)); expert_add_info_format(pinfo, ti, &ei_nhrp_ext_malformed, "Incomplete Authentication Extension"); } else { @@ -912,7 +912,7 @@ static void dissect_nhrp_ext(tvbuff_t *tvb, auth_item = proto_tree_add_text(nhrp_tree, tvb, offset, len, "Extension Data: SPI=%u: Data=%s", tvb_get_ntohs(tvb, offset + 2), - tvb_bytes_to_str(tvb, offset + 4, len - 4)); + tvb_bytes_to_ep_str(tvb, offset + 4, len - 4)); auth_tree = proto_item_add_subtree(auth_item, ett_nhrp_auth_ext); proto_tree_add_item(auth_tree, hf_nhrp_auth_ext_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(auth_tree, hf_nhrp_auth_ext_spi, tvb, offset + 2, 2, ENC_BIG_ENDIAN); @@ -921,11 +921,11 @@ static void dissect_nhrp_ext(tvbuff_t *tvb, else if (srcLen) { proto_tree_add_text(auth_tree, tvb, offset + 4, srcLen, "Source Address: %s", - tvb_bytes_to_str(tvb, offset + 4, srcLen)); + tvb_bytes_to_ep_str(tvb, offset + 4, srcLen)); } if (len > (4 + srcLen)) { proto_tree_add_text(auth_tree, tvb, offset + 4 + srcLen, len - (4 + srcLen), - "Data: %s", tvb_bytes_to_str(tvb, offset + 4 + srcLen, len - (4 + srcLen))); + "Data: %s", tvb_bytes_to_ep_str(tvb, offset + 4 + srcLen, len - (4 + srcLen))); } } break; @@ -934,7 +934,7 @@ static void dissect_nhrp_ext(tvbuff_t *tvb, if (len < 3) { ti = proto_tree_add_text(nhrp_tree, tvb, offset, len, "Malformed Extension: %s", - tvb_bytes_to_str(tvb, offset, len)); + tvb_bytes_to_ep_str(tvb, offset, len)); expert_add_info_format(pinfo, ti, &ei_nhrp_ext_malformed, "Incomplete Vendor-Private Extension"); } else { @@ -945,13 +945,13 @@ static void dissect_nhrp_ext(tvbuff_t *tvb, tvb_memcpy(tvb, manuf, offset, 3); vendor_item = proto_tree_add_text(nhrp_tree, tvb, offset, len, "Extension Data: Vendor ID=%s, Data=%s", get_manuf_name(manuf), - tvb_bytes_to_str(tvb, offset + 3, len - 3)); + tvb_bytes_to_ep_str(tvb, offset + 3, len - 3)); vendor_tree = proto_item_add_subtree(vendor_item, ett_nhrp_vendor_ext); proto_tree_add_bytes_format_value(vendor_tree, hf_nhrp_vendor_ext_id, tvb, offset, 3, manuf, "%s", get_manuf_name(manuf)); if (len > 3) { proto_tree_add_text(vendor_tree, tvb, offset + 3, len - 3, - "Data: %s", tvb_bytes_to_str(tvb, offset + 3, len - 3)); + "Data: %s", tvb_bytes_to_ep_str(tvb, offset + 3, len - 3)); } } break; diff --git a/epan/dissectors/packet-noe.c b/epan/dissectors/packet-noe.c index d98d2f6683..3469628a78 100644 --- a/epan/dissectors/packet-noe.c +++ b/epan/dissectors/packet-noe.c @@ -1134,7 +1134,7 @@ static void decode_evt(proto_tree *tree, length, "Key Name: %s (UTF-8 Value: %s, Unicode Value: 0x%" G_GINT64_MODIFIER "x)", key_name, - tvb_bytes_to_str(tvb, offset, length), + tvb_bytes_to_ep_str(tvb, offset, length), unicode_value); break; } diff --git a/epan/dissectors/packet-opensafety.c b/epan/dissectors/packet-opensafety.c index e6d0f4137f..f84a71b90a 100644 --- a/epan/dissectors/packet-opensafety.c +++ b/epan/dissectors/packet-opensafety.c @@ -1562,7 +1562,7 @@ dissect_opensafety_snmt_message(tvbuff_t *message_tvb, packet_info *pinfo, proto if ( global_scm_udid_autoset == TRUE ) { tempString = (char *)wmem_alloc0(wmem_packet_scope(), 128 * sizeof(char)); - g_snprintf ( tempString, 18, "%s", tvb_bytes_to_str_punct(message_tvb, OSS_FRAME_POS_DATA + frameStart1 + 1, 6, ':' ) ); + g_snprintf ( tempString, 18, "%s", tvb_bytes_to_ep_str_punct(message_tvb, OSS_FRAME_POS_DATA + frameStart1 + 1, 6, ':' ) ); if ( memcmp ( global_scm_udid, tempString, 17 ) != 0 ) { local_scm_udid = (char *)wmem_alloc0(wmem_file_scope(), 18 * sizeof(char)); @@ -1604,7 +1604,7 @@ dissect_opensafety_snmt_message(tvbuff_t *message_tvb, packet_info *pinfo, proto if ( global_scm_udid_autoset == TRUE ) { tempString = (char *)wmem_alloc0(wmem_packet_scope(), 18 * sizeof(char)); - g_snprintf ( tempString, 18, "%s", tvb_bytes_to_str_punct(message_tvb, OSS_FRAME_POS_DATA + frameStart1 + 1, 6, ':' ) ); + g_snprintf ( tempString, 18, "%s", tvb_bytes_to_ep_str_punct(message_tvb, OSS_FRAME_POS_DATA + frameStart1 + 1, 6, ':' ) ); if ( memcmp ( global_scm_udid, tempString, 17 ) != 0 ) { local_scm_udid = (char *)wmem_alloc0(wmem_file_scope(), 18 * sizeof(char)); diff --git a/epan/dissectors/packet-ospf.c b/epan/dissectors/packet-ospf.c index c232e63b8c..c53b68ac94 100644 --- a/epan/dissectors/packet-ospf.c +++ b/epan/dissectors/packet-ospf.c @@ -1272,7 +1272,7 @@ dissect_ospf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tvb_bytes_exist(tvb, ospflen, crypto_len)) { proto_tree_add_text(ospf_header_tree, tvb, ospflen, crypto_len, "Auth Data: %s", - tvb_bytes_to_str(tvb, ospflen, crypto_len)); + tvb_bytes_to_ep_str(tvb, ospflen, crypto_len)); proto_tree_set_appendix(ospf_header_tree, tvb, ospflen, crypto_len); } break; @@ -1391,7 +1391,7 @@ dissect_ospfv2_lls_tlv(tvbuff_t *tvb, int offset, proto_tree *tree) tvb_get_ntohl(tvb, offset + 4)); proto_tree_add_text(ospf_lls_tlv_tree, tvb, offset + 8, length - 4, "Auth Data: %s", - tvb_bytes_to_str(tvb, offset + 8, length - 4)); + tvb_bytes_to_ep_str(tvb, offset + 8, length - 4)); break; } @@ -2334,7 +2334,7 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, int offset, proto_tree *tree, case OIF_TNA_NSAP_ADDRESS: ti = proto_tree_add_text(tlv_tree, tvb, stlv_offset, stlv_len+4, "%s (NSAP): %s", stlv_name, - tvb_bytes_to_str (tvb, stlv_offset + 8, stlv_len - 4)); + tvb_bytes_to_ep_str (tvb, stlv_offset + 8, stlv_len - 4)); stlv_tree = proto_item_add_subtree(ti, ett_ospf_lsa_oif_tna_stlv); proto_tree_add_text(stlv_tree, tvb, stlv_offset, 2, "TLV Type: %u: %s (NSAP)", stlv_type, stlv_name); @@ -2342,7 +2342,7 @@ dissect_ospf_lsa_mpls(tvbuff_t *tvb, int offset, proto_tree *tree, proto_tree_add_text(stlv_tree, tvb, stlv_offset+4, 1, "Addr Length: %u", tvb_get_guint8 (tvb, stlv_offset+4)); proto_tree_add_text(stlv_tree, tvb, stlv_offset+8, stlv_len - 4, "TNA Addr: %s", - tvb_bytes_to_str(tvb, stlv_offset+8, stlv_len - 4)); + tvb_bytes_to_ep_str(tvb, stlv_offset+8, stlv_len - 4)); break; default: diff --git a/epan/dissectors/packet-pgm.c b/epan/dissectors/packet-pgm.c index bd6ecb9682..f0e0936c7e 100644 --- a/epan/dissectors/packet-pgm.c +++ b/epan/dissectors/packet-pgm.c @@ -841,7 +841,7 @@ dissect_pgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pgmhdr_opts = tvb_get_guint8(tvb, 5); pgmhdr_cksum = tvb_get_ntohs(tvb, 6); - gsi = tvb_bytes_to_str(tvb, 8, 6); + gsi = tvb_bytes_to_ep_str(tvb, 8, 6); pgmhdr_tsdulen = tvb_get_ntohs(tvb, 14); sqn = tvb_get_ntohl(tvb, 16); diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index dfd04841dc..76d23fe187 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.c @@ -3919,7 +3919,7 @@ dissect_cp(tvbuff_t *tvb, int proto_id, int proto_subtree_index, proto_tree_add_bytes_format(fh_tree, hf_ppp_data, tvb, offset, length, NULL, "Rejected Packet (%d byte%s): %s", length, plurality(length, "", "s"), - tvb_bytes_to_str(tvb, offset, length)); + tvb_bytes_to_ep_str(tvb, offset, length)); } break; @@ -5427,7 +5427,7 @@ dissect_chap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb_format_text(tvb, name_offset, (name_size > 20) ? 20 : name_size), (name_size > 20) ? "..." : "", - tvb_bytes_to_str(tvb, value_offset, value_size)); + tvb_bytes_to_ep_str(tvb, value_offset, value_size)); } } break; diff --git a/epan/dissectors/packet-ptpip.c b/epan/dissectors/packet-ptpip.c index 9548d62b30..51afc0d157 100644 --- a/epan/dissectors/packet-ptpip.c +++ b/epan/dissectors/packet-ptpip.c @@ -901,7 +901,7 @@ void dissect_ptpIP_guid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui { guint8 *guid; - guid = tvb_bytes_to_str(tvb, *offset, PTPIP_GUID_SIZE); + guid = tvb_bytes_to_ep_str(tvb, *offset, PTPIP_GUID_SIZE); proto_tree_add_item(tree, hf_ptpIP_guid, tvb, *offset, PTPIP_GUID_SIZE, ENC_NA); *offset += PTPIP_GUID_SIZE; col_append_fstr( diff --git a/epan/dissectors/packet-pvfs2.c b/epan/dissectors/packet-pvfs2.c index 2b3628c8fa..5979510054 100644 --- a/epan/dissectors/packet-pvfs2.c +++ b/epan/dissectors/packet-pvfs2.c @@ -1013,7 +1013,7 @@ dissect_fhandle_data_unknown(tvbuff_t *tvb, int offset, proto_tree *tree) "%s%s", first_line ? "data: " : " ", - tvb_bytes_to_str(tvb,offset,sublen)); + tvb_bytes_to_ep_str(tvb,offset,sublen)); bytes_left -= sublen; offset += sublen; first_line = FALSE; diff --git a/epan/dissectors/packet-q2931.c b/epan/dissectors/packet-q2931.c index ec19b58735..70acb0ff92 100644 --- a/epan/dissectors/packet-q2931.c +++ b/epan/dissectors/packet-q2931.c @@ -378,7 +378,7 @@ dissect_q2931_aal_parameters_ie(tvbuff_t *tvb, int offset, int len, len = 4; proto_tree_add_text(tree, tvb, offset, len, "User defined AAL information: %s", - tvb_bytes_to_str(tvb, offset, len)); + tvb_bytes_to_ep_str(tvb, offset, len)); return; } @@ -1207,7 +1207,7 @@ dissect_q2931_cause_ie(tvbuff_t *tvb, int offset, int len, case Q2931_REJ_USER_SPECIFIC: proto_tree_add_text(tree, tvb, offset, len, "User specific diagnostic: %s", - tvb_bytes_to_str(tvb, offset, len)); + tvb_bytes_to_ep_str(tvb, offset, len)); break; case Q2931_REJ_IE_MISSING: @@ -1227,7 +1227,7 @@ dissect_q2931_cause_ie(tvbuff_t *tvb, int offset, int len, default: proto_tree_add_text(tree, tvb, offset, len, "Diagnostic: %s", - tvb_bytes_to_str(tvb, offset, len)); + tvb_bytes_to_ep_str(tvb, offset, len)); break; } break; @@ -1303,7 +1303,7 @@ dissect_q2931_cause_ie(tvbuff_t *tvb, int offset, int len, default: proto_tree_add_text(tree, tvb, offset, len, "Diagnostics: %s", - tvb_bytes_to_str(tvb, offset, len)); + tvb_bytes_to_ep_str(tvb, offset, len)); } } @@ -1439,7 +1439,7 @@ dissect_q2931_number_ie(tvbuff_t *tvb, int offset, int len, if (len < 20) { proto_tree_add_text(tree, tvb, offset, len, "Number (too short): %s", - tvb_bytes_to_str(tvb, offset, len)); + tvb_bytes_to_ep_str(tvb, offset, len)); return; } ti = proto_tree_add_text(tree, tvb, offset, len, "Number"); @@ -1449,7 +1449,7 @@ dissect_q2931_number_ie(tvbuff_t *tvb, int offset, int len, default: proto_tree_add_text(tree, tvb, offset, len, "Number: %s", - tvb_bytes_to_str(tvb, offset, len)); + tvb_bytes_to_ep_str(tvb, offset, len)); break; } } @@ -1493,7 +1493,7 @@ dissect_q2931_party_subaddr_ie(tvbuff_t *tvb, int offset, int len, if (len == 0) return; proto_tree_add_text(tree, tvb, offset, len, "Subaddress: %s", - tvb_bytes_to_str(tvb, offset, len)); + tvb_bytes_to_ep_str(tvb, offset, len)); } /* @@ -2009,7 +2009,7 @@ dissect_q2931_ie(tvbuff_t *tvb, int offset, int len, proto_tree *tree, * dump it as data and be done with it. */ proto_tree_add_text(ie_tree, tvb, offset + 4, len, - "Data: %s", tvb_bytes_to_str(tvb, offset + 4, len)); + "Data: %s", tvb_bytes_to_ep_str(tvb, offset + 4, len)); } } diff --git a/epan/dissectors/packet-q931.c b/epan/dissectors/packet-q931.c index b13f9863cc..61bf34c291 100644 --- a/epan/dissectors/packet-q931.c +++ b/epan/dissectors/packet-q931.c @@ -778,7 +778,7 @@ dissect_q931_bearer_capability_ie(tvbuff_t *tvb, int offset, int len, */ proto_tree_add_text(tree, tvb, offset, len, "Data: %s", - tvb_bytes_to_str(tvb, offset, len)); + tvb_bytes_to_ep_str(tvb, offset, len)); proto_tree_add_boolean(tree, hf_q931_extension_ind, tvb, offset, 1, octet); proto_tree_add_uint(tree, hf_q931_coding_standard, tvb, offset, 1, octet); return; @@ -1277,7 +1277,7 @@ dissect_q931_cause_ie_unsafe(tvbuff_t *tvb, int offset, int len, proto_tree_add_uint(tree, hf_q931_coding_standard, tvb, offset, 1, octet); proto_tree_add_text(tree, tvb, offset, len, "Data: %s", - tvb_bytes_to_str(tvb, offset, len)); + tvb_bytes_to_ep_str(tvb, offset, len)); return; } proto_tree_add_uint(tree, hf_q931_cause_location, tvb, offset, 1, octet); @@ -1354,7 +1354,7 @@ dissect_q931_cause_ie_unsafe(tvbuff_t *tvb, int offset, int len, case Q931_REJ_USER_SPECIFIC: proto_tree_add_text(tree, tvb, offset, len, "User specific diagnostic: %s", - tvb_bytes_to_str(tvb, offset, len)); + tvb_bytes_to_ep_str(tvb, offset, len)); break; case Q931_REJ_IE_MISSING: @@ -1374,7 +1374,7 @@ dissect_q931_cause_ie_unsafe(tvbuff_t *tvb, int offset, int len, default: proto_tree_add_text(tree, tvb, offset, len, "Diagnostic: %s", - tvb_bytes_to_str(tvb, offset, len)); + tvb_bytes_to_ep_str(tvb, offset, len)); break; } break; @@ -1412,7 +1412,7 @@ dissect_q931_cause_ie_unsafe(tvbuff_t *tvb, int offset, int len, default: proto_tree_add_text(tree, tvb, offset, len, "Diagnostics: %s", - tvb_bytes_to_str(tvb, offset, len)); + tvb_bytes_to_ep_str(tvb, offset, len)); } } @@ -1499,7 +1499,7 @@ dissect_q931_call_state_ie(tvbuff_t *tvb, int offset, int len, */ proto_tree_add_text(tree, tvb, offset, len, "Data: %s", - tvb_bytes_to_str(tvb, offset, len)); + tvb_bytes_to_ep_str(tvb, offset, len)); return; } proto_tree_add_text(tree, tvb, offset, 1, @@ -1601,7 +1601,7 @@ dissect_q931_channel_identification_ie(tvbuff_t *tvb, int offset, int len, */ proto_tree_add_text(tree, tvb, offset, len, "Data: %s", - tvb_bytes_to_str(tvb, offset, len)); + tvb_bytes_to_ep_str(tvb, offset, len)); return; } proto_tree_add_item(tree, hf_q931_channel_map, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -1669,7 +1669,7 @@ dissect_q931_progress_indicator_ie(tvbuff_t *tvb, int offset, int len, */ proto_tree_add_text(tree, tvb, offset, len, "Data: %s", - tvb_bytes_to_str(tvb, offset, len)); + tvb_bytes_to_ep_str(tvb, offset, len)); return; } proto_tree_add_text(tree, tvb, offset, 1, @@ -1759,7 +1759,7 @@ dissect_q931_ns_facilities_ie(tvbuff_t *tvb, int offset, int len, return; proto_tree_add_text(tree, tvb, offset, len, "Network-specific facility specification: %s", - tvb_bytes_to_str(tvb, offset, len)); + tvb_bytes_to_ep_str(tvb, offset, len)); } /* @@ -2297,7 +2297,7 @@ dissect_q931_party_subaddr_ie(tvbuff_t *tvb, int offset, int len, if (len == 0) return; proto_tree_add_text(tree, tvb, offset, len, "Subaddress: %s", - tvb_bytes_to_str(tvb, offset, len)); + tvb_bytes_to_ep_str(tvb, offset, len)); } /* @@ -2428,7 +2428,7 @@ dissect_q931_high_layer_compat_ie(tvbuff_t *tvb, int offset, int len, */ proto_tree_add_text(tree, tvb, offset, len, "Data: %s", - tvb_bytes_to_str(tvb, offset, len)); + tvb_bytes_to_ep_str(tvb, offset, len)); return; } if (len == 0) @@ -2517,7 +2517,7 @@ dissect_q931_user_user_ie(tvbuff_t *tvb, packet_info *pinfo, int offset, int len default: proto_tree_add_text(tree, tvb, offset, len, "User information: %s", - tvb_bytes_to_str(tvb, offset, len)); + tvb_bytes_to_ep_str(tvb, offset, len)); break; } } @@ -2905,7 +2905,7 @@ dissect_q931_IEs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *root_tree, proto_tree_add_text(ie_tree, tvb, offset + 4, info_element_len - 1, "User information: %s", - tvb_bytes_to_str(tvb, offset + 4, + tvb_bytes_to_ep_str(tvb, offset + 4, info_element_len - 1)); } } @@ -3212,7 +3212,7 @@ dissect_q931_IEs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *root_tree, proto_tree_add_text(ie_tree, tvb, offset + 2, info_element_len, "Data: %s", - tvb_bytes_to_str(tvb, offset + 2, + tvb_bytes_to_ep_str(tvb, offset + 2, info_element_len)); } break; diff --git a/epan/dissectors/packet-q932.c b/epan/dissectors/packet-q932.c index 96464ce4bb..ad2f772e03 100644 --- a/epan/dissectors/packet-q932.c +++ b/epan/dissectors/packet-q932.c @@ -746,7 +746,7 @@ dissect_q932_ni_ie(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree proto_tree_add_uint(tree, hf_q932_nd, tvb, offset - (length - remain), length - remain, value); if (remain > 0) { - proto_tree_add_text(tree, tvb, offset - remain, remain, "ASN.1 Encoded Data Structure(NOT IMPLEMENTED): %s", tvb_bytes_to_str(tvb, offset - remain, remain)); + proto_tree_add_text(tree, tvb, offset - remain, remain, "ASN.1 Encoded Data Structure(NOT IMPLEMENTED): %s", tvb_bytes_to_ep_str(tvb, offset - remain, remain)); } } diff --git a/epan/dissectors/packet-q933.c b/epan/dissectors/packet-q933.c index baf78ffb47..c52fbd65ef 100644 --- a/epan/dissectors/packet-q933.c +++ b/epan/dissectors/packet-q933.c @@ -488,7 +488,7 @@ dissect_q933_bearer_capability_ie(tvbuff_t *tvb, int offset, int len, */ proto_tree_add_text(tree, tvb, offset, len, "Data: %s", - tvb_bytes_to_str(tvb, offset, len)); + tvb_bytes_to_ep_str(tvb, offset, len)); proto_tree_add_uint(tree, hf_q933_coding_standard, tvb, offset, 1, octet); proto_tree_add_boolean(tree, hf_q933_extension_ind, tvb, offset, 1, octet); return; @@ -910,7 +910,7 @@ dissect_q933_cause_ie(tvbuff_t *tvb, int offset, int len, proto_tree_add_uint(tree, hf_q933_coding_standard, tvb, offset, 1, octet); proto_tree_add_text(tree, tvb, offset, len, "Data: %s", - tvb_bytes_to_str(tvb, offset, len)); + tvb_bytes_to_ep_str(tvb, offset, len)); return; } proto_tree_add_uint(tree, hf_q933_cause_location, tvb, offset, 1, octet); @@ -981,7 +981,7 @@ dissect_q933_cause_ie(tvbuff_t *tvb, int offset, int len, case Q933_REJ_USER_SPECIFIC: proto_tree_add_text(tree, tvb, offset, len, "User specific diagnostic: %s", - tvb_bytes_to_str(tvb, offset, len)); + tvb_bytes_to_ep_str(tvb, offset, len)); break; case Q933_REJ_IE_MISSING: @@ -1001,7 +1001,7 @@ dissect_q933_cause_ie(tvbuff_t *tvb, int offset, int len, default: proto_tree_add_text(tree, tvb, offset, len, "Diagnostic: %s", - tvb_bytes_to_str(tvb, offset, len)); + tvb_bytes_to_ep_str(tvb, offset, len)); break; } break; @@ -1039,7 +1039,7 @@ dissect_q933_cause_ie(tvbuff_t *tvb, int offset, int len, default: proto_tree_add_text(tree, tvb, offset, len, "Diagnostics: %s", - tvb_bytes_to_str(tvb, offset, len)); + tvb_bytes_to_ep_str(tvb, offset, len)); } } @@ -1088,7 +1088,7 @@ dissect_q933_call_state_ie(tvbuff_t *tvb, int offset, int len, */ proto_tree_add_text(tree, tvb, offset, len, "Data: %s", - tvb_bytes_to_str(tvb, offset, len)); + tvb_bytes_to_ep_str(tvb, offset, len)); return; } proto_tree_add_text(tree, tvb, offset, 1, @@ -1272,7 +1272,7 @@ dissect_q933_channel_identification_ie(tvbuff_t *tvb, int offset, int len, if (identifier_len != 0) { proto_tree_add_text(tree, tvb, identifier_offset, identifier_len, "Interface identifier: %s", - tvb_bytes_to_str(tvb, identifier_offset, identifier_len)); + tvb_bytes_to_ep_str(tvb, identifier_offset, identifier_len)); } } @@ -1290,7 +1290,7 @@ dissect_q933_channel_identification_ie(tvbuff_t *tvb, int offset, int len, */ proto_tree_add_text(tree, tvb, offset, len, "Data: %s", - tvb_bytes_to_str(tvb, offset, len)); + tvb_bytes_to_ep_str(tvb, offset, len)); return; } proto_tree_add_text(tree, tvb, offset, 1, @@ -1340,7 +1340,7 @@ dissect_q933_progress_indicator_ie(tvbuff_t *tvb, int offset, int len, */ proto_tree_add_text(tree, tvb, offset, len, "Data: %s", - tvb_bytes_to_str(tvb, offset, len)); + tvb_bytes_to_ep_str(tvb, offset, len)); return; } proto_tree_add_text(tree, tvb, offset, 1, @@ -1430,7 +1430,7 @@ dissect_q933_ns_facilities_ie(tvbuff_t *tvb, int offset, int len, return; proto_tree_add_text(tree, tvb, offset, len, "Network-specific facility specification: %s", - tvb_bytes_to_str(tvb, offset, len)); + tvb_bytes_to_ep_str(tvb, offset, len)); } static int @@ -1724,7 +1724,7 @@ dissect_q933_party_subaddr_ie(tvbuff_t *tvb, int offset, int len, if (len == 0) return; proto_tree_add_text(tree, tvb, offset, len, "Subaddress: %s", - tvb_bytes_to_str(tvb, offset, len)); + tvb_bytes_to_ep_str(tvb, offset, len)); } /* @@ -1781,7 +1781,7 @@ dissect_q933_high_layer_compat_ie(tvbuff_t *tvb, int offset, int len, */ proto_tree_add_text(tree, tvb, offset, len, "Data: %s", - tvb_bytes_to_str(tvb, offset, len)); + tvb_bytes_to_ep_str(tvb, offset, len)); return; } @@ -1861,7 +1861,7 @@ dissect_q933_user_user_ie(tvbuff_t *tvb, int offset, int len, default: proto_tree_add_text(tree, tvb, offset, len, "User information: %s", - tvb_bytes_to_str(tvb, offset, len)); + tvb_bytes_to_ep_str(tvb, offset, len)); break; } } @@ -2152,7 +2152,7 @@ dissect_q933(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_text(ie_tree, tvb, offset + 2, info_element_len, "Data: %s", - tvb_bytes_to_str(tvb, offset + 2, + tvb_bytes_to_ep_str(tvb, offset + 2, info_element_len)); break; } diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c index 229b146d82..c18c239ae7 100644 --- a/epan/dissectors/packet-radius.c +++ b/epan/dissectors/packet-radius.c @@ -341,7 +341,7 @@ static const gchar *dissect_chap_password(proto_tree* tree, tvbuff_t* tvb, packe chap_tree = proto_item_add_subtree(ti, ett_chap); proto_tree_add_item(chap_tree, hf_radius_chap_ident, tvb, 0, 1, ENC_NA); proto_tree_add_item(chap_tree, hf_radius_chap_string, tvb, 1, 16, ENC_NA); - return (tvb_bytes_to_str(tvb, 0, len)); + return (tvb_bytes_to_ep_str(tvb, 0, len)); } static const gchar *dissect_framed_ip_address(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo _U_) { @@ -705,7 +705,7 @@ void radius_string(radius_attr_info_t* a, proto_tree* tree, packet_info *pinfo _ void radius_octets(radius_attr_info_t* a, proto_tree* tree, packet_info *pinfo _U_, tvbuff_t* tvb, int offset, int len, proto_item* avp_item) { proto_tree_add_item(tree, a->hf, tvb, offset, len, ENC_NA); - proto_item_append_text(avp_item, "%s", tvb_bytes_to_str(tvb, offset, len)); + proto_item_append_text(avp_item, "%s", tvb_bytes_to_ep_str(tvb, offset, len)); } void radius_ipaddr(radius_attr_info_t* a, proto_tree* tree, packet_info *pinfo _U_, tvbuff_t* tvb, int offset, int len, proto_item* avp_item) { @@ -832,7 +832,7 @@ void radius_date(radius_attr_info_t* a, proto_tree* tree, packet_info *pinfo _U_ */ void radius_abinary(radius_attr_info_t* a, proto_tree* tree, packet_info *pinfo _U_, tvbuff_t* tvb, int offset, int len, proto_item* avp_item) { proto_tree_add_item(tree, a->hf, tvb, offset, len, ENC_NA); - proto_item_append_text(avp_item, "%s", tvb_bytes_to_str(tvb, offset, len)); + proto_item_append_text(avp_item, "%s", tvb_bytes_to_ep_str(tvb, offset, len)); } void radius_ether(radius_attr_info_t* a, proto_tree* tree, packet_info *pinfo _U_, tvbuff_t* tvb, int offset, int len, proto_item* avp_item) { @@ -847,7 +847,7 @@ void radius_ether(radius_attr_info_t* a, proto_tree* tree, packet_info *pinfo _U void radius_ifid(radius_attr_info_t* a, proto_tree* tree, packet_info *pinfo _U_, tvbuff_t* tvb, int offset, int len, proto_item* avp_item) { proto_tree_add_item(tree, a->hf, tvb, offset, len, ENC_NA); - proto_item_append_text(avp_item, "%s", tvb_bytes_to_str(tvb, offset, len)); + proto_item_append_text(avp_item, "%s", tvb_bytes_to_ep_str(tvb, offset, len)); } static void add_tlv_to_tree(proto_tree* tlv_tree, proto_item* tlv_item, packet_info* pinfo, tvbuff_t* tvb, radius_attr_info_t* dictionary_entry, guint32 tlv_length, guint32 offset) { diff --git a/epan/dissectors/packet-ranap.c b/epan/dissectors/packet-ranap.c index 4b030013df..664a387d5f 100644 --- a/epan/dissectors/packet-ranap.c +++ b/epan/dissectors/packet-ranap.c @@ -4781,7 +4781,7 @@ dissect_ranap_IMSI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, prot guint8* bytes = (guint8 *)tvb_memdup(wmem_packet_scope(),imsi_tvb,0,len); actx->pinfo->sccp_info->data.co.assoc->calling_party = - wmem_strdup_printf(wmem_file_scope(), "IMSI: %s", bytes_to_str(bytes, len) ); + wmem_strdup_printf(wmem_file_scope(), "IMSI: %s", bytes_to_ep_str(bytes, len) ); } digit_str = unpack_digits(imsi_tvb, 0); proto_tree_add_string(tree, hf_ranap_imsi_digits, imsi_tvb, 0, -1, digit_str); diff --git a/epan/dissectors/packet-rip.c b/epan/dissectors/packet-rip.c index babc3aa88c..7aaf7751b1 100644 --- a/epan/dissectors/packet-rip.c +++ b/epan/dissectors/packet-rip.c @@ -323,7 +323,7 @@ dissect_rip_authentication(tvbuff_t *tvb, int offset, proto_tree *tree) rip_authentication_tree = proto_item_add_subtree(ti, ett_auth_vec ); proto_tree_add_text( rip_authentication_tree, tvb, offset-4+digest_off+4, MD5_AUTH_DATA_LEN, "Authentication Data: %s", - tvb_bytes_to_str_punct(tvb, offset-4+digest_off+4, + tvb_bytes_to_ep_str_punct(tvb, offset-4+digest_off+4, MD5_AUTH_DATA_LEN, ' ')); break; } diff --git a/epan/dissectors/packet-rmt-lct.c b/epan/dissectors/packet-rmt-lct.c index 98bd48096a..b4086dbe19 100644 --- a/epan/dissectors/packet-rmt-lct.c +++ b/epan/dissectors/packet-rmt-lct.c @@ -460,7 +460,7 @@ dissect_lct(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) if (toi_size <= 8) col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "TOI: %" G_GINT64_MODIFIER "u", toi); else - col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "TOI: 0x%s", tvb_bytes_to_str(tvb, offset, toi_size)); + col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "TOI: 0x%s", tvb_bytes_to_ep_str(tvb, offset, toi_size)); offset += toi_size; } diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c index 0fe8d13fe5..f389180f6a 100644 --- a/epan/dissectors/packet-rsvp.c +++ b/epan/dissectors/packet-rsvp.c @@ -2472,14 +2472,14 @@ dissect_rsvp_ifid_tlv(proto_tree *ti, proto_tree *rsvp_object_tree, proto_tree_add_text(rsvp_ifid_subtree, tvb, offset + tlv_off + 4, tlv_len - 4, "Data: %s", - tvb_bytes_to_str_punct(tvb, offset + tlv_off + 4, tlv_len - 4, ' ')); + tvb_bytes_to_ep_str_punct(tvb, offset + tlv_off + 4, tlv_len - 4, ' ')); break; } padding = (4 - (tlv_len % 4)) % 4; if (padding != 0) proto_tree_add_text(rsvp_ifid_subtree, tvb, offset + tlv_off + tlv_len, padding, "Padding: %s", - tvb_bytes_to_str_punct(tvb, offset + tlv_off + tlv_len, padding, ' ')); + tvb_bytes_to_ep_str_punct(tvb, offset + tlv_off + tlv_len, padding, ' ')); tlv_off += tlv_len + padding; } } @@ -3851,11 +3851,11 @@ dissect_rsvp_integrity(proto_item *ti _U_, proto_tree *rsvp_object_tree, proto_tree_add_item(rsvp_integ_flags_tree, hf_rsvp_integrity_flags_handshake, tvb, offset2, 1, ENC_BIG_ENDIAN); proto_tree_add_text(rsvp_object_tree, tvb, offset2+2, 6, - "Key Identifier: %s", tvb_bytes_to_str(tvb, offset2+2, 6)); + "Key Identifier: %s", tvb_bytes_to_ep_str(tvb, offset2+2, 6)); proto_tree_add_text(rsvp_object_tree, tvb, offset2+8, 8, "Sequence Number: %" G_GINT64_MODIFIER "u", tvb_get_ntoh64(tvb, offset2+8)); proto_tree_add_text(rsvp_object_tree, tvb, offset2+16, obj_length - 20, - "Hash: %s", tvb_bytes_to_str(tvb, offset2+16, obj_length - 20)); + "Hash: %s", tvb_bytes_to_ep_str(tvb, offset2+16, obj_length - 20)); } /*------------------------------------------------------------------------------ @@ -5474,7 +5474,7 @@ dissect_rsvp_association(proto_tree *ti, proto_tree *rsvp_object_tree, "Node ID: %s", tvb_ip_to_str(tvb, offset+12)); proto_item_append_text(ti, "Node ID: %s", tvb_ip_to_str(tvb, offset+12)); proto_tree_add_text(rsvp_object_tree, tvb, offset+8, 16, - "Padding: %s", tvb_bytes_to_str_punct(tvb, offset+16, 8, ' ')); + "Padding: %s", tvb_bytes_to_ep_str_punct(tvb, offset+16, 8, ' ')); break; default: @@ -5563,7 +5563,7 @@ dissect_rsvp_lsp_tunnel_if_id_tlv(proto_tree *rsvp_object_tree, proto_tree_add_text(rsvp_lsp_tunnel_if_id_subtree, tvb, offset+tlv_off+8, 8, "Sub Interface/Connection ID: %" G_GINT64_MODIFIER "u (0x%s)", tvb_get_ntoh64(tvb, offset+tlv_off+8), - tvb_bytes_to_str(tvb, offset+tlv_off+8, 8)); + tvb_bytes_to_ep_str(tvb, offset+tlv_off+8, 8)); proto_tree_add_text(rsvp_lsp_tunnel_if_id_subtree, tvb, offset+tlv_off+16, 4, "SC PC ID: %s", tvb_ip_to_str(tvb, offset+tlv_off+16)); @@ -6151,7 +6151,7 @@ dissect_rsvp_call_id(proto_tree *ti, proto_tree *rsvp_object_tree, case 0x7F: offset4 = offset3 + len; - str = tvb_bytes_to_str(tvb, offset3, len); + str = tvb_bytes_to_ep_str(tvb, offset3, len); proto_tree_add_text(rsvp_object_tree, tvb, offset3, len, "Source Transport Network addr: %s", str); break; @@ -6166,8 +6166,8 @@ dissect_rsvp_call_id(proto_tree *ti, proto_tree *rsvp_object_tree, proto_item_append_text(ti, "Src: %s. ", str); proto_tree_add_text(rsvp_object_tree, tvb, offset4, 8, "Local Identifier: %s", - tvb_bytes_to_str(tvb, offset4, 8)); - proto_item_append_text(ti, "Local ID: %s. ", tvb_bytes_to_str(tvb, offset4, 8)); + tvb_bytes_to_ep_str(tvb, offset4, 8)); + proto_item_append_text(ti, "Local ID: %s. ", tvb_bytes_to_ep_str(tvb, offset4, 8)); break; default: diff --git a/epan/dissectors/packet-rtmpt.c b/epan/dissectors/packet-rtmpt.c index 04925f9569..6a8cc2f57f 100644 --- a/epan/dissectors/packet-rtmpt.c +++ b/epan/dissectors/packet-rtmpt.c @@ -1534,9 +1534,9 @@ dissect_amf3_value_type(tvbuff_t *tvb, gint offset, proto_tree *tree, proto_item iValueOffset += iValueLength; iByteArrayValue = (guint8 *)tvb_memdup(wmem_packet_scope(), tvb, iValueOffset, iArrayLength); proto_tree_add_bytes(val_tree, hf_amf_bytearray, tvb, iValueOffset, iArrayLength, iByteArrayValue); - proto_item_append_text(ti, " %s", bytes_to_str(iByteArrayValue, iArrayLength)); + proto_item_append_text(ti, " %s", bytes_to_ep_str(iByteArrayValue, iArrayLength)); if (parent_ti != NULL) - proto_item_append_text(parent_ti, " %s", bytes_to_str(iByteArrayValue, iArrayLength)); + proto_item_append_text(parent_ti, " %s", bytes_to_ep_str(iByteArrayValue, iArrayLength)); } else { /* the upper 28 bits of the integer value are a object reference index */ proto_tree_add_uint(val_tree, hf_amf_object_reference, tvb, iValueOffset, iValueLength, iIntegerValue >> 1); diff --git a/epan/dissectors/packet-sigcomp.c b/epan/dissectors/packet-sigcomp.c index 86db5aa699..7554ffa40d 100644 --- a/epan/dissectors/packet-sigcomp.c +++ b/epan/dissectors/packet-sigcomp.c @@ -688,7 +688,7 @@ dissect_sigcomp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *sigcomp_tr offset = offset + len; } tvb_memcpy(tvb, partial_state, offset, partial_state_len); - partial_state_str = bytes_to_str(partial_state, partial_state_len); + partial_state_str = bytes_to_ep_str(partial_state, partial_state_len); proto_tree_add_string(sigcomp_tree,hf_sigcomp_partial_state, tvb, offset, partial_state_len, partial_state_str); offset = offset + partial_state_len; diff --git a/epan/dissectors/packet-simulcrypt.c b/epan/dissectors/packet-simulcrypt.c index 5becafba56..be0cf7d6c4 100644 --- a/epan/dissectors/packet-simulcrypt.c +++ b/epan/dissectors/packet-simulcrypt.c @@ -1306,7 +1306,7 @@ dissect_simulcrypt_data(proto_tree *simulcrypt_tree, proto_item *simulcrypt_item /* Parameter Length 2 Bytes */ plen = tvb_get_ntohs(tvb, offset+2); /* read 2 byte length value */ /* Parameter Value plen Bytes */ - pvalue_char = tvb_bytes_to_str(tvb, offset+4, plen); + pvalue_char = tvb_bytes_to_ep_str(tvb, offset+4, plen); simulcrypt_item = proto_tree_add_item(simulcrypt_tree, hf_simulcrypt_parameter, tvb, offset, plen+2+2, ENC_NA ); diff --git a/epan/dissectors/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c index 94689ac7ce..9b3f3bc3c8 100644 --- a/epan/dissectors/packet-smb-pipe.c +++ b/epan/dissectors/packet-smb-pipe.c @@ -628,7 +628,7 @@ add_logon_hours(tvbuff_t *tvb, int offset, int count, packet_info *pinfo _U_, proto_tree_add_bytes_format_value(tree, hf_index, tvb, cptr, count, NULL, "%s (wrong length, should be 21, is %d", - tvb_bytes_to_str(tvb, cptr, count), count); + tvb_bytes_to_ep_str(tvb, cptr, count), count); } } else { proto_tree_add_bytes_format_value(tree, hf_index, tvb, 0, 0, @@ -1709,7 +1709,7 @@ dissect_request_parameters(tvbuff_t *tvb, int offset, packet_info *pinfo, "%s: Value is %s, type is wrong (b)", proto_registrar_get_name((*items->hf_index == -1) ? hf_smb_pipe_bytes_param : *items->hf_index), - tvb_bytes_to_str(tvb, offset, count)); + tvb_bytes_to_ep_str(tvb, offset, count)); offset += count; items++; } else { @@ -1862,7 +1862,7 @@ dissect_response_parameters(tvbuff_t *tvb, int offset, packet_info *pinfo, "%s: Value is %s, type is wrong (g)", proto_registrar_get_name((*items->hf_index == -1) ? hf_smb_pipe_bytes_param : *items->hf_index), - tvb_bytes_to_str(tvb, offset, count)); + tvb_bytes_to_ep_str(tvb, offset, count)); offset += count; items++; } else { @@ -2059,7 +2059,7 @@ dissect_transact_data(tvbuff_t *tvb, int offset, int convert, "%s: Value is %s, type is wrong (B)", proto_registrar_get_name((*items->hf_index == -1) ? hf_smb_pipe_bytes_param : *items->hf_index), - tvb_bytes_to_str(tvb, offset, count)); + tvb_bytes_to_ep_str(tvb, offset, count)); offset += count; items++; } else { @@ -2151,7 +2151,7 @@ dissect_transact_data(tvbuff_t *tvb, int offset, int convert, "%s: Value is %s, type is wrong (b)", proto_registrar_get_name((*items->hf_index == -1) ? hf_smb_pipe_bytes_param : *items->hf_index), - tvb_bytes_to_str(tvb, cptr, count)); + tvb_bytes_to_ep_str(tvb, cptr, count)); items++; } else { offset = (*items->func)(tvb, offset, count, diff --git a/epan/dissectors/packet-smpp.c b/epan/dissectors/packet-smpp.c index 03178158f3..052a8a0010 100644 --- a/epan/dissectors/packet-smpp.c +++ b/epan/dissectors/packet-smpp.c @@ -1784,7 +1784,7 @@ smpp_handle_tlv(proto_tree *tree, tvbuff_t *tvb, int *offset) *offset, length, ENC_NA); } - proto_item_append_text(sub_tree,": %s", tvb_bytes_to_str(tvb,*offset,length)); + proto_item_append_text(sub_tree,": %s", tvb_bytes_to_ep_str(tvb,*offset,length)); (*offset) += length; break; } diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c index 7effb2010b..585b6a0e84 100644 --- a/epan/dissectors/packet-snmp.c +++ b/epan/dissectors/packet-snmp.c @@ -1259,7 +1259,7 @@ dissect_snmp_engineid(proto_tree *tree, tvbuff_t *tvb, int offset, int len) /* 12-byte AgentID w/ 8-byte trailer */ if (len_remain==8) { proto_tree_add_text(tree, tvb, offset, 8, "AgentID Trailer: 0x%s", - tvb_bytes_to_str(tvb, offset, 8)); + tvb_bytes_to_ep_str(tvb, offset, 8)); offset+=8; len_remain-=8; } else { @@ -2695,7 +2695,7 @@ dissect_snmp_SNMPv3Message(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off if (usm_p.authOK) { expert = &ei_snmp_authentication_ok; } else { - const gchar* calc_auth_str = bytestring_to_str(calc_auth,calc_auth_len,' '); + const gchar* calc_auth_str = bytestring_to_ep_str(calc_auth,calc_auth_len,' '); proto_item_append_text(authen_item, " calculated = %s", calc_auth_str); expert = &ei_snmp_authentication_error; } diff --git a/epan/dissectors/packet-socketcan.c b/epan/dissectors/packet-socketcan.c index c6ca25ed83..b37bce03df 100644 --- a/epan/dissectors/packet-socketcan.c +++ b/epan/dissectors/packet-socketcan.c @@ -145,7 +145,7 @@ dissect_socketcan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_add_fstr(pinfo->cinfo, COL_INFO, "%s: 0x%08x", val_to_str(frame_type, frame_type_vals, "Unknown (0x%02x)"), can_id.id); col_append_fstr(pinfo->cinfo, COL_INFO, " %s", - tvb_bytes_to_str_punct(tvb, CAN_DATA_OFFSET, frame_len, ' ')); + tvb_bytes_to_ep_str_punct(tvb, CAN_DATA_OFFSET, frame_len, ' ')); ti = proto_tree_add_item(tree, proto_can, tvb, 0, -1, ENC_NA); can_tree = proto_item_add_subtree(ti, ett_can); diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index 9d6b5553a0..dd3d7574de 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -3209,7 +3209,7 @@ ssl_privkey_to_sexp(struct gnutls_x509_privkey_int* priv_key) if (ret != 0) { ssl_debug_printf( "gnutls_x509_privkey_get_key_id(ssl_pkey, 0, buf_keyid, &buf_len) - %s\n", gnutls_strerror(ret)); } else { - ssl_debug_printf( "Private key imported: KeyID %s\n", bytes_to_str_punct(buf_keyid, (int) buf_len, ':')); + ssl_debug_printf( "Private key imported: KeyID %s\n", bytes_to_ep_str_punct(buf_keyid, (int) buf_len, ':')); } /* RSA get parameter */ @@ -3494,7 +3494,7 @@ ssl_load_pkcs12(FILE* fp, const gchar *cert_passwd, const char** err) { if (ret < 0) { g_strlcpy(buf_keyid, "<ERROR>", 32); } private_key->x509_cert = ssl_cert; - ssl_debug_printf( "Certificate imported: %s <%s>, KeyID %s\n", buf_name, buf_email, bytes_to_str(buf_keyid, (int) buf_len)); + ssl_debug_printf( "Certificate imported: %s <%s>, KeyID %s\n", buf_name, buf_email, bytes_to_ep_str(buf_keyid, (int) buf_len)); break; case GNUTLS_BAG_PKCS8_KEY: diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c index 12cf2a817b..a46b9aa7d9 100644 --- a/epan/dissectors/packet-t38.c +++ b/epan/dissectors/packet-t38.c @@ -687,11 +687,11 @@ dissect_t38_T_field_data(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ if (primary_part){ if(value_len < 8){ col_append_fstr(actx->pinfo->cinfo, COL_INFO, "[%s]", - tvb_bytes_to_str(value_tvb,0,value_len)); + tvb_bytes_to_ep_str(value_tvb,0,value_len)); } else { col_append_fstr(actx->pinfo->cinfo, COL_INFO, "[%s...]", - tvb_bytes_to_str(value_tvb,0,7)); + tvb_bytes_to_ep_str(value_tvb,0,7)); } } diff --git a/epan/dissectors/packet-vuze-dht.c b/epan/dissectors/packet-vuze-dht.c index 76cb79a554..4f15ac62c3 100644 --- a/epan/dissectors/packet-vuze-dht.c +++ b/epan/dissectors/packet-vuze-dht.c @@ -388,7 +388,7 @@ dissect_vuze_dht_key(tvbuff_t *tvb, packet_info _U_*pinfo, proto_tree *tree, int offset += TL_BYTE; proto_tree_add_item( sub_tree, hf_vuze_dht_key_data, tvb, offset, key_len, ENC_NA ); - proto_item_append_text( ti, ": %d bytes ( %s )", key_len, tvb_bytes_to_str(tvb, offset, key_len ) ); + proto_item_append_text( ti, ": %d bytes ( %s )", key_len, tvb_bytes_to_ep_str(tvb, offset, key_len ) ); offset += key_len; return offset; @@ -474,7 +474,7 @@ dissect_vuze_dht_value(tvbuff_t *tvb, packet_info _U_*pinfo, proto_tree *tree, i offset += TL_SHORT; proto_tree_add_item(sub_tree, hf_vuze_dht_value_bytes, tvb, offset, value_bytes_count, ENC_NA); - proto_item_append_text( ti, ": %d bytes ( %s )", value_bytes_count, tvb_bytes_to_str(tvb, offset, value_bytes_count ) ); + proto_item_append_text( ti, ": %d bytes ( %s )", value_bytes_count, tvb_bytes_to_ep_str(tvb, offset, value_bytes_count ) ); offset += value_bytes_count; offset = dissect_vuze_dht_contact( tvb, pinfo, sub_tree, offset ); @@ -553,7 +553,7 @@ dissect_vuze_dht_network_coordinate(tvbuff_t *tvb, packet_info _U_*pinfo, proto_ sub_tree = proto_item_add_subtree(ti, ett_vuze_dht_network_coordinate); proto_item_append_text( ti, ": type %d, length %d ( %s )", - tvb_get_guint8(tvb,offset), tvb_get_guint8(tvb,offset+TL_BYTE), tvb_bytes_to_str(tvb, offset+TL_BYTE+TL_BYTE, coordinate_size ) ); + tvb_get_guint8(tvb,offset), tvb_get_guint8(tvb,offset+TL_BYTE), tvb_bytes_to_ep_str(tvb, offset+TL_BYTE+TL_BYTE, coordinate_size ) ); proto_tree_add_item( sub_tree, hf_vuze_dht_network_coordinate_type, tvb, offset, TL_BYTE, ENC_BIG_ENDIAN ); offset += TL_BYTE; diff --git a/epan/dissectors/packet-wccp.c b/epan/dissectors/packet-wccp.c index 1533ac6648..1f24ead57b 100644 --- a/epan/dissectors/packet-wccp.c +++ b/epan/dissectors/packet-wccp.c @@ -2370,7 +2370,7 @@ dissect_wccp2_capability_element(tvbuff_t *tvb, int offset, gint length, proto_tree_add_text(element_tree, tvb, offset, capability_val_len, "Value: %s", - tvb_bytes_to_str(tvb, offset, + tvb_bytes_to_ep_str(tvb, offset, capability_val_len)); break; } diff --git a/epan/dissectors/packet-wtls.c b/epan/dissectors/packet-wtls.c index ed59844d69..41de8dd7b6 100644 --- a/epan/dissectors/packet-wtls.c +++ b/epan/dissectors/packet-wtls.c @@ -469,7 +469,7 @@ add_session_id(proto_tree *tree, int hf, int hf_str, tvbuff_t *tvb, int offset) } else { hfinfo = proto_registrar_get_nth(hf); proto_tree_add_text (tree, tvb, offset, count+1, "%s: %s", - hfinfo->name, tvb_bytes_to_str(tvb, offset+1, count)); + hfinfo->name, tvb_bytes_to_ep_str(tvb, offset+1, count)); } return offset+1+count; } diff --git a/epan/dissectors/packet-yami.c b/epan/dissectors/packet-yami.c index e0e9dd979d..ecb5ecd1eb 100644 --- a/epan/dissectors/packet-yami.c +++ b/epan/dissectors/packet-yami.c @@ -233,7 +233,7 @@ dissect_yami_parameter(tvbuff_t *tvb, proto_tree *tree, int offset, proto_item * offset += 4; val = tvb_get_ptr(tvb, offset, val_len); - repr = bytes_to_str(val, val_len); + repr = bytes_to_ep_str(val, val_len); proto_item_append_text(ti, ", Type: binary, Value: %s", repr); offset += (val_len + 3) & ~3; @@ -397,7 +397,7 @@ dissect_yami_parameter(tvbuff_t *tvb, proto_tree *tree, int offset, proto_item * offset += 4; val = tvb_get_ptr(tvb, offset, val_len); - repr = bytes_to_str(val, val_len); + repr = bytes_to_ep_str(val, val_len); proto_item_append_text(ti, "%s, ", repr); offset += (val_len + 3) & ~3; diff --git a/epan/dissectors/packet-zbee-zcl-general.c b/epan/dissectors/packet-zbee-zcl-general.c index ef40e8e3e9..bf2b889f5d 100644 --- a/epan/dissectors/packet-zbee-zcl-general.c +++ b/epan/dissectors/packet-zbee-zcl-general.c @@ -1381,7 +1381,7 @@ static void dissect_zcl_part_trasfpartframe(tvbuff_t *tvb, proto_tree *tree, gui *offset += 1; /* Retrieve "PartitionedFrame" field */ - data_frame = tvb_bytes_to_str_punct(tvb, *offset, frame_len, ':'); + data_frame = tvb_bytes_to_ep_str_punct(tvb, *offset, frame_len, ':'); proto_tree_add_string(tree, hf_zbee_zcl_part_part_frame, tvb, *offset, frame_len, data_frame); *offset += frame_len; diff --git a/epan/dissectors/packet-zbee-zcl-ha.c b/epan/dissectors/packet-zbee-zcl-ha.c index f5f1e394ff..5c4f5e8b65 100644 --- a/epan/dissectors/packet-zbee-zcl-ha.c +++ b/epan/dissectors/packet-zbee-zcl-ha.c @@ -1378,7 +1378,7 @@ dissect_zcl_appl_stats_log_rsp(tvbuff_t *tvb, proto_tree *tree, guint *offset) *offset += 4; /* Retrieve 'Log Payload' field */ - log_data = tvb_bytes_to_str_punct(tvb, *offset, log_len, ':'); + log_data = tvb_bytes_to_ep_str_punct(tvb, *offset, log_len, ':'); proto_tree_add_string(tree, hf_zbee_zcl_appl_stats_log_payload, tvb, *offset, log_len, log_data); *offset += log_len; }/*dissect_zcl_appl_stats_log_rsp*/ diff --git a/epan/dissectors/packet-zbee-zcl.c b/epan/dissectors/packet-zbee-zcl.c index d8ea55df83..c6e0227a2e 100644 --- a/epan/dissectors/packet-zbee-zcl.c +++ b/epan/dissectors/packet-zbee-zcl.c @@ -2487,7 +2487,7 @@ void dissect_zcl_attr_data(tvbuff_t *tvb, proto_tree *tree, guint *offset, guint *offset += 1; - attr_string = tvb_bytes_to_str_punct(tvb, *offset, attr_uint, ':'); + attr_string = tvb_bytes_to_ep_str_punct(tvb, *offset, attr_uint, ':'); proto_item_append_text(tree, ", Octets: %s", attr_string); proto_tree_add_string(tree, hf_zbee_zcl_attr_ostr, tvb, *offset, attr_uint, attr_string); @@ -2522,7 +2522,7 @@ void dissect_zcl_attr_data(tvbuff_t *tvb, proto_tree *tree, guint *offset, guint *offset += 2; - attr_string = tvb_bytes_to_str_punct(tvb, *offset, attr_uint, ':'); + attr_string = tvb_bytes_to_ep_str_punct(tvb, *offset, attr_uint, ':'); proto_item_append_text(tree, ", Octets: %s", attr_string); proto_tree_add_string(tree, hf_zbee_zcl_attr_ostr, tvb, *offset, attr_uint, attr_string); |