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-ax25.c | |
| parent | 6f8de873c7bd3f93fe01c349b41e80e4956c5a33 (diff) | |
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-ax25.c')
| -rw-r--r-- | epan/dissectors/packet-ax25.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/epan/dissectors/packet-ax25.c b/epan/dissectors/packet-ax25.c index e51ed64d18..cd02623769 100644 --- a/epan/dissectors/packet-ax25.c +++ b/epan/dissectors/packet-ax25.c @@ -56,7 +56,6 @@ #define STRLEN 80 -#define AX25_ADDR_LEN 7 /* length of an AX.25 address */ #define AX25_HEADER_SIZE 15 /* length of src_addr + dst_addr + cntl */ #define AX25_MAX_DIGIS 8 @@ -177,11 +176,9 @@ dissect_ax25( tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree ) /* step over src addr point at either 1st via addr or control byte */ offset += AX25_ADDR_LEN; - proto_item_append_text( ti, ", Src: %s (%s), Dst: %s (%s)", - get_ax25_name( src_addr ), - ax25_to_str( src_addr ), - get_ax25_name( dst_addr ), - ax25_to_str( dst_addr ) ); + proto_item_append_text( ti, ", Src: %s, Dst: %s", + address_to_str(wmem_packet_scope(), &pinfo->src), + address_to_str(wmem_packet_scope(), &pinfo->dst)); /* decode the cmd/resp field */ /* v2cmdresp = '.'; */ |