aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--epan/conversation_table.c15
-rw-r--r--epan/conversation_table.h8
-rw-r--r--ui/cli/tap-endpoints.c4
-rw-r--r--ui/cli/tap-iousers.c8
-rw-r--r--ui/gtk/conversations_table.c16
-rw-r--r--ui/gtk/hostlist_table.c10
-rw-r--r--ui/gtk/wlan_stat_dlg.c4
-rw-r--r--ui/qt/conversation_dialog.cpp18
-rw-r--r--ui/qt/endpoint_dialog.cpp8
9 files changed, 46 insertions, 45 deletions
diff --git a/epan/conversation_table.c b/epan/conversation_table.c
index 04f8620001..a7e7cb1943 100644
--- a/epan/conversation_table.c
+++ b/epan/conversation_table.c
@@ -324,7 +324,7 @@ void reset_hostlist_table_data(conv_hash_t *ch)
ch->hashtable=NULL;
}
-const char *get_conversation_address(wmem_allocator_t *allocator, address *addr, gboolean resolve_names)
+char *get_conversation_address(wmem_allocator_t *allocator, address *addr, gboolean resolve_names)
{
if (resolve_names) {
return address_to_display(allocator, addr);
@@ -333,7 +333,7 @@ const char *get_conversation_address(wmem_allocator_t *allocator, address *addr,
}
}
-const char *get_conversation_port(wmem_allocator_t *allocator, guint32 port, port_type ptype, gboolean resolve_names)
+char *get_conversation_port(wmem_allocator_t *allocator, guint32 port, port_type ptype, gboolean resolve_names)
{
if(!resolve_names) ptype = PT_NONE;
@@ -396,10 +396,10 @@ ct_port_to_str(port_type ptype, guint32 port)
return NULL;
}
-const char *get_conversation_filter(conv_item_t *conv_item, conv_direction_e direction)
+char *get_conversation_filter(conv_item_t *conv_item, conv_direction_e direction)
{
char *sport, *dport, *src_addr, *dst_addr;
- const char *str = "INVALID";
+ char *str;
sport = ct_port_to_str(conv_item->ptype, conv_item->src_port);
dport = ct_port_to_str(conv_item->ptype, conv_item->dst_port);
@@ -540,6 +540,7 @@ const char *get_conversation_filter(conv_item_t *conv_item, conv_direction_e dir
);
break;
default:
+ str = wmem_strdup(NULL, "INVALID");
break;
}
g_free(sport);
@@ -549,12 +550,12 @@ const char *get_conversation_filter(conv_item_t *conv_item, conv_direction_e dir
return str;
}
-const char *get_hostlist_filter(hostlist_talker_t *host)
+char *get_hostlist_filter(hostlist_talker_t *host)
{
char *sport, *src_addr;
- const char *str;
+ char *str;
- sport=ct_port_to_str(host->ptype, host->port);
+ sport = ct_port_to_str(host->ptype, host->port);
src_addr = address_to_str(NULL, &host->myaddress);
if (host->myaddress.type == AT_STRINGZ || host->myaddress.type == AT_USB) {
char *new_addr;
diff --git a/epan/conversation_table.h b/epan/conversation_table.h
index 5c5699dad5..c0871924e2 100644
--- a/epan/conversation_table.h
+++ b/epan/conversation_table.h
@@ -258,7 +258,7 @@ WS_DLL_PUBLIC void dissector_hostlist_init(const char *opt_arg, void* userdata);
* @param resolve_names Enable name resolution.
* @return A string representing the address.
*/
-WS_DLL_PUBLIC const char *get_conversation_address(wmem_allocator_t *allocator, address *addr, gboolean resolve_names);
+WS_DLL_PUBLIC char *get_conversation_address(wmem_allocator_t *allocator, address *addr, gboolean resolve_names);
/** Get the string representation of a port.
*
@@ -268,7 +268,7 @@ WS_DLL_PUBLIC const char *get_conversation_address(wmem_allocator_t *allocator,
* @param resolve_names Enable name resolution.
* @return A string representing the port.
*/
-WS_DLL_PUBLIC const char *get_conversation_port(wmem_allocator_t *allocator, guint32 port, port_type ptype, gboolean resolve_names);
+WS_DLL_PUBLIC char *get_conversation_port(wmem_allocator_t *allocator, guint32 port, port_type ptype, gboolean resolve_names);
/** Get a display filter for the given conversation and direction.
*
@@ -276,7 +276,7 @@ WS_DLL_PUBLIC const char *get_conversation_port(wmem_allocator_t *allocator, gui
* @param direction The desired direction.
* @return An g_allocated string representing the conversation that must be freed
*/
-WS_DLL_PUBLIC const char *get_conversation_filter(conv_item_t *conv_item, conv_direction_e direction);
+WS_DLL_PUBLIC char *get_conversation_filter(conv_item_t *conv_item, conv_direction_e direction);
/** Get a display filter for the given hostlist.
*
@@ -284,7 +284,7 @@ WS_DLL_PUBLIC const char *get_conversation_filter(conv_item_t *conv_item, conv_d
* @return A string, allocated using the wmem NULL allocator,
* representing the conversation.
*/
-WS_DLL_PUBLIC const char *get_hostlist_filter(hostlist_talker_t *host);
+WS_DLL_PUBLIC char *get_hostlist_filter(hostlist_talker_t *host);
/** Add some data to the conversation table.
*
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;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 08:47:14 +0000