Wireshark-commits: [Wireshark-commits] master-1.12 7f77886: Make class "type" for USB conversations

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sun, 1 May 2016 20:46:50 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=7f77886a8f3686f3885643077bbf389aea4cfd04
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

7f77886 by Michael Mann (mmann78@xxxxxxxxxxxx):

    Make class "type" for USB conversations.
    
    USB dissectors can't assume that only their class type has been passed around in the conversation.  Make explicit check that class type expected matches the dissector and stop/prevent dissection if there isn't a match.
    
    # Conflicts:
    #	epan/dissectors/packet-u3v.c
    #	epan/dissectors/packet-usb-audio.c
    
    Bug: 12356
    Change-Id: Ib23973a4ebd0fbb51952ffc118daf95e3389a209
    Reviewed-on: https://code.wireshark.org/review/15212
    Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
    Reviewed-by: Martin Kaiser <wireshark@xxxxxxxxx>
    Petri-Dish: Martin Kaiser <wireshark@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    Reviewed-on: https://code.wireshark.org/review/15214
    

Actions performed:

    from  9afb67f   [Automatic update for 2016-05-01]
    adds  7f77886   Make class "type" for USB conversations.


Summary of changes:
 epan/dissectors/packet-usb-masstorage.c |    5 ++++-
 epan/dissectors/packet-usb-video.c      |    4 ++++
 epan/dissectors/packet-usb.h            |    5 ++++-
 3 files changed, 12 insertions(+), 2 deletions(-)