diff options
author | Michael Mann <mmann78@netscape.net> | 2015-02-11 20:13:36 -0500 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2015-02-14 15:56:21 +0000 |
commit | 91b5042ece248e4773d207b4144bd866f8150fa4 (patch) | |
tree | dbd234414db67b1268829b5c275b45582ca0b9c9 /epan | |
parent | a64fc6cf442f7dd566f85696aae17ab2249ba01f (diff) | |
download | wireshark-91b5042ece248e4773d207b4144bd866f8150fa4.tar.gz |
"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>
Diffstat (limited to 'epan')
-rw-r--r-- | epan/addr_resolv.c | 19 | ||||
-rw-r--r-- | epan/addr_resolv.h | 13 |
2 files changed, 22 insertions, 10 deletions
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); |