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-ieee80211.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-ieee80211.c')
| -rw-r--r-- | epan/dissectors/packet-ieee80211.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 2f281be87a..d077b42b73 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -16697,14 +16697,14 @@ dissect_ieee80211_common (tvbuff_t *tvb, packet_info *pinfo, * All management frame types have the same header. */ TVB_SET_ADDRESS(&pinfo->dl_src, wlan_address_type, tvb, 10, 6); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->dl_src); + copy_address_shallow(&pinfo->src, &pinfo->dl_src); TVB_SET_ADDRESS(&pinfo->dl_dst, wlan_address_type, tvb, 4, 6); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->dl_dst); + copy_address_shallow(&pinfo->dst, &pinfo->dl_dst); /* for tap */ TVB_SET_ADDRESS(&whdr->bssid, wlan_bssid_address_type, tvb, 16, 6); - COPY_ADDRESS_SHALLOW(&whdr->src, &pinfo->dl_src); - COPY_ADDRESS_SHALLOW(&whdr->dst, &pinfo->dl_dst); + copy_address_shallow(&whdr->src, &pinfo->dl_src); + copy_address_shallow(&whdr->dst, &pinfo->dl_dst); seq_control = tvb_get_letohs(tvb, 22); frag_number = SEQCTL_FRAGMENT_NUMBER(seq_control); @@ -17365,15 +17365,15 @@ dissect_ieee80211_common (tvbuff_t *tvb, packet_info *pinfo, TVB_SET_ADDRESS(&pinfo->dl_src, wlan_address_type, tvb, sa_offset, 6); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->dl_src); + copy_address_shallow(&pinfo->src, &pinfo->dl_src); TVB_SET_ADDRESS(&pinfo->dl_dst, wlan_address_type, tvb, da_offset, 6); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->dl_dst); + copy_address_shallow(&pinfo->dst, &pinfo->dl_dst); /* for tap */ TVB_SET_ADDRESS(&whdr->bssid, wlan_bssid_address_type, tvb, bssid_offset, 6); - COPY_ADDRESS_SHALLOW(&whdr->src, &pinfo->dl_src); - COPY_ADDRESS_SHALLOW(&whdr->dst, &pinfo->dl_dst); + copy_address_shallow(&whdr->src, &pinfo->dl_src); + copy_address_shallow(&whdr->dst, &pinfo->dl_dst); seq_control = tvb_get_letohs(tvb, 22); frag_number = SEQCTL_FRAGMENT_NUMBER(seq_control); |