Wireshark-commits: [Wireshark-commits] master-2.0 291e7db: frame_data: Reset subnum if visited is r
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Wed, 28 Oct 2015 13:57:36 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=291e7db722c6b3bcab78340c56b67aefacd1abe7
Submitter: Pascal Quantin (pascal.quantin@xxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

291e7db by Roland Knall (roland.knall@xxxxxxxxxxxxxxxxx):

    frame_data: Reset subnum if visited is resetted
    
     subnum get's resetted when the file is reloaded. But subnum
     does not get resetted, if for instance a preference has been
     set directly via (Protocol Name)->Protocol Preferences-> ...
     in the Protocol list. But flags.visited get's resetted.
    
     This leads to the scenario, where reloading a trace starts subnum
     with 0 and applying a preference starts subnum with the highest
     value it had before.
    
     This patch ensures, that all methods for reloading the frame
     lead to the same init value
    
    Change-Id: I167d1e03f7e2e6c60492f501ee5cb9555ac12ac9
    Reviewed-on: https://code.wireshark.org/review/11341
    Reviewed-by: Roland Knall <rknall@xxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    (cherry picked from commit d1f0e7273401e1470b8ed919961e6989eab1f986)
    Reviewed-on: https://code.wireshark.org/review/11356
    

Actions performed:

    from  0ce9983   USB COM: revert ga618f1c change now that g5e8c629 is merged
    adds  291e7db   frame_data: Reset subnum if visited is resetted


Summary of changes:
 epan/frame_data.c |    1 +
 1 file changed, 1 insertion(+)