Wireshark-commits: [Wireshark-commits] master 1d7bcb2: Fix 'Decode As' when used with IPv6-in-IPv6
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sat, 19 Sep 2015 09:28:26 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=1d7bcb28f9d12a8da68b9af5517478c8968da9cc
Submitter: Pascal Quantin (pascal.quantin@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

1d7bcb2 by Pascal Quantin (pascal.quantin@xxxxxxxxx):

    Fix 'Decode As' when used with IPv6-in-IPv6 packets
    
    Add the ability to identify an instance of the dissector table to be modified by 'Decode As' thanks to pinfo->curr_layer_num
    For now only IPv6 makes use of it but it could be extended to any other protocol
    Also get rid of ipv6.nxt protocol: it is not required for 'Decode As' functionality and was colliding with ipv6.nxt field
    
    Change-Id: I3c7403c77328ad7170e13af028d178f962a2b508
    Reviewed-on: https://code.wireshark.org/review/10552
    Petri-Dish: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: João Valverde <j@xxxxxx>
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    

Actions performed:

    from  608029b   Fix more signal+slot mismatches.
    adds  1d7bcb2   Fix 'Decode As' when used with IPv6-in-IPv6 packets


Summary of changes:
 epan/dissectors/packet-ipv6.c |   21 +++++++--------------
 ui/gtk/decode_as_dlg.c        |   19 +++++++++++++++----
 ui/qt/decode_as_dialog.cpp    |   27 +++++++++++++++++++++++++--
 3 files changed, 47 insertions(+), 20 deletions(-)