Add name resolution support to address type.

Add address_with_resolution_to_str API that returns address string + name resolution in the format %s (%s), first string is resolved name (if available) and second string is raw address string.

Convert AT_FCWWN to using proper name resolution format

First use of address_with_resolution_to_str with field types in proto.c

Change-Id: I2ae77c29a4ffc30bb919fbec00f06629830898c2
Reviewed-on: https://code.wireshark.org/review/7196
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

1 files changed, 8 insertions, 8 deletions

diff --git a/epan/dissectors/packet-arcnet.c b/epan/dissectors/packet-arcnet.c
index a09cc59469..251a0d3e5c 100644
--- a/epan/dissectors/packet-arcnet.c
+++ b/epan/dissectors/packet-arcnet.c
@@ -53,19 +53,19 @@ static int arcnet_address_type = -1;
 static dissector_table_t arcnet_dissector_table;
 static dissector_handle_t data_handle;
 
-static gboolean arcnet_to_str(const address* addr, gchar *buf, int buf_len _U_)
+static int arcnet_str_len(const address* addr _U_)
+{
+  return 5;
+}
+
+static int arcnet_to_str(const address* addr, gchar *buf, int buf_len _U_)
 {
   *buf++ = '0';
   *buf++ = 'x';
   buf = bytes_to_hexstr(buf, (const guint8 *)addr->data, 1);
   *buf = '\0'; /* NULL terminate */
 
-  return TRUE;
-}
-
-static int arcnet_str_len(const address* addr _U_)
-{
-  return 5;
+  return arcnet_str_len(addr);
 }
 
 static const char* arcnet_col_filter_str(const address* addr _U_, gboolean is_src)
@@ -385,7 +385,7 @@ proto_register_arcnet (void)
   proto_register_field_array (proto_arcnet, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 
-  arcnet_address_type = address_type_dissector_register("AT_ARCNET", "ARCNET Address", arcnet_to_str, arcnet_str_len, arcnet_col_filter_str, arcnet_len);
+  arcnet_address_type = address_type_dissector_register("AT_ARCNET", "ARCNET Address", arcnet_to_str, arcnet_str_len, arcnet_col_filter_str, arcnet_len, NULL, NULL);
 }