diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-02-11 22:16:01 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-02-12 07:36:20 +0000 |
| commit | 797ea88aefc2f45dba7e77d2dcaebe68ac1a4fac (patch) | |
| tree | 94c34b167377a7ff494b16ab7a9fad5ebbcf7a79 /ui/gtk/addr_resolution_dlg.c | |
| parent | 297ef07b9b2f5b681234d0c31269996413262cbc (diff) | |
Make get_manuf_name return a const string.
Model get_manuf_name after get_ether_name so that a string (either name resolved or colon-separated bytes) is always stored in a hash table. This will make name resolution of addresses perform a little better because it doesn't have to work about the wmem_allocator.
Change-Id: I80f465ae0845290255a659ab63310ac3cc35506e
Reviewed-on: https://code.wireshark.org/review/7075
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/gtk/addr_resolution_dlg.c')
| -rw-r--r-- | ui/gtk/addr_resolution_dlg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/gtk/addr_resolution_dlg.c b/ui/gtk/addr_resolution_dlg.c index d7ec0a0ece..cca7db805c 100644 --- a/ui/gtk/addr_resolution_dlg.c +++ b/ui/gtk/addr_resolution_dlg.c @@ -71,10 +71,10 @@ manuf_hash_to_texbuff(gpointer key, gpointer value, gpointer user_data) { gchar string_buff[ADDRESS_STR_MAX]; GtkTextBuffer *buffer = (GtkTextBuffer*)user_data; - gchar *name = (gchar *)value; + hashmanuf_t *manuf = (hashmanuf_t*)value; int eth_as_gint = *(int*)key; - g_snprintf(string_buff, ADDRESS_STR_MAX, "%.2X:%.2X:%.2X %s\n",eth_as_gint>>16, (eth_as_gint>>8)&0xff, eth_as_gint&0xff,name); + g_snprintf(string_buff, ADDRESS_STR_MAX, "%.2X:%.2X:%.2X %s\n",eth_as_gint>>16, (eth_as_gint>>8)&0xff, eth_as_gint&0xff, get_hash_manuf_resolved_name(manuf)); gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1); } |