aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-frame.c
diff options
context:
space:
mode:
authorEvan Huus <eapache@gmail.com>2013-12-19 20:53:44 +0000
committerEvan Huus <eapache@gmail.com>2013-12-19 20:53:44 +0000
commit6be37815a19a8b34713831d131c1843d1f20ed7e (patch)
treed6b217db73573a3e05b1e269a93cc7e1dec94e87 /epan/dissectors/packet-frame.c
parent1ed5971a72e53ed182d6ac90ac0c313b6bcdc234 (diff)
Add bytestring_to_str() which takes a wmem scope and is otherwise identical to
bytestring_to_ep_str (now deprecated). Use the new one in a few obvious places. Also just print directly to the buffer when loading ethernet addresses for resolution. The straight-to-buffer bytes_to_hexstr seems useful, maybe it shouldn't be in a private header... svn path=/trunk/; revision=54270
Diffstat (limited to 'epan/dissectors/packet-frame.c')
-rw-r--r--epan/dissectors/packet-frame.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c
index 9666be4562..c46202d5db 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_ep_str(digest, 16, '\0');
+ digest_string = bytestring_to_str(wmem_packet_scope(), digest, 16, '\0');
ti = proto_tree_add_string(fh_tree, hf_frame_md5_hash, tvb, 0, 0, digest_string);
PROTO_ITEM_SET_GENERATED(ti);
}