osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Don't try to show an IP address if none is present. 

svn path=/trunk/; revision=48189
This commit is contained in:
Irene Rüngeler 2013-03-08 09:00:48 +00:00
parent d915e3c04f
commit 00d64fade2
2 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
ui/gtk/sctp_assoc_analyse.c
View File

@ -269,19 +269,21 @@ update_analyse_dlg(struct sctp_analyse *u_data)
GtkListStore *list_store;
store = (address *)(list->data);
if (store->type == AT_IPv4)
{
g_snprintf(field[0], 30, "%s", ip_to_str((const guint8 *)(store->data)));
}
else if (store->type == AT_IPv6)
{
g_snprintf(field[0], 40, "%s", ip6_to_str((const struct e_in6_addr *)(store->data)));
}
list_store = GTK_LIST_STORE(
gtk_tree_view_get_model(GTK_TREE_VIEW(u_data->analyse_nb->page2->clist))); /* Get store */
if (store->type != AT_NONE) {
if (store->type == AT_IPv4)
{
g_snprintf(field[0], 30, "%s", ip_to_str((const guint8 *)(store->data)));
}
else if (store->type == AT_IPv6)
{
g_snprintf(field[0], 40, "%s", ip6_to_str((const struct e_in6_addr *)(store->data)));
}
list_store = GTK_LIST_STORE(
gtk_tree_view_get_model(GTK_TREE_VIEW(u_data->analyse_nb->page2->clist))); /* Get store */
gtk_list_store_insert_with_values( list_store , NULL, G_MAXINT,
0, field[0], -1);
gtk_list_store_insert_with_values( list_store , NULL, G_MAXINT,
0, field[0], -1);
}
list = g_list_next(list);
}
}
@ -349,19 +351,21 @@ update_analyse_dlg(struct sctp_analyse *u_data)
GtkListStore *list_store;
store = (address *)(list->data);
if (store->type == AT_IPv4)
{
g_snprintf(field[0], 30, "%s", ip_to_str((const guint8 *)(store->data)));
}
else if (store->type == AT_IPv6)
{
g_snprintf(field[0], 40, "%s", ip6_to_str((const struct e_in6_addr *)(store->data)));
}
list_store = GTK_LIST_STORE(
gtk_tree_view_get_model(GTK_TREE_VIEW(u_data->analyse_nb->page3->clist))); /* Get store */
if (store->type != AT_NONE) {
if (store->type == AT_IPv4)
{
g_snprintf(field[0], 30, "%s", ip_to_str((const guint8 *)(store->data)));
}
else if (store->type == AT_IPv6)
{
g_snprintf(field[0], 40, "%s", ip6_to_str((const struct e_in6_addr *)(store->data)));
}
list_store = GTK_LIST_STORE(
gtk_tree_view_get_model(GTK_TREE_VIEW(u_data->analyse_nb->page3->clist))); /* Get store */
gtk_list_store_insert_with_values( list_store , NULL, G_MAXINT,
0, field[0], -1);
gtk_list_store_insert_with_values( list_store , NULL, G_MAXINT,
0, field[0], -1);
}
list = g_list_next(list);
}
}

2
ui/gtk/sctp_chunk_stat_dlg.c
View File

@ -494,6 +494,8 @@ add_to_clist(sctp_addr_chunk* sac)
g_snprintf(field[0], MAX_ADDRESS_LEN, "%s", ip_to_str((const guint8 *)(sac->addr->data)));
} else if (sac->addr->type == AT_IPv6) {
g_snprintf(field[0], MAX_ADDRESS_LEN, "%s", ip6_to_str((const struct e_in6_addr *)(sac->addr->data)));
} else {
g_snprintf(field[0], MAX_ADDRESS_LEN, "%s", "NONE");
}
gtk_list_store_insert_with_values( list_store , &iter, G_MAXINT,