diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2017-08-31 18:49:15 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2017-09-02 16:06:42 +0000 |
| commit | 692b1175e4d0493fcda0fbe8dd71ca33c2773a89 (patch) | |
| tree | 841058844abe1ab9deacc01c2ae2d364c99808eb /epan/dissectors/packet-icmpv6.c | |
| parent | 2330ba1b3d6e62272dbaf0d5b3b5e8481040a45f (diff) | |
Have a single IPv6 tap
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 <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'epan/dissectors/packet-icmpv6.c')
| -rw-r--r-- | epan/dissectors/packet-icmpv6.c | 5 |
1 files changed, 2 insertions, 3 deletions
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 <epan/tap.h> #include <epan/capture_dissectors.h> #include <epan/proto_data.h> -#include <epan/ipv6.h> #include <epan/strutil.h> #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) { |