diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2005-06-02 18:29:29 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2005-06-02 18:29:29 +0000 |
| commit | 4984c5e94994b345c08fa65432a2450f211de6f8 (patch) | |
| tree | 6d58c2323b12b3f6f3e3c6c9939e03894be57e99 /epan/proto.c | |
| parent | e3e7b4d2293505602e789c40530901b4905825bb (diff) | |
| download | wireshark-4984c5e94994b345c08fa65432a2450f211de6f8.tar.gz wireshark-4984c5e94994b345c08fa65432a2450f211de6f8.tar.bz2 wireshark-4984c5e94994b345c08fa65432a2450f211de6f8.zip | |
show Ethernet and IPX addresses the same way as we do with other fields as well (e.g. IP addresses), first the converted value (e.g. IP address or manufaturer name) and then in brackets the "raw data"
svn path=/trunk/; revision=14523
Diffstat (limited to 'epan/proto.c')
| -rw-r--r-- | epan/proto.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/proto.c b/epan/proto.c index 672e256f85..0a1b81de53 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -3068,8 +3068,8 @@ proto_item_fill_label(field_info *fi, gchar *label_str) case FT_IPXNET: integer = fvalue_get_integer(&fi->value); ret = snprintf(label_str, ITEM_LABEL_LENGTH, - "%s: 0x%08X (%s)", hfinfo->name, - integer, get_ipxnet_name(integer)); + "%s: %s (0x%08X)", hfinfo->name, + get_ipxnet_name(integer), integer); if ((ret == -1) || (ret >= ITEM_LABEL_LENGTH)) label_str[ITEM_LABEL_LENGTH - 1] = '\0'; break; @@ -3078,8 +3078,8 @@ proto_item_fill_label(field_info *fi, gchar *label_str) bytes = fvalue_get(&fi->value); ret = snprintf(label_str, ITEM_LABEL_LENGTH, "%s: %s (%s)", hfinfo->name, - ether_to_str(bytes), - get_ether_name(bytes)); + get_ether_name(bytes), + ether_to_str(bytes)); if ((ret == -1) || (ret >= ITEM_LABEL_LENGTH)) label_str[ITEM_LABEL_LENGTH - 1] = '\0'; break; |