diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2015-10-29 03:12:53 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-03 12:20:34 +0000 |
| commit | 3df2333155abf8fdfdedc51aca0fe962499f10b5 (patch) | |
| tree | f241cb1777aaf99492eeb12c8365c96e705cfe4e /epan/dissectors/packet-ieee80211.c | |
| parent | 8571dbb908e13d63a80e6465ea19566162dad9c1 (diff) | |
| download | wireshark-3df2333155abf8fdfdedc51aca0fe962499f10b5.tar.gz | |
Remaining ADDRESS macro to address function conversions
Change-Id: I8bc9af431e70243b05f4f0ce8c2b8ee451383788
Reviewed-on: https://code.wireshark.org/review/11463
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 48eb4c0afd..0b6d1759e9 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -16372,7 +16372,7 @@ set_src_addr_cols(packet_info *pinfo, tvbuff_t *tvb, int offset, const char *typ { address ether_addr; - TVB_SET_ADDRESS(ðer_addr, AT_ETHER, tvb, offset, 6); + set_address_tvb(ðer_addr, AT_ETHER, 6, tvb, offset); col_add_fstr(pinfo->cinfo, COL_RES_DL_SRC, "%s (%s)", address_with_resolution_to_str(wmem_packet_scope(), ðer_addr), type); @@ -16383,7 +16383,7 @@ set_dst_addr_cols(packet_info *pinfo, tvbuff_t *tvb, int offset, const char *typ { address ether_addr; - TVB_SET_ADDRESS(ðer_addr, AT_ETHER, tvb, offset, 6); + set_address_tvb(ðer_addr, AT_ETHER, 6, tvb, offset); col_add_fstr(pinfo->cinfo, COL_RES_DL_DST, "%s (%s)", address_with_resolution_to_str(wmem_packet_scope(), ðer_addr), type); @@ -16697,13 +16697,13 @@ 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); + set_address_tvb(&pinfo->dl_src, wlan_address_type, 6, tvb, 10); copy_address_shallow(&pinfo->src, &pinfo->dl_src); - TVB_SET_ADDRESS(&pinfo->dl_dst, wlan_address_type, tvb, 4, 6); + set_address_tvb(&pinfo->dl_dst, wlan_address_type, 6, tvb, 4); copy_address_shallow(&pinfo->dst, &pinfo->dl_dst); /* for tap */ - TVB_SET_ADDRESS(&whdr->bssid, wlan_bssid_address_type, tvb, 16, 6); + set_address_tvb(&whdr->bssid, wlan_bssid_address_type, 6, tvb, 16); copy_address_shallow(&whdr->src, &pinfo->dl_src); copy_address_shallow(&whdr->dst, &pinfo->dl_dst); @@ -17365,13 +17365,13 @@ dissect_ieee80211_common (tvbuff_t *tvb, packet_info *pinfo, - TVB_SET_ADDRESS(&pinfo->dl_src, wlan_address_type, tvb, sa_offset, 6); + set_address_tvb(&pinfo->dl_src, wlan_address_type, 6, tvb, sa_offset); copy_address_shallow(&pinfo->src, &pinfo->dl_src); - TVB_SET_ADDRESS(&pinfo->dl_dst, wlan_address_type, tvb, da_offset, 6); + set_address_tvb(&pinfo->dl_dst, wlan_address_type, 6, tvb, da_offset); copy_address_shallow(&pinfo->dst, &pinfo->dl_dst); /* for tap */ - TVB_SET_ADDRESS(&whdr->bssid, wlan_bssid_address_type, tvb, bssid_offset, 6); + set_address_tvb(&whdr->bssid, wlan_bssid_address_type, 6, tvb, bssid_offset); copy_address_shallow(&whdr->src, &pinfo->dl_src); copy_address_shallow(&whdr->dst, &pinfo->dl_dst); |