diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-01-05 19:26:28 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-01-07 04:25:07 +0000 |
| commit | 47d670d3d7d17df1e29a55d05413a2fd3d0f8e6a (patch) | |
| tree | c417040f8d8172f3cc9646bfae75ae282e15be43 /tools/convert_proto_tree_add_text.pl | |
| parent | 0f426d6f0133d3a31dc7d56e9d0a79aa9b55255e (diff) | |
Add tvb_address_to_str.
This is intended to handle ALL address types retrieved from a tvbuff.
One of the (good) side effects of this function is that it can replace a lot of the "hidden" ep_alloc calls used to allocate memory for the address string.
A few existing "popular" helper tvb_ functions were turned into pure macros calling tvb_address_to_str. Some of the "less used" helper tvb_ functions were just directly replaced with tvb_address_to_str.
Change-Id: I361d991c4ad90142173e63eae02a94d68af3ec43
Reviewed-on: https://code.wireshark.org/review/6333
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'tools/convert_proto_tree_add_text.pl')
| -rwxr-xr-x | tools/convert_proto_tree_add_text.pl | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tools/convert_proto_tree_add_text.pl b/tools/convert_proto_tree_add_text.pl index 3ed4711393..d811d12016 100755 --- a/tools/convert_proto_tree_add_text.pl +++ b/tools/convert_proto_tree_add_text.pl @@ -390,8 +390,7 @@ sub generate_hfs { if (($proto_tree_item[6] eq "1") || ($args[5] =~ /tvb_get_guint8/) || ($args[5] =~ /tvb_bytes_to_str/) || - ($args[5] =~ /tvb_ether_to_str/) || - ($args[5] =~ /tvb_vines_addr_to_str/)) { + ($args[5] =~ /tvb_ether_to_str/)) { $proto_tree_item[7] = "ENC_NA"; } elsif ($args[5] =~ /tvb_get_ntoh/) { $proto_tree_item[7] = "ENC_BIG_ENDIAN"; @@ -497,8 +496,6 @@ sub generate_hfs { $proto_tree_item[9] = "FT_BYTES"; } elsif ($args[5] =~ /tvb_ether_to_str/) { $proto_tree_item[9] = "FT_ETHER"; - } elsif ($args[5] =~ /tvb_vines_addr_to_str/) { - $proto_tree_item[9] = "FT_VINES"; } #if we still can't determine type, assume a constant length |