diff options
| author | Anders Broman <a.broman58@gmail.com> | 2015-02-12 08:33:21 +0000 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-02-12 08:34:30 +0000 |
| commit | 4359cb8478ebe615bfb7e6944e96f6cb291512e4 (patch) | |
| tree | 317bc9ba692ceabbcf872f138eddca012264b74f /epan/addr_resolv.h | |
| parent | 53228c4bd8d64dae077c90496da738c0da75f20f (diff) | |
Revert ""Hide" hashether_t structure."
This reverts commit 297ef07b9b2f5b681234d0c31269996413262cbc.
Change-Id: Id47f5fd221b631c95ca71e3f9315f5263bab22de
Reviewed-on: https://code.wireshark.org/review/7077
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/addr_resolv.h')
| -rw-r--r-- | epan/addr_resolv.h | 13 |
1 files changed, 7 insertions, 6 deletions
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); |