diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-12-19 18:13:17 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-12-21 15:12:58 +0000 |
| commit | cdaa6698297a9e14ae9b321f0c6ee536afa917b6 (patch) | |
| tree | f0b8c6bb54bf44840ce4779f8b154b268a04df69 /epan/dissectors/packet-arp.c | |
| parent | 6f8de873c7bd3f93fe01c349b41e80e4956c5a33 (diff) | |
| download | wireshark-cdaa6698297a9e14ae9b321f0c6ee536afa917b6.tar.gz | |
Replace ax25_to_str and get_ax25_name with address_to_str.
Change-Id: I74ddb6fc629ef32b217dede7a3ba652cbbf5ab12
Reviewed-on: https://code.wireshark.org/review/5932
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-arp.c')
| -rw-r--r-- | epan/dissectors/packet-arp.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/epan/dissectors/packet-arp.c b/epan/dissectors/packet-arp.c index 68fab05bae..85aac851ae 100644 --- a/epan/dissectors/packet-arp.c +++ b/epan/dissectors/packet-arp.c @@ -388,9 +388,16 @@ arpproaddr_to_str(const guint8 *ad, int ad_len, guint16 type) return ip_to_str(ad); } if (ARP_HW_IS_AX25(type, ad_len)) { + { /* AX.25 address */ - return get_ax25_name(ad); - /*return ax25_to_str(ad);*/ + address addr; + + addr.type = AT_AX25; + addr.len = AX25_ADDR_LEN; + addr.data = ad; + + return address_to_str(wmem_packet_scope(), &addr); + } } return bytes_to_ep_str(ad, ad_len); } |