"Hide" hashether_t structure.

One use in a GUI function isn't really enough to justify making the structure public.

Change-Id: Ic7dee275ba0a2bd4e19c06702a867417c5624c27
Reviewed-on: https://code.wireshark.org/review/7080
Reviewed-by: Michael Mann <mmann78@netscape.net>

4 files changed, 28 insertions, 13 deletions

diff --git a/debian/libwireshark0.symbols b/debian/libwireshark0.symbols
index e5dfc238e5..cdba1f3626 100644
--- a/debian/libwireshark0.symbols
+++ b/debian/libwireshark0.symbols
@@ -640,6 +640,9 @@ libwireshark.so.0 libwireshark0 #MINVER#
  get_ether_name@Base 1.9.1
  get_export_pdu_tap_list@Base 1.99.0
  get_follow_index@Base 1.99.2
+ get_hash_ether_status@Base 1.99.3
+ get_hash_ether_hexaddr@Base 1.99.3
+ get_hash_ether_resolved_name@Base 1.99.3
  get_host_ipaddr6@Base 1.9.1
  get_host_ipaddr@Base 1.9.1
  get_hostlist_filter@Base 1.99.0
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c
index 6756acda79..171b891829 100644
--- a/epan/addr_resolv.c
+++ b/epan/addr_resolv.c
@@ -192,15 +192,12 @@ typedef struct hashipxnet {
 #define HASHETHER_STATUS_RESOLVED_DUMMY 2
 #define HASHETHER_STATUS_RESOLVED_NAME  3
 
-#if 0
 typedef struct hashether {
-    struct hashether *next;
     guint             status;  /* (See above) */
     guint8            addr[6];
     char              hexaddr[6*3];
     char              resolved_name[MAXNAMELEN];
 } hashether_t;
-#endif
 /* internal ethernet type */
 
 typedef struct _ether
@@ -1369,6 +1366,22 @@ wka_name_lookup(const guint8 *addr, const unsigned int mask)
 
 } /* wka_name_lookup */
 
+
+guint get_hash_ether_status(hashether_t* ether)
+{
+    return ether->status;
+}
+
+char* get_hash_ether_hexaddr(hashether_t* ether)
+{
+    return ether->hexaddr;
+}
+
+char* get_hash_ether_resolved_name(hashether_t* ether)
+{
+    return ether->resolved_name;
+}
+
 static guint
 eth_addr_hash(gconstpointer key)
 {
diff --git a/epan/addr_resolv.h b/epan/addr_resolv.h
index 56e61a6ba8..eda5885bb8 100644
--- a/epan/addr_resolv.h
+++ b/epan/addr_resolv.h
@@ -56,13 +56,8 @@ typedef struct _e_addr_resolve {
   gboolean load_hosts_file_from_profile_only;
 } e_addr_resolve;
 
-
-typedef struct hashether {
-  guint             status;  /* (See above) */
-  guint8            addr[6];
-  char              hexaddr[6*3];
-  char              resolved_name[MAXNAMELEN];
-} hashether_t;
+struct hashether;
+typedef struct hashether hashether_t;
 
 typedef struct serv_port {
   gchar            *udp_name;
@@ -224,6 +219,10 @@ extern const gchar *eui64_to_display(wmem_allocator_t *allocator, const guint64
  * or a string formatted with "%X" if not */
 extern const gchar *get_ipxnet_name(wmem_allocator_t *allocator, const guint32 addr);
 
+WS_DLL_PUBLIC guint get_hash_ether_status(hashether_t* ether);
+WS_DLL_PUBLIC char* get_hash_ether_hexaddr(hashether_t* ether);
+WS_DLL_PUBLIC char* get_hash_ether_resolved_name(hashether_t* ether);
+
 /* returns the ethernet address corresponding to name or NULL if not known */
 extern guint8 *get_ether_addr(const gchar *name);
 
diff --git a/ui/gtk/addr_resolution_dlg.c b/ui/gtk/addr_resolution_dlg.c
index f9dd677392..d7ec0a0ece 100644
--- a/ui/gtk/addr_resolution_dlg.c
+++ b/ui/gtk/addr_resolution_dlg.c
@@ -60,9 +60,9 @@ eth_hash_to_texbuff(gpointer key, gpointer value, gpointer user_data)
                (guint8)((eth_as_gint64>>16)&0xff),
                (guint8)((eth_as_gint64>>8)&0xff),
                (guint8)(eth_as_gint64&0xff),
-               tp->status,
-               tp->hexaddr,
-               tp->resolved_name);
+               get_hash_ether_status(tp),
+               get_hash_ether_hexaddr(tp),
+               get_hash_ether_resolved_name(tp));
     gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
 
 }