diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2015-10-09 10:10:31 +0100 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-10-10 18:44:26 +0000 |
| commit | 69a70df0a0fa0d9953a66222006a45af5572ff04 (patch) | |
| tree | 2cefe4a79a378d24efeda1c4c153ff48e15cfafa /epan | |
| parent | 62d901bf052c83c876f9b6b70c64a1873f44bf72 (diff) | |
IPv6: Set destination address for RPL routing header
Change-Id: I5d83370424cc0002a0bf965138b7fbdad69557fb
Reviewed-on: https://code.wireshark.org/review/10895
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-ipv6.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index e4c26b594f..0178ecabc1 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -817,11 +817,12 @@ dissect_routing6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data proto_tree *rthdr_tree; proto_item *pi, *ti, *ti_len, *ti_seg; int offset = 0; - struct e_in6_addr *addr; + struct e_in6_addr *addr, *dst_addr = NULL; guint8 addr_count; ipv6_meta_t *ipv6_info; ipv6_info = (ipv6_meta_t *)p_get_proto_data(pinfo->pool, pinfo, proto_ipv6, IPV6_PROTO_META); + /* addr contains the final destination address after dissection of a routing type is finished */ addr = wmem_new0(pinfo->pool, struct e_in6_addr); col_append_sep_str(pinfo->cinfo, COL_INFO, " , ", "IPv6 routing"); @@ -873,13 +874,12 @@ dissect_routing6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data expert_add_info(pinfo, ti, &ei_ipv6_src_route_list_multicast_addr); } } - if (rt.ip6r_segleft) - SET_ADDRESS(&pinfo->dst, AT_IPv6, IPv6_ADDR_SIZE, addr); + dst_addr = addr; } } /* Mobile IPv6 Routing Header (Type 2) */ - if (rt.ip6r_type == IPv6_RT_HEADER_MobileIP) { + else if (rt.ip6r_type == IPv6_RT_HEADER_MobileIP) { proto_tree_add_item(rthdr_tree, hf_ipv6_routing_mipv6_reserved, tvb, offset, 4, ENC_NA); offset += 4; @@ -897,13 +897,12 @@ dissect_routing6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data if (in6_is_addr_multicast(addr)) { expert_add_info(pinfo, ti, &ei_ipv6_src_route_list_multicast_addr); } - if (rt.ip6r_segleft) - SET_ADDRESS(&pinfo->dst, AT_IPv6, IPv6_ADDR_SIZE, addr); + dst_addr = addr; } } /* RPL Source Routing Header (Type 3) */ - if (rt.ip6r_type == IPv6_RT_HEADER_RPL) { + else if (rt.ip6r_type == IPv6_RT_HEADER_RPL) { guint8 cmprI; guint8 cmprE; guint8 pad; @@ -1049,10 +1048,15 @@ dissect_routing6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data expert_add_info(pinfo, ti, &ei_ipv6_src_route_list_multicast_addr); } } + dst_addr = addr; } } } + if (dst_addr != NULL && rt.ip6r_segleft > 0) { + SET_ADDRESS(&pinfo->dst, AT_IPv6, IPv6_ADDR_SIZE, dst_addr); + } + ipv6_info->exthdr_count++; return len; } |