diff options
author | Diederik de Groot <ddegroot@talon.nl> | 2014-08-29 01:57:03 +0200 |
---|---|---|
committer | Evan Huus <eapache@gmail.com> | 2014-08-29 17:44:41 +0000 |
commit | 0622e3439e79927ab2792923933ea329720f3e24 (patch) | |
tree | ce459b832dec07a958d6fd4333fd62450826f14f /tools | |
parent | 47f96d974caf6670926f572bd724be5973d8bb3b (diff) |
Skinny:
Fix: ensure that string created in dissect_skinny_displayLabel is always NULL terminated (Fixing Bug: 10429 (Pascal))
Fix: MiscCommandType should use videoFastUpdateGOB Union when command enum is videoFastUpdatePicture
Manual Merge PatchSet 4 (Me) and Patchset 7 (Pascal)
Fix Merged PatchSet 8 (Pascal)
Bug: 10429
Change-Id: I87bc7c6eaff976d7a70856f5fbe8c0ded6257064
Reviewed-on: https://code.wireshark.org/review/3893
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/SkinnyProtocolOptimized.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/SkinnyProtocolOptimized.xml b/tools/SkinnyProtocolOptimized.xml index 865f16c71c..30632fa897 100644 --- a/tools/SkinnyProtocolOptimized.xml +++ b/tools/SkinnyProtocolOptimized.xml @@ -3520,6 +3520,12 @@ <enum comment="" declare="yes" name="command" subtype="MiscCommandType" type="uint32"/> <union comment="" lookup_guide="command" name="u" subtype="MiscellaneousCommandMessageUnion" type="union"> <fields> + <struct comment="" lookup_eq="MiscCommandType_videoFastUpdatePicture" name="videoFastUpdatePicture" subtype="VideoFastUpdateGOB" type="struct"> + <fields> + <integer comment="" name="firstGOB" type="uint32"/> + <integer comment="" name="numberOfGOBs" type="uint32"/> + </fields> + </struct> <struct comment="" lookup_eq="MiscCommandType_videoFastUpdateGOB" name="videoFastUpdateGOB" subtype="VideoFastUpdateGOB" type="struct"> <fields> <integer comment="" name="firstGOB" type="uint32"/> |