diff options
Diffstat (limited to 'ui')
-rw-r--r-- | ui/cli/tap-endpoints.c | 4 | ||||
-rw-r--r-- | ui/cli/tap-iousers.c | 8 | ||||
-rw-r--r-- | ui/gtk/conversations_table.c | 16 | ||||
-rw-r--r-- | ui/gtk/hostlist_table.c | 10 | ||||
-rw-r--r-- | ui/gtk/wlan_stat_dlg.c | 4 | ||||
-rw-r--r-- | ui/qt/conversation_dialog.cpp | 18 | ||||
-rw-r--r-- | ui/qt/endpoint_dialog.cpp | 8 |
7 files changed, 34 insertions, 34 deletions
diff --git a/ui/cli/tap-endpoints.c b/ui/cli/tap-endpoints.c index cbdc110f76..5e261bd29b 100644 --- a/ui/cli/tap-endpoints.c +++ b/ui/cli/tap-endpoints.c @@ -78,10 +78,10 @@ endpoints_draw(void *arg) if (tot_frames == last_frames) { /* XXX - TODO: make name resolution configurable (through gbl_resolv_flags?) */ - conversation_str = (char*)get_conversation_address(NULL, &host->myaddress, TRUE); + conversation_str = get_conversation_address(NULL, &host->myaddress, TRUE); if (display_port) { /* XXX - TODO: make port resolution configurable (through gbl_resolv_flags?) */ - port_str = (char*)get_conversation_port(NULL, host->port, host->ptype, TRUE); + port_str = get_conversation_port(NULL, host->port, host->ptype, TRUE); printf("%-20s %5s %6" G_GINT64_MODIFIER "u %9" G_GINT64_MODIFIER "u %6" G_GINT64_MODIFIER "u %9" G_GINT64_MODIFIER "u %6" G_GINT64_MODIFIER "u %9" G_GINT64_MODIFIER "u \n", diff --git a/ui/cli/tap-iousers.c b/ui/cli/tap-iousers.c index adff91b155..06f02697ac 100644 --- a/ui/cli/tap-iousers.c +++ b/ui/cli/tap-iousers.c @@ -101,12 +101,12 @@ iousers_draw(void *arg) if (tot_frames == last_frames) { /* XXX - TODO: make name / port resolution configurable (through gbl_resolv_flags?) */ - src_addr = (char*)get_conversation_address(NULL, &iui->src_address, TRUE); - dst_addr = (char*)get_conversation_address(NULL, &iui->dst_address, TRUE); + src_addr = get_conversation_address(NULL, &iui->src_address, TRUE); + dst_addr = get_conversation_address(NULL, &iui->dst_address, TRUE); if (display_ports) { char *src, *dst, *src_port, *dst_port; - src_port = (char*)get_conversation_port(NULL, iui->src_port, iui->ptype, TRUE); - dst_port = (char*)get_conversation_port(NULL, iui->dst_port, iui->ptype, TRUE); + src_port = get_conversation_port(NULL, iui->src_port, iui->ptype, TRUE); + dst_port = get_conversation_port(NULL, iui->dst_port, iui->ptype, TRUE); src = wmem_strconcat(NULL, src_addr, ":", src_port, NULL); dst = wmem_strconcat(NULL, dst_addr, ":", dst_port, NULL); printf("%-26s <-> %-26s %6" G_GINT64_MODIFIER "u %9" G_GINT64_MODIFIER diff --git a/ui/gtk/conversations_table.c b/ui/gtk/conversations_table.c index 91e4ab13b0..7fc02e2eb0 100644 --- a/ui/gtk/conversations_table.c +++ b/ui/gtk/conversations_table.c @@ -1597,10 +1597,10 @@ draw_ct_table_addresses(conversations_table *ct) gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, CONV_INDEX_COLUMN, &idx, -1); conv_item = &g_array_index(ct->hash.conv_array, conv_item_t, idx); - src_addr = (char*)get_conversation_address(NULL, &conv_item->src_address, ct->resolve_names); - dst_addr = (char*)get_conversation_address(NULL, &conv_item->dst_address, ct->resolve_names); - src_port = (char*)get_conversation_port(NULL, conv_item->src_port, conv_item->ptype, ct->resolve_names); - dst_port = (char*)get_conversation_port(NULL, conv_item->dst_port, conv_item->ptype, ct->resolve_names); + src_addr = get_conversation_address(NULL, &conv_item->src_address, ct->resolve_names); + dst_addr = get_conversation_address(NULL, &conv_item->dst_address, ct->resolve_names); + src_port = get_conversation_port(NULL, conv_item->src_port, conv_item->ptype, ct->resolve_names); + dst_port = get_conversation_port(NULL, conv_item->dst_port, conv_item->ptype, ct->resolve_names); gtk_list_store_set (store, &iter, CONV_COLUMN_SRC_ADDR, src_addr, CONV_COLUMN_SRC_PORT, src_port, @@ -1718,10 +1718,10 @@ draw_ct_table_data(conversations_table *ct) } else { char *src_addr, *dst_addr, *src_port, *dst_port; - src_addr = (char*)get_conversation_address(NULL, &conv_item->src_address, ct->resolve_names); - dst_addr = (char*)get_conversation_address(NULL, &conv_item->dst_address, ct->resolve_names); - src_port = (char*)get_conversation_port(NULL, conv_item->src_port, conv_item->ptype, ct->resolve_names); - dst_port = (char*)get_conversation_port(NULL, conv_item->dst_port, conv_item->ptype, ct->resolve_names); + src_addr = get_conversation_address(NULL, &conv_item->src_address, ct->resolve_names); + dst_addr = get_conversation_address(NULL, &conv_item->dst_address, ct->resolve_names); + src_port = get_conversation_port(NULL, conv_item->src_port, conv_item->ptype, ct->resolve_names); + dst_port = get_conversation_port(NULL, conv_item->dst_port, conv_item->ptype, ct->resolve_names); /* New row. All entries, including fixed ones */ gtk_list_store_insert_with_values(store, &iter, G_MAXINT, CONV_COLUMN_SRC_ADDR, src_addr, diff --git a/ui/gtk/hostlist_table.c b/ui/gtk/hostlist_table.c index 5669510395..e65f227392 100644 --- a/ui/gtk/hostlist_table.c +++ b/ui/gtk/hostlist_table.c @@ -224,7 +224,7 @@ hostlist_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint c } host = &g_array_index(hl->hash.conv_array, hostlist_talker_t, idx); - str = (char*)get_hostlist_filter(host); + str = get_hostlist_filter(host); apply_selected_filter (callback_action, str); @@ -481,8 +481,8 @@ draw_hostlist_table_addresses(hostlist_table *hl) gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, ENDP_INDEX_COLUMN, &idx, -1); host = &g_array_index(hl->hash.conv_array, hostlist_talker_t, idx); - addr_str = (char*)get_conversation_address(NULL, &host->myaddress, hl->resolve_names); - port_str = (char*)get_conversation_port(NULL, host->port, host->ptype, hl->resolve_names); + addr_str = get_conversation_address(NULL, &host->myaddress, hl->resolve_names); + port_str = get_conversation_port(NULL, host->port, host->ptype, hl->resolve_names); gtk_list_store_set (store, &iter, ENDP_COLUMN_ADDR, addr_str, ENDP_COLUMN_PORT, port_str, @@ -601,8 +601,8 @@ draw_hostlist_table_data(hostlist_table *hl) } #endif /* HAVE_GEOIP */ - addr_str = (char*)get_conversation_address(NULL, &host->myaddress, hl->resolve_names); - port_str = (char*)get_conversation_port(NULL, host->port, host->ptype, hl->resolve_names); + addr_str = get_conversation_address(NULL, &host->myaddress, hl->resolve_names); + port_str = get_conversation_port(NULL, host->port, host->ptype, hl->resolve_names); gtk_list_store_insert_with_values( store, &iter, G_MAXINT, ENDP_COLUMN_ADDR, addr_str, ENDP_COLUMN_PORT, port_str, diff --git a/ui/gtk/wlan_stat_dlg.c b/ui/gtk/wlan_stat_dlg.c index a1693db63e..4965a9cd59 100644 --- a/ui/gtk/wlan_stat_dlg.c +++ b/ui/gtk/wlan_stat_dlg.c @@ -516,7 +516,7 @@ wlanstat_draw_details(wlanstat_t *hs, wlan_ep_t *wlan_ep, gboolean clear) f = 0.0f; } - addr_str = (char*)get_conversation_address(NULL, &tmp->addr, hs->resolve_names); + addr_str = get_conversation_address(NULL, &tmp->addr, hs->resolve_names); if (basestation_flag) { g_strlcpy (comment, "Base station", sizeof(comment)); @@ -581,7 +581,7 @@ wlanstat_draw(void *phs) tmp->type[MGT_PROBE_RESP] - tmp->type[MGT_AUTHENTICATION] - tmp->type[MGT_DEAUTHENTICATION]; f = (float)(((float)tmp->number_of_packets * 100.0) / hs->number_of_packets); - bssid = (char*)get_conversation_address(NULL, &tmp->bssid, hs->resolve_names); + bssid = get_conversation_address(NULL, &tmp->bssid, hs->resolve_names); if (tmp->stats.channel) { g_snprintf (channel, sizeof(channel), "%u", tmp->stats.channel); } else { diff --git a/ui/qt/conversation_dialog.cpp b/ui/qt/conversation_dialog.cpp index 599bf4c545..bec94d3118 100644 --- a/ui/qt/conversation_dialog.cpp +++ b/ui/qt/conversation_dialog.cpp @@ -346,10 +346,10 @@ public: return; } - src_addr = (char*)get_conversation_address(NULL, &conv_item->src_address, resolve_names); - dst_addr = (char*)get_conversation_address(NULL, &conv_item->dst_address, resolve_names); - src_port = (char*)get_conversation_port(NULL, conv_item->src_port, conv_item->ptype, resolve_names); - dst_port = (char*)get_conversation_port(NULL, conv_item->dst_port, conv_item->ptype, resolve_names); + src_addr = get_conversation_address(NULL, &conv_item->src_address, resolve_names); + dst_addr = get_conversation_address(NULL, &conv_item->dst_address, resolve_names); + src_port = get_conversation_port(NULL, conv_item->src_port, conv_item->ptype, resolve_names); + dst_port = get_conversation_port(NULL, conv_item->dst_port, conv_item->ptype, resolve_names); setText(CONV_COLUMN_SRC_ADDR, src_addr); setText(CONV_COLUMN_SRC_PORT, src_port); setText(CONV_COLUMN_DST_ADDR, dst_addr); @@ -403,14 +403,14 @@ public: switch (col) { case CONV_COLUMN_SRC_ADDR: { - char* addr_str = (char*)get_conversation_address(NULL, &conv_item->src_address, resolve_names); + char* addr_str = get_conversation_address(NULL, &conv_item->src_address, resolve_names); QString q_addr_str(addr_str); wmem_free(NULL, addr_str); return q_addr_str; } case CONV_COLUMN_SRC_PORT: if (resolve_names) { - char* port_str = (char*)get_conversation_port(NULL, conv_item->src_port, conv_item->ptype, resolve_names); + char* port_str = get_conversation_port(NULL, conv_item->src_port, conv_item->ptype, resolve_names); QString q_port_str(port_str); wmem_free(NULL, port_str); return q_port_str; @@ -419,14 +419,14 @@ public: } case CONV_COLUMN_DST_ADDR: { - char* addr_str = (char*)get_conversation_address(NULL, &conv_item->dst_address, resolve_names); + char* addr_str = get_conversation_address(NULL, &conv_item->dst_address, resolve_names); QString q_addr_str(addr_str); wmem_free(NULL, addr_str); return q_addr_str; } case CONV_COLUMN_DST_PORT: if (resolve_names) { - char* port_str = (char*)get_conversation_port(NULL, conv_item->dst_port, conv_item->ptype, resolve_names); + char* port_str = get_conversation_port(NULL, conv_item->dst_port, conv_item->ptype, resolve_names); QString q_port_str(port_str); wmem_free(NULL, port_str); return q_port_str; @@ -707,7 +707,7 @@ void ConversationTreeWidget::filterActionTriggered() return; } - char* tmp_str = (char*)get_conversation_filter(conv_item, fad_to_cd_[fa->actionDirection()]); + char* tmp_str = get_conversation_filter(conv_item, fad_to_cd_[fa->actionDirection()]); QString filter(tmp_str); g_free(tmp_str); diff --git a/ui/qt/endpoint_dialog.cpp b/ui/qt/endpoint_dialog.cpp index cdd1681dad..af99f3da51 100644 --- a/ui/qt/endpoint_dialog.cpp +++ b/ui/qt/endpoint_dialog.cpp @@ -237,8 +237,8 @@ public: return; } - addr_str = (char*)get_conversation_address(NULL, &endp_item->myaddress, resolve_names); - port_str = (char*)get_conversation_port(NULL, endp_item->port, endp_item->ptype, resolve_names); + addr_str = get_conversation_address(NULL, &endp_item->myaddress, resolve_names); + port_str = get_conversation_port(NULL, endp_item->port, endp_item->ptype, resolve_names); setText(ENDP_COLUMN_ADDR, addr_str); setText(ENDP_COLUMN_PORT, port_str); wmem_free(NULL, addr_str); @@ -295,14 +295,14 @@ public: switch (col) { case ENDP_COLUMN_ADDR: { - char* addr_str = (char*)get_conversation_address(NULL, &endp_item->myaddress, resolve_names); + char* addr_str = get_conversation_address(NULL, &endp_item->myaddress, resolve_names); QString q_addr_str(addr_str); wmem_free(NULL, addr_str); return q_addr_str; } case ENDP_COLUMN_PORT: if (resolve_names) { - char* port_str = (char*)get_conversation_port(NULL, endp_item->port, endp_item->ptype, resolve_names); + char* port_str = get_conversation_port(NULL, endp_item->port, endp_item->ptype, resolve_names); QString q_port_str(port_str); wmem_free(NULL, port_str); return q_port_str; |