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-socks.c | |
| parent | 8571dbb908e13d63a80e6465ea19566162dad9c1 (diff) | |
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-socks.c')
| -rw-r--r-- | epan/dissectors/packet-socks.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-socks.c b/epan/dissectors/packet-socks.c index 01f67fb9f8..f69d69f5d5 100644 --- a/epan/dissectors/packet-socks.c +++ b/epan/dissectors/packet-socks.c @@ -295,16 +295,16 @@ static int get_address_v5(tvbuff_t *tvb, int offset, { case 1: /* IPv4 address */ if ( hash_info) { - TVB_SET_ADDRESS(&addr, AT_IPv4, tvb, offset, 4); - WMEM_COPY_ADDRESS(wmem_file_scope(), &hash_info->dst_addr, &addr); + set_address_tvb(&addr, AT_IPv4, 4, tvb, offset); + copy_address_wmem(wmem_file_scope(), &hash_info->dst_addr, &addr); } offset += 4; break; case 4: /* IPv6 address */ if ( hash_info) { - TVB_SET_ADDRESS(&addr, AT_IPv6, tvb, offset, 16); - WMEM_COPY_ADDRESS(wmem_file_scope(), &hash_info->dst_addr, &addr); + set_address_tvb(&addr, AT_IPv6, 16, tvb, offset); + copy_address_wmem(wmem_file_scope(), &hash_info->dst_addr, &addr); } offset += 16; break; @@ -698,8 +698,8 @@ state_machine_v4( socks_hash_entry_t *hash_info, tvbuff_t *tvb, hash_info->port = tvb_get_ntohs(tvb, offset + 2); /* get remote address */ - TVB_SET_ADDRESS(&addr, AT_IPv4, tvb, offset, 4); - WMEM_COPY_ADDRESS(wmem_file_scope(), &hash_info->dst_addr, &addr); + set_address_tvb(&addr, AT_IPv4, 4, tvb, offset); + copy_address_wmem(wmem_file_scope(), &hash_info->dst_addr, &addr); hash_info->clientState = clientDone; } |