osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

IPv6: Minor loop cleanup 

Change-Id: I73e11c353695a565d9c4222f2a3646d0530c3c40
Reviewed-on: https://code.wireshark.org/review/16482
Reviewed-by: João Valverde <j@v6e.pt>
This commit is contained in:
João Valverde 2016-07-15 22:54:59 +01:00 committed by João Valverde
parent 4bf78ca75b
commit 9dd2674fad
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/dissectors/packet-ipv6.c
View File

@ -2130,12 +2130,14 @@ dissect_ipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
save_fragmented = pinfo->fragmented;
while (loop && !show_data) {
/* Get a tvbuff for the options. */
advance = 0;
options_tvb = tvb_new_subset_remaining(tvb, offset);
nxt_handle = dissector_get_uint_handle(ipv6_next_header_dissector_table, nxt);
if (nxt_handle != NULL) {
advance = call_dissector_with_data(nxt_handle, options_tvb, pinfo, ipv6_exthdr_tree, &iph);
}
if ((nxt_handle) &&
((advance = call_dissector_with_data(nxt_handle, options_tvb, pinfo, ipv6_exthdr_tree, &iph)) > 0)) {
if (advance > 0) {
nxt_saved = nxt;
nxt = tvb_get_guint8(tvb, offset);
offset += advance;