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/mcast_stream.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/mcast_stream.c')
| -rw-r--r-- | ui/mcast_stream.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/mcast_stream.c b/ui/mcast_stream.c index 24546c6584..04cd9a3567 100644 --- a/ui/mcast_stream.c +++ b/ui/mcast_stream.c @@ -75,9 +75,9 @@ mcast_stream_info_cmp(gconstpointer aa, gconstpointer bb) return 0; if (a==NULL || b==NULL) return 1; - if (ADDRESSES_EQUAL(&(a->src_addr), &(b->src_addr)) + if (addresses_equal(&(a->src_addr), &(b->src_addr)) && (a->src_port == b->src_port) - && ADDRESSES_EQUAL(&(a->dest_addr), &(b->dest_addr)) + && addresses_equal(&(a->dest_addr), &(b->dest_addr)) && (a->dest_port == b->dest_port)) return 0; else @@ -178,9 +178,9 @@ mcaststream_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const } /* gather infos on the stream this packet is part of */ - COPY_ADDRESS(&(tmp_strinfo.src_addr), &(pinfo->net_src)); + copy_address(&(tmp_strinfo.src_addr), &(pinfo->net_src)); tmp_strinfo.src_port = pinfo->srcport; - COPY_ADDRESS(&(tmp_strinfo.dest_addr), &(pinfo->net_dst)); + copy_address(&(tmp_strinfo.dest_addr), &(pinfo->net_dst)); tmp_strinfo.dest_port = pinfo->destport; /* check whether we already have a stream with these parameters in the list */ |