diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2015-10-05 22:43:46 +0100 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2015-10-14 12:18:00 +0000 |
| commit | a643d14187c5a201d21bdb0786acc5e27b73a3a1 (patch) | |
| tree | b09f0b90fe25a25765fd00279f549df429119cf6 /epan/dissectors/packet-ftp.c | |
| parent | 9a702e41b052211424163829a2cb3487123b155e (diff) | |
Change proto_tree_add_ipv6() to take a struct e_in6_addr pointer
tvb_get_ipv6() takes a struct e_in6_addr *, use that here too.
Change-Id: Id8b368daa05c151a61d4bc01dc88c00da13e9c88
Reviewed-on: https://code.wireshark.org/review/10953
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
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 ec26f1a6b6..9c10089a69 100644 --- a/epan/dissectors/packet-ftp.c +++ b/epan/dissectors/packet-ftp.c @@ -783,7 +783,7 @@ dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else if (eprt_af == EPRT_AF_IPv6) { proto_tree_add_ipv6(reqresp_tree, hf_ftp_eprt_ipv6, - tvb, eprt_offset, eprt_ip_len, (const guint8 *)eprt_ipv6); + tvb, eprt_offset, eprt_ip_len, (const struct e_in6_addr *)eprt_ipv6); SET_ADDRESS(&ftp_ip_address, AT_IPv6, 16, eprt_ipv6); } eprt_offset += eprt_ip_len + 1; /* addr, 3rd delimiter */ @@ -831,7 +831,7 @@ dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) else if (ftp_ip_address.type == AT_IPv6) { addr_it = proto_tree_add_ipv6(reqresp_tree, hf_ftp_epsv_ipv6, tvb, 0, 0, - (const guint8*)ftp_ip_address.data); + (const struct e_in6_addr *)ftp_ip_address.data); PROTO_ITEM_SET_GENERATED(addr_it); } |