Wireshark-commits: [Wireshark-commits] lts-1.12.1 5d18307: Make class "type" for USB conversations.
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=5d18307cac7be1e6cc143d216545e0319f539774
Submitter: Balint Reczey (balint@xxxxxxxxxxxxxxx)
Changed: branch: lts-1.12.1
Repository: wireshark
Commits:
5d18307 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-usb.h
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
Reviewed-on: https://code.wireshark.org/review/16120
Reviewed-by: Balint Reczey <balint@xxxxxxxxxxxxxxx>
Actions performed:
from dd47a52 SPOOLSS: Try to avoid an infinite loop.
adds 5d18307 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(-)