diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-10-26 01:50:00 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-10-26 08:50:34 +0000 |
| commit | 458c3c026ed03d17ec7803c61981274ee4574f89 (patch) | |
| tree | 9564e9336b594296e9048893ba917025444f4d52 /epan/dissectors/packet-ftp.c | |
| parent | 0a99d3ef31611db7020d062216c856923ed29fac (diff) | |
Add a ws_in6_addr typedef for struct e_in6_addr.
That allows a parallel typedef of ws_in4_addr for guint32.
Change-Id: I03b230247065e0e3840eb87635315a8e523ef562
Reviewed-on: https://code.wireshark.org/review/24073
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-ftp.c')
| -rw-r--r-- | epan/dissectors/packet-ftp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ftp.c b/epan/dissectors/packet-ftp.c index 5be912421d..3056afd585 100644 --- a/epan/dissectors/packet-ftp.c +++ b/epan/dissectors/packet-ftp.c @@ -1157,7 +1157,7 @@ dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) } else if (eprt_af == EPRT_AF_IPv6) { proto_tree_add_ipv6(reqresp_tree, hf_ftp_eprt_ipv6, - tvb, eprt_offset, eprt_ip_len, (const struct e_in6_addr *)eprt_ipv6); + tvb, eprt_offset, eprt_ip_len, (const ws_in6_addr *)eprt_ipv6); set_address(&ftp_ip_address, AT_IPv6, 16, eprt_ipv6); } eprt_offset += eprt_ip_len + 1; /* addr, 3rd delimiter */ @@ -1199,7 +1199,7 @@ dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) else if (ftp_ip_address.type == AT_IPv6) { addr_it = proto_tree_add_ipv6(reqresp_tree, hf_ftp_epsv_ipv6, tvb, 0, 0, - (const struct e_in6_addr *)ftp_ip_address.data); + (const ws_in6_addr *)ftp_ip_address.data); PROTO_ITEM_SET_GENERATED(addr_it); } |