diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-02-11 22:16:01 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-02-16 12:47:02 +0000 |
| commit | b2c81bb9e80aed27c32f29cc36f181149c57f18f (patch) | |
| tree | 5bd982154ff7f958fde346a0810e8c16afcca8ab /epan/dissectors/packet-nhrp.c | |
| parent | b2d23ec2fb2fc314d4014b98cb324ae7c2f9b489 (diff) | |
Make get_manuf_name return a const string.
Model get_manuf_name after get_ether_name so that a string (either name resolved or colon-separated bytes) is always stored in a hash table. This will make name resolution of addresses perform a little better because it doesn't have to worry about the wmem_allocator.
Change-Id: If976fe7b0c3f9cd053225096c2ac05418f061af6
Reviewed-on: https://code.wireshark.org/review/7081
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-nhrp.c')
| -rw-r--r-- | epan/dissectors/packet-nhrp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-nhrp.c b/epan/dissectors/packet-nhrp.c index dc35490cc6..06abf3fe83 100644 --- a/epan/dissectors/packet-nhrp.c +++ b/epan/dissectors/packet-nhrp.c @@ -920,10 +920,10 @@ static void dissect_nhrp_ext(tvbuff_t *tvb, tvb_memcpy(tvb, manuf, offset, 3); vendor_tree = proto_tree_add_subtree_format(nhrp_tree, tvb, offset, len, - ett_nhrp_vendor_ext, NULL, "Extension Data: Vendor ID=%s, Data=%s", get_manuf_name(wmem_packet_scope(), manuf), + ett_nhrp_vendor_ext, NULL, "Extension Data: Vendor ID=%s, Data=%s", get_manuf_name(manuf), tvb_bytes_to_str(wmem_packet_scope(), tvb, offset + 3, len - 3)); proto_tree_add_bytes_format_value(vendor_tree, hf_nhrp_vendor_ext_id, tvb, - offset, 3, manuf, "%s", get_manuf_name(wmem_packet_scope(), manuf)); + offset, 3, manuf, "%s", get_manuf_name(manuf)); if (len > 3) { proto_tree_add_item(vendor_tree, hf_nhrp_vendor_ext_data, tvb, offset + 3, len - 3, ENC_NA); } |