From 692b1175e4d0493fcda0fbe8dd71ca33c2773a89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Thu, 31 Aug 2017 18:49:15 +0100 Subject: Have a single IPv6 tap MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Optimize code and open possibility for enriching IPv6 tap data. Change-Id: I5a204d7464cde32123d5bfe664cc9b6bcf08dbe1 Reviewed-on: https://code.wireshark.org/review/23340 Petri-Dish: João Valverde Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde --- epan/dissectors/packet-icmpv6.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'epan/dissectors/packet-icmpv6.c') diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c index a3f14226f6..5ba28d075a 100644 --- a/epan/dissectors/packet-icmpv6.c +++ b/epan/dissectors/packet-icmpv6.c @@ -45,7 +45,6 @@ #include #include #include -#include #include #include "packet-ber.h" @@ -3842,7 +3841,7 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) tvbuff_t *next_tvb; guint8 icmp6_type, icmp6_code; icmp_transaction_t *trans = NULL; - ws_ip *iph = (ws_ip*)data; + ws_ip6 *iph = WS_IP6_PTR(data); col_set_str(pinfo->cinfo, COL_PROTOCOL, "ICMPv6"); col_clear(pinfo->cinfo, COL_INFO); @@ -3949,7 +3948,7 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) identifier, sequence); if (iph != NULL) { col_append_fstr(pinfo->cinfo, COL_INFO, ", hop limit=%u", - iph->ip_ttl); + iph->ip6_hop); } if (pinfo->destport == 3544 && icmp6_type == ICMP6_ECHO_REQUEST) { -- cgit v1.2.3