diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-12-21 12:38:13 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-12-28 14:09:27 +0000 |
| commit | 1d598bbff76f915ec961d301f5eb0eef03d46d0a (patch) | |
| tree | 2908958a3f78d53a8f10036e7f8ac01ed1b390d1 /ui/gtk/sctp_assoc_analyse.c | |
| parent | 9fce4dd4cb47965870d870b77983f8d2c501c810 (diff) | |
| download | wireshark-1d598bbff76f915ec961d301f5eb0eef03d46d0a.tar.gz | |
Replace ip6_to_str and ip6_guint8_to_str with address_to_str and tvb_ip_to_str.
Change-Id: I1d258923a7a63539ec8456d3e306bca5016a1e4b
Reviewed-on: https://code.wireshark.org/review/6060
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui/gtk/sctp_assoc_analyse.c')
| -rw-r--r-- | ui/gtk/sctp_assoc_analyse.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/ui/gtk/sctp_assoc_analyse.c b/ui/gtk/sctp_assoc_analyse.c index e218f45183..35509810d0 100644 --- a/ui/gtk/sctp_assoc_analyse.c +++ b/ui/gtk/sctp_assoc_analyse.c @@ -273,14 +273,11 @@ update_analyse_dlg(struct sctp_analyse *u_data) store = (address *)(list->data); if (store->type != AT_NONE) { - if (store->type == AT_IPv4) + if ((store->type == AT_IPv4) || (store->type == AT_IPv6)) { - g_snprintf(field[0], 30, "%s", ep_address_to_str(store)); - } - else if (store->type == AT_IPv6) - { - g_snprintf(field[0], 40, "%s", ip6_to_str((const struct e_in6_addr *)(store->data))); + g_snprintf(field[0], 40, "%s", ep_address_to_str(store)); } + list_store = GTK_LIST_STORE( gtk_tree_view_get_model(GTK_TREE_VIEW(u_data->analyse_nb->page2->clist))); /* Get store */ @@ -355,14 +352,11 @@ update_analyse_dlg(struct sctp_analyse *u_data) store = (address *)(list->data); if (store->type != AT_NONE) { - if (store->type == AT_IPv4) + if ((store->type == AT_IPv4) || (store->type == AT_IPv6)) { - g_snprintf(field[0], 30, "%s", ep_address_to_str(store)); - } - else if (store->type == AT_IPv6) - { - g_snprintf(field[0], 40, "%s", ip6_to_str((const struct e_in6_addr *)(store->data))); + g_snprintf(field[0], 40, "%s", ep_address_to_str(store)); } + list_store = GTK_LIST_STORE( gtk_tree_view_get_model(GTK_TREE_VIEW(u_data->analyse_nb->page3->clist))); /* Get store */ |