diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-10-21 11:46:49 -0700 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-10-22 11:46:12 +0000 |
| commit | d9e530bc177553c07bae7594e9b4f8e6235fc0e0 (patch) | |
| tree | 481239fdd3662cae66a4c5110b853563be7ca1cd /ui/gtk/sctp_assoc_analyse.c | |
| parent | 86fe2be4dc2f5f5ff09e0d6c00277d7a9bf09ffd (diff) | |
| download | wireshark-d9e530bc177553c07bae7594e9b4f8e6235fc0e0.tar.gz | |
Use address functions instead of ADDRESS macros in ui.
Replace CMP_ADDRESS, COPY_ADDRESS, et al with their lower-case
equivalents in the ui directory.
Change-Id: I10e95e66c8da5b880133452ebc484c53046e87ba
Reviewed-on: https://code.wireshark.org/review/11199
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 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ui/gtk/sctp_assoc_analyse.c b/ui/gtk/sctp_assoc_analyse.c index e8fb244621..8900b34b36 100644 --- a/ui/gtk/sctp_assoc_analyse.c +++ b/ui/gtk/sctp_assoc_analyse.c @@ -466,7 +466,7 @@ sctp_set_filter(GtkButton *button _U_, struct sctp_analyse *u_data) srclist = g_list_first(selected_stream->addr1); infosrc = (struct sockaddr_in *)(srclist->data); - SET_ADDRESS(&addr, AT_IPv4, 4, &(infosrc->sin_addr.s_addr)); + set_address(&addr, AT_IPv4, 4, &(infosrc->sin_addr.s_addr)); addr_str = (char*)address_to_str(NULL, &addr); gstring = g_string_new(g_strdup_printf( "((sctp.srcport==%u && sctp.dstport==%u && (ip.src==%s", @@ -479,7 +479,7 @@ sctp_set_filter(GtkButton *button _U_, struct sctp_analyse *u_data) while (srclist) { infosrc = (struct sockaddr_in *)(srclist->data); - SET_ADDRESS(&addr, AT_IPv4, 4, &(infosrc->sin_addr.s_addr)); + set_address(&addr, AT_IPv4, 4, &(infosrc->sin_addr.s_addr)); addr_str = (char*)address_to_str(NULL, &addr); str = g_strdup_printf("|| ip.src==%s", addr_str); g_string_append(gstring, str); @@ -489,7 +489,7 @@ sctp_set_filter(GtkButton *button _U_, struct sctp_analyse *u_data) dstlist = g_list_first(selected_stream->addr2); infodst = (struct sockaddr_in *)(dstlist->data); - SET_ADDRESS(&addr, AT_IPv4, 4, &(infodst->sin_addr.s_addr)); + set_address(&addr, AT_IPv4, 4, &(infodst->sin_addr.s_addr)); addr_str = (char*)address_to_str(NULL, &addr); str = g_strdup_printf(") && (ip.dst==%s", addr_str); g_string_append(gstring, str); @@ -499,7 +499,7 @@ sctp_set_filter(GtkButton *button _U_, struct sctp_analyse *u_data) while (dstlist) { infodst = (struct sockaddr_in *)(dstlist->data); - SET_ADDRESS(&addr, AT_IPv4, 4, &(infodst->sin_addr.s_addr)); + set_address(&addr, AT_IPv4, 4, &(infodst->sin_addr.s_addr)); addr_str = (char*)address_to_str(NULL, &addr); str = g_strdup_printf("|| ip.dst==%s", addr_str); g_string_append(gstring, str); @@ -509,7 +509,7 @@ sctp_set_filter(GtkButton *button _U_, struct sctp_analyse *u_data) srclist = g_list_first(selected_stream->addr1); infosrc = (struct sockaddr_in *)(srclist->data); - SET_ADDRESS(&addr, AT_IPv4, 4, &(infosrc->sin_addr.s_addr)); + set_address(&addr, AT_IPv4, 4, &(infosrc->sin_addr.s_addr)); addr_str = (char*)address_to_str(NULL, &addr); str = g_strdup_printf(")) || (sctp.dstport==%u && sctp.srcport==%u && (ip.dst==%s", selected_stream->port1, @@ -522,7 +522,7 @@ sctp_set_filter(GtkButton *button _U_, struct sctp_analyse *u_data) while (srclist) { infosrc = (struct sockaddr_in *)(srclist->data); - SET_ADDRESS(&addr, AT_IPv4, 4, &(infosrc->sin_addr.s_addr)); + set_address(&addr, AT_IPv4, 4, &(infosrc->sin_addr.s_addr)); addr_str = (char*)address_to_str(NULL, &addr); str = g_strdup_printf("|| ip.dst==%s", addr_str); g_string_append(gstring, str); @@ -532,7 +532,7 @@ sctp_set_filter(GtkButton *button _U_, struct sctp_analyse *u_data) dstlist = g_list_first(selected_stream->addr2); infodst = (struct sockaddr_in *)(dstlist->data); - SET_ADDRESS(&addr, AT_IPv4, 4, &(infodst->sin_addr.s_addr)); + set_address(&addr, AT_IPv4, 4, &(infodst->sin_addr.s_addr)); addr_str = (char*)address_to_str(NULL, &addr); str = g_strdup_printf(") && (ip.src==%s", addr_str); g_string_append(gstring, str); @@ -541,7 +541,7 @@ sctp_set_filter(GtkButton *button _U_, struct sctp_analyse *u_data) while (dstlist) { infodst = (struct sockaddr_in *)(dstlist->data); - SET_ADDRESS(&addr, AT_IPv4, 4, &(infodst->sin_addr.s_addr)); + set_address(&addr, AT_IPv4, 4, &(infodst->sin_addr.s_addr)); addr_str = (char*)address_to_str(NULL, &addr); str = g_strdup_printf("|| ip.src==%s", addr_str); g_string_append(gstring, str); |