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-bthci_sco.c | |
| parent | 9eda98dec91931588a003a6f707c4e2097369ba1 (diff) | |
| download | wireshark-86fe2be4dc2f5f5ff09e0d6c00277d7a9bf09ffd.tar.gz | |
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-bthci_sco.c')
| -rw-r--r-- | epan/dissectors/packet-bthci_sco.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/epan/dissectors/packet-bthci_sco.c b/epan/dissectors/packet-bthci_sco.c index 4f2883ebff..81e9cc940d 100644 --- a/epan/dissectors/packet-bthci_sco.c +++ b/epan/dissectors/packet-bthci_sco.c @@ -197,23 +197,23 @@ dissect_bthci_sco(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void g_snprintf(remote_addr_name, remote_length, "%s (%s)", remote_ether_addr, remote_name); if (pinfo->p2p_dir == P2P_DIR_RECV) { - SET_ADDRESS(&pinfo->net_src, AT_STRINGZ, (int)strlen(remote_name) + 1, remote_name); - SET_ADDRESS(&pinfo->dl_src, AT_ETHER, 6, remote_bdaddr->bd_addr); - SET_ADDRESS(&pinfo->src, AT_STRINGZ, (int)strlen(remote_addr_name) + 1, remote_addr_name); + set_address(&pinfo->net_src, AT_STRINGZ, (int)strlen(remote_name) + 1, remote_name); + set_address(&pinfo->dl_src, AT_ETHER, 6, remote_bdaddr->bd_addr); + set_address(&pinfo->src, AT_STRINGZ, (int)strlen(remote_addr_name) + 1, remote_addr_name); } else if (pinfo->p2p_dir == P2P_DIR_SENT) { - SET_ADDRESS(&pinfo->net_dst, AT_STRINGZ, (int)strlen(remote_name) + 1, remote_name); - SET_ADDRESS(&pinfo->dl_dst, AT_ETHER, 6, remote_bdaddr->bd_addr); - SET_ADDRESS(&pinfo->dst, AT_STRINGZ, (int)strlen(remote_addr_name) + 1, remote_addr_name); + set_address(&pinfo->net_dst, AT_STRINGZ, (int)strlen(remote_name) + 1, remote_name); + set_address(&pinfo->dl_dst, AT_ETHER, 6, remote_bdaddr->bd_addr); + set_address(&pinfo->dst, AT_STRINGZ, (int)strlen(remote_addr_name) + 1, remote_addr_name); } } else { if (pinfo->p2p_dir == P2P_DIR_RECV) { - SET_ADDRESS(&pinfo->net_src, AT_STRINGZ, 1, ""); - SET_ADDRESS(&pinfo->dl_src, AT_STRINGZ, 1, ""); - SET_ADDRESS(&pinfo->src, AT_STRINGZ, 10, "remote ()"); + set_address(&pinfo->net_src, AT_STRINGZ, 1, ""); + set_address(&pinfo->dl_src, AT_STRINGZ, 1, ""); + set_address(&pinfo->src, AT_STRINGZ, 10, "remote ()"); } else if (pinfo->p2p_dir == P2P_DIR_SENT) { - SET_ADDRESS(&pinfo->net_dst, AT_STRINGZ, 1, ""); - SET_ADDRESS(&pinfo->dl_dst, AT_STRINGZ, 1, ""); - SET_ADDRESS(&pinfo->dst, AT_STRINGZ, 10, "remote ()"); + set_address(&pinfo->net_dst, AT_STRINGZ, 1, ""); + set_address(&pinfo->dl_dst, AT_STRINGZ, 1, ""); + set_address(&pinfo->dst, AT_STRINGZ, 10, "remote ()"); } } @@ -257,13 +257,13 @@ dissect_bthci_sco(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void g_snprintf(localhost_addr_name, localhost_length, "%s (%s)", localhost_ether_addr, localhost_name); if (pinfo->p2p_dir == P2P_DIR_RECV) { - SET_ADDRESS(&pinfo->net_dst, AT_STRINGZ, (int)strlen(localhost_name) + 1, localhost_name); - SET_ADDRESS(&pinfo->dl_dst, AT_ETHER, 6, localhost_bdaddr); - SET_ADDRESS(&pinfo->dst, AT_STRINGZ, (int)strlen(localhost_addr_name) + 1, localhost_addr_name); + set_address(&pinfo->net_dst, AT_STRINGZ, (int)strlen(localhost_name) + 1, localhost_name); + set_address(&pinfo->dl_dst, AT_ETHER, 6, localhost_bdaddr); + set_address(&pinfo->dst, AT_STRINGZ, (int)strlen(localhost_addr_name) + 1, localhost_addr_name); } else if (pinfo->p2p_dir == P2P_DIR_SENT) { - SET_ADDRESS(&pinfo->net_src, AT_STRINGZ, (int)strlen(localhost_name) + 1, localhost_name); - SET_ADDRESS(&pinfo->dl_src, AT_ETHER, 6, localhost_bdaddr); - SET_ADDRESS(&pinfo->src, AT_STRINGZ, (int)strlen(localhost_addr_name) + 1, localhost_addr_name); + set_address(&pinfo->net_src, AT_STRINGZ, (int)strlen(localhost_name) + 1, localhost_name); + set_address(&pinfo->dl_src, AT_ETHER, 6, localhost_bdaddr); + set_address(&pinfo->src, AT_STRINGZ, (int)strlen(localhost_addr_name) + 1, localhost_addr_name); } proto_tree_add_item(bthci_sco_tree, hf_bthci_sco_data, tvb, offset, tvb_reported_length(tvb), ENC_NA); |