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/tap-rtp-common.c | |
| parent | 86fe2be4dc2f5f5ff09e0d6c00277d7a9bf09ffd (diff) | |
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/tap-rtp-common.c')
| -rw-r--r-- | ui/tap-rtp-common.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ui/tap-rtp-common.c b/ui/tap-rtp-common.c index f4a5b1aea3..2643ee343d 100644 --- a/ui/tap-rtp-common.c +++ b/ui/tap-rtp-common.c @@ -65,9 +65,9 @@ static gint rtp_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) && (a->ssrc == b->ssrc)) return 0; @@ -208,9 +208,9 @@ int rtpstream_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, con /* gather infos on the stream this packet is part of */ memset(&new_stream_info, 0, sizeof(rtp_stream_info_t)); - COPY_ADDRESS(&(new_stream_info.src_addr), &(pinfo->src)); + copy_address(&(new_stream_info.src_addr), &(pinfo->src)); new_stream_info.src_port = pinfo->srcport; - COPY_ADDRESS(&(new_stream_info.dest_addr), &(pinfo->dst)); + copy_address(&(new_stream_info.dest_addr), &(pinfo->dst)); new_stream_info.dest_port = pinfo->destport; new_stream_info.ssrc = rtpinfo->info_sync_src; new_stream_info.payload_type = rtpinfo->info_payload_type; @@ -433,7 +433,7 @@ rtp_packet_analyse(tap_rtp_stat_t *statinfo, if (statinfo->first_packet) { /* Save the MAC address of the first RTP frame */ if( pinfo->dl_src.type == AT_ETHER){ - COPY_ADDRESS(&(statinfo->first_packet_mac_addr), &(pinfo->dl_src)); + copy_address(&(statinfo->first_packet_mac_addr), &(pinfo->dl_src)); } statinfo->start_seq_nr = rtpinfo->info_seq_num; statinfo->stop_seq_nr = rtpinfo->info_seq_num; @@ -469,7 +469,7 @@ rtp_packet_analyse(tap_rtp_stat_t *statinfo, /* Chek for duplicates (src mac differs from first_packet_mac_addr) */ if( pinfo->dl_src.type == AT_ETHER){ - if(!ADDRESSES_EQUAL(&(statinfo->first_packet_mac_addr), &(pinfo->dl_src))){ + if(!addresses_equal(&(statinfo->first_packet_mac_addr), &(pinfo->dl_src))){ statinfo->flags |= STAT_FLAG_DUP_PKT; statinfo->delta = current_time-(statinfo->time); return; |