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-aeron.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-aeron.c')
-rw-r--r-- | epan/dissectors/packet-aeron.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-aeron.c b/epan/dissectors/packet-aeron.c index 2c7acc4fb6..d75e0b925f 100644 --- a/epan/dissectors/packet-aeron.c +++ b/epan/dissectors/packet-aeron.c @@ -895,8 +895,8 @@ static aeron_conversation_info_t * aeron_setup_conversation_info(const packet_in /* Address is even, so it's the control group (in addr1). Decrement the last byte of addr2 for the data group. */ addr2[addr_len - 1]--; } - SET_ADDRESS(cinfo->addr1, AT_IPv4, addr_len, (void *) addr1); - SET_ADDRESS(cinfo->addr2, AT_IPv4, addr_len, (void *) addr2); + set_address(cinfo->addr1, AT_IPv4, addr_len, (void *) addr1); + set_address(cinfo->addr2, AT_IPv4, addr_len, (void *) addr2); cinfo->port1 = pinfo->destport; cinfo->port2 = cinfo->port1; } @@ -952,8 +952,8 @@ static aeron_conversation_info_t * aeron_setup_conversation_info(const packet_in /* Address is even, so it's the control group (in addr1). Decrement the last byte of addr2 for the data group. */ addr2[addr_len - 1]--; } - SET_ADDRESS(cinfo->addr1, AT_IPv6, addr_len, (void *) addr1); - SET_ADDRESS(cinfo->addr2, AT_IPv6, addr_len, (void *) addr2); + set_address(cinfo->addr1, AT_IPv6, addr_len, (void *) addr1); + set_address(cinfo->addr2, AT_IPv6, addr_len, (void *) addr2); cinfo->port1 = pinfo->destport; cinfo->port2 = cinfo->port1; } |