diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-10-21 12:04:16 -0700 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-10-22 11:45:56 +0000 |
| commit | 86fe2be4dc2f5f5ff09e0d6c00277d7a9bf09ffd (patch) | |
| tree | 4aca52419f6ee7dc9a58ca8e4cd79fbeaa8d3387 /epan/dissectors/packet-mp2t.c | |
| parent | 9eda98dec91931588a003a6f707c4e2097369ba1 (diff) | |
Use address functions instead of ADDRESS macros in asn1 and epan
Replace CMP_ADDRESS, COPY_ADDRESS, et al with their lower-case
equivalents in the asn1 and epan directories.
Change-Id: I4043b0931d4353d60cffbd829e30269eb8d08cf4
Reviewed-on: https://code.wireshark.org/review/11200
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-mp2t.c')
| -rw-r--r-- | epan/dissectors/packet-mp2t.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-mp2t.c b/epan/dissectors/packet-mp2t.c index 96d1eb1959..233b5fc2e3 100644 --- a/epan/dissectors/packet-mp2t.c +++ b/epan/dissectors/packet-mp2t.c @@ -529,14 +529,14 @@ mp2t_fragment_handle(tvbuff_t *tvb, guint offset, packet_info *pinfo, save_fragmented = pinfo->fragmented; pinfo->fragmented = TRUE; - COPY_ADDRESS_SHALLOW(&save_src, &pinfo->src); - COPY_ADDRESS_SHALLOW(&save_dst, &pinfo->dst); + copy_address_shallow(&save_src, &pinfo->src); + copy_address_shallow(&save_dst, &pinfo->dst); /* It's possible that a fragment in the same packet set an address already * This will change the hash value, we need to make sure it's NULL */ - SET_ADDRESS(&pinfo->src, mp2t_no_address_type, 0, NULL); - SET_ADDRESS(&pinfo->dst, mp2t_no_address_type, 0, NULL); + set_address(&pinfo->src, mp2t_no_address_type, 0, NULL); + set_address(&pinfo->dst, mp2t_no_address_type, 0, NULL); /* check length; send frame for reassembly */ frag_msg = fragment_add_check(&mp2t_reassembly_table, @@ -550,8 +550,8 @@ mp2t_fragment_handle(tvbuff_t *tvb, guint offset, packet_info *pinfo, frag_msg, &mp2t_msg_frag_items, NULL, tree); - COPY_ADDRESS_SHALLOW(&pinfo->src, &save_src); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &save_dst); + copy_address_shallow(&pinfo->src, &save_src); + copy_address_shallow(&pinfo->dst, &save_dst); if (new_tvb) { /* ti = */ proto_tree_add_item(tree, hf_msg_ts_packet_reassembled, tvb, 0, 0, ENC_NA); |