Add a "get_addr_name()" routine that takes an "address *" and attempts

to resolve it to a name.

Fix up some const-pointer-to-non-const-pointer, and
function-pointer-to-void-*, conversions.

Fix some comments.

svn path=/trunk/; revision=12863

1 files changed, 11 insertions, 22 deletions

diff --git a/gtk/conversations_table.c b/gtk/conversations_table.c
index 325f19c470..7fa58b5ee6 100644
--- a/gtk/conversations_table.c
+++ b/gtk/conversations_table.c
@@ -944,25 +944,19 @@ ct_create_popup_menu(conversations_table *ct)
 static void
 draw_ct_table_address(conversations_table *ct, int conversation_idx)
 {
-    char *entry;
+    const char *entry;
     char *port;
-    address_type  at;
     guint32 pt;
     int rownum;
 
     rownum=gtk_clist_find_row_from_data(ct->table, (gpointer)conversation_idx);
 
-    at = ct->conversations[conversation_idx].src_address.type;
-    if(!ct->resolve_names) at = AT_NONE;
-    switch(at) {
-    case(AT_IPv4):
-        entry=get_hostname((*(guint *)ct->conversations[conversation_idx].src_address.data));
-        break;
-    case(AT_ETHER):
-        entry=get_ether_name(ct->conversations[conversation_idx].src_address.data);
-        break;
-    default:
+    if(!ct->resolve_names)
         entry=address_to_str(&ct->conversations[conversation_idx].src_address);
+    else {
+        entry=get_addr_name(&ct->conversations[conversation_idx].src_address.data);
+        if(!entry)
+            entry=address_to_str(&ct->conversations[conversation_idx].src_address);
     }
     gtk_clist_set_text(ct->table, rownum, 0, entry);
 
@@ -981,17 +975,12 @@ draw_ct_table_address(conversations_table *ct, int conversation_idx)
     }
     gtk_clist_set_text(ct->table, rownum, 1, entry);
 
-    at = ct->conversations[conversation_idx].dst_address.type;
-    if(!ct->resolve_names) at = AT_NONE;
-    switch(at) {
-    case(AT_IPv4):
-        entry=get_hostname((*(guint *)ct->conversations[conversation_idx].dst_address.data));
-        break;
-    case(AT_ETHER):
-        entry=get_ether_name(ct->conversations[conversation_idx].dst_address.data);
-        break;
-    default:
+    if(!ct->resolve_names)
         entry=address_to_str(&ct->conversations[conversation_idx].dst_address);
+    else {
+        entry=get_addr_name(&ct->conversations[conversation_idx].dst_address.data);
+        if(!entry)
+            entry=address_to_str(&ct->conversations[conversation_idx].dst_address);
     }
     gtk_clist_set_text(ct->table, rownum, 2, entry);