osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

TN5250: Fix issue with range_string entry hiding those below. 

value_range_string error:  Video/Audio Control Data (tn5250.vac_data) hidden by earlier entry (prev="Set PIP Location and Size":  0 0x0 -> 4294967295 0xffffffff)  (this="Set PIP See Through On":  520093697 0x1f000001 -> 520093697 0x1f000001)
value_range_string error:  Video/Audio Control Data (tn5250.vac_data) hidden by earlier entry (prev="Set PIP Location and Size":  0 0x0 -> 4294967295 0xffffffff)  (this="Set PIP SeeThrough Off":  520093696 0x1f000000 -> 520093696 0x1f000000)
value_range_string error:  Video/Audio Control Data (tn5250.vac_data) hidden by earlier entry (prev="Set PIP Location and Size":  0 0x0 -> 4294967295 0xffffffff)  (this="Freeze PIP":  536870913 0x20000001 -> 536870913 0x20000001)
value_range_string error:  Video/Audio Control Data (tn5250.vac_data) hidden by earlier entry (prev="Set PIP Location and Size":  0 0x0 -> 4294967295 0xffffffff)  (this="Resume After Freeze":  536870912 0x20000000 -> 536870912 0x20000000)
value_range_string error:  Video/Audio Control Data (tn5250.vac_data) hidden by earlier entry (prev="Set PIP Location and Size":  0 0x0 -> 4294967295 0xffffffff)  (this="Set PC/TV Channel":  301989888 0x12000000 -> 301989988 0x12000064)
value_range_string error:  Video/Audio Control Data (tn5250.vac_data) hidden by earlier entry (prev="Set PIP Location and Size":  0 0x0 -> 4294967295 0xffffffff)  (this="Set Antenna Tuner Source":  285212672 0x11000000 -> 285212672 0x11000000)
value_range_string error:  Video/Audio Control Data (tn5250.vac_data) hidden by earlier entry (prev="Set PIP Location and Size":  0 0x0 -> 4294967295 0xffffffff)  (this="Set Cable Tuner Source":  285212673 0x11000001 -> 285212673 0x11000001)
value_range_string error:  Video/Audio Control Data (tn5250.vac_data) hidden by earlier entry (prev="Set PIP Location and Size":  0 0x0 -> 4294967295 0xffffffff)  (this="Disable Internal Speaker":  553648129 0x21000001 -> 553648129 0x21000001)
value_range_string error:  Video/Audio Control Data (tn5250.vac_data) hidden by earlier entry (prev="Set PIP Location and Size":  0 0x0 -> 4294967295 0xffffffff)  (this="Enable Internal  Speaker":  553648128 0x21000000 -> 553648128 0x21000000)
value_range_string error:  Video/Audio Control Data (tn5250.vac_data) hidden by earlier entry (prev="Set PIP Location and Size":  0 0x0 -> 4294967295 0xffffffff)  (this="Keyboard Disable":  385875969 0x17000001 -> 385875969 0x17000001)
value_range_string error:  Video/Audio Control Data (tn5250.vac_data) hidden by earlier entry (prev="Set PIP Location and Size":  0 0x0 -> 4294967295 0xffffffff)  (this="Keyboard Enable":  385875968 0x17000000 -> 385875968 0x17000000)
value_range_string error:  Video/Audio Control Data (tn5250.vac_data) hidden by earlier entry (prev="Set PIP Location and Size":  0 0x0 -> 4294967295 0xffffffff)  (this="Set PC/TV Brightness":  218103808 0xd000000 -> 218103908 0xd000064)
value_range_string error:  Video/Audio Control Data (tn5250.vac_data) hidden by earlier entry (prev="Set PIP Location and Size":  0 0x0 -> 4294967295 0xffffffff)  (this="Set PC/TV Color":  251658240 0xf000000 -> 251658340 0xf000064)
value_range_string error:  Video/Audio Control Data (tn5250.vac_data) hidden by earlier entry (prev="Set PIP Location and Size":  0 0x0 -> 4294967295 0xffffffff)  (this="Set PC/TV Contrast":  234881024 0xe000000 -> 234881124 0xe000064)
value_range_string error:  Video/Audio Control Data (tn5250.vac_data) hidden by earlier entry (prev="Set PIP Location and Size":  0 0x0 -> 4294967295 0xffffffff)  (this="Set PC/TV Tint":  268435456 0x10000000 -> 268461156 0x10006464)
value_range_string error:  Data Field (tn5250.dfdpck_data_field) hidden by earlier entry (prev="Invalid Data Field Type":  0 0x0 -> 64 0x40)  (this="Top Row Command Key Functions":  64 0x40 -> 64 0x40)

Change-Id: I3596fa1a62c6f0e7c115551be137162ddb6679a6
Reviewed-on: https://code.wireshark.org/review/36683
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
This commit is contained in:
Martin Mathieson 2020-04-03 10:31:32 +01:00 committed by Martin Mathieson
parent c474b70f8b
commit e97ba4b489
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-tn5250.c
View File

@ -1278,7 +1278,8 @@ static const range_string vals_tn5250_vac_data[] = {
{ 0x14000000, 0x14000000, "Turn Audio On"},
{ 0x14000001, 0x14000001, "Turn Audio Off"},
{ 0x0C000000, 0x0C000064, "Set PC/TV Volume"},
{ 0x00000000, 0xFFFFFFFF, "Set PIP Location and Size"},
/* N.B. Set PIP Location and Size was moved to last, to stop it
* from hiding everything that follows it */
{ 0x1F000001, 0x1F000001, "Set PIP See Through On"},
{ 0x1F000000, 0x1F000000, "Set PIP SeeThrough Off"},
{ 0x20000001, 0x20000001, "Freeze PIP"},
@ -1294,6 +1295,7 @@ static const range_string vals_tn5250_vac_data[] = {
{ 0x0F000000, 0x0F000064, "Set PC/TV Color"},
{ 0x0E000000, 0x0E000064, "Set PC/TV Contrast"},
{ 0x10000000, 0x10006464, "Set PC/TV Tint"},
{ 0x01010101, 0x1b841b84, "Set PIP Location and Size"}, /* Bytes are RRCCrrcc */
{ 0, 0, NULL}
};