From 4359cb8478ebe615bfb7e6944e96f6cb291512e4 Mon Sep 17 00:00:00 2001 From: Anders Broman Date: Thu, 12 Feb 2015 08:33:21 +0000 Subject: [PATCH] Revert ""Hide" hashether_t structure." This reverts commit 297ef07b9b2f5b681234d0c31269996413262cbc. Change-Id: Id47f5fd221b631c95ca71e3f9315f5263bab22de Reviewed-on: https://code.wireshark.org/review/7077 Reviewed-by: Anders Broman --- debian/libwireshark0.symbols | 3 --- epan/addr_resolv.c | 19 +++---------------- epan/addr_resolv.h | 13 +++++++------ ui/gtk/addr_resolution_dlg.c | 6 +++--- 4 files changed, 13 insertions(+), 28 deletions(-) diff --git a/debian/libwireshark0.symbols b/debian/libwireshark0.symbols index bcf216b9aa..e53138f8ab 100644 --- a/debian/libwireshark0.symbols +++ b/debian/libwireshark0.symbols @@ -640,9 +640,6 @@ 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 171b891829..6756acda79 100644 --- a/epan/addr_resolv.c +++ b/epan/addr_resolv.c @@ -192,12 +192,15 @@ 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 @@ -1366,22 +1369,6 @@ 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 eda5885bb8..56e61a6ba8 100644 --- a/epan/addr_resolv.h +++ b/epan/addr_resolv.h @@ -56,8 +56,13 @@ typedef struct _e_addr_resolve { gboolean load_hosts_file_from_profile_only; } e_addr_resolve; -struct hashether; -typedef struct hashether hashether_t; + +typedef struct hashether { + guint status; /* (See above) */ + guint8 addr[6]; + char hexaddr[6*3]; + char resolved_name[MAXNAMELEN]; +} hashether_t; typedef struct serv_port { gchar *udp_name; @@ -219,10 +224,6 @@ 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 d7ec0a0ece..f9dd677392 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), - get_hash_ether_status(tp), - get_hash_ether_hexaddr(tp), - get_hash_ether_resolved_name(tp)); + tp->status, + tp->hexaddr, + tp->resolved_name); gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1); }