osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

[IEEE1722] Add a range_string for the subtypes we know about. 

Ping-bug: 12490
Change-Id: I27ce4a0b870d81bfdea188f00ff8101897ad969d
Reviewed-on: https://code.wireshark.org/review/15710
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
AndersBroman 2016-06-03 12:50:33 +02:00 committed by Michael Mann
parent ae4f7e4b5b
commit 798360422b
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
epan/dissectors/packet-ieee1722.c
View File

@ -122,6 +122,24 @@ static expert_field ei_1722_incorrect_dbs = EI_INIT;
static dissector_table_t avb_dissector_table;
static const true_false_string tfs_ieee1722_control_data = { "Control", "Data" };
static const range_string ieee1722_subtype_range_vals[] = {
{ 0,0, "IEC 61883/IIDC over AVTP" },
{ 1,1, "MMA payload over AVTP" },
{ 2,2, "Simple Audio Format" },
{ 3,3, "Simple Video Format" },
{ 5,5, "CRF" },
{ 6,0x7a, "Reserved for future protocols " },
{ 0x7a,0x7a, "AVDECC Discovery Protocol" },
{ 0x7b,0x7b, "AVDECC Enumeration and Control Protocol" },
{ 0x7c,0x7c, "AVDECC Connection Management Protocol" },
{ 0x7d,0x7d, "MAAP" },
{ 0x7f,0x7f, "Experimental" },
{ 0,0, NULL }
};
static int
dissect_1722(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
{
@ -265,11 +283,11 @@ void proto_register_1722(void)
static hf_register_info hf[] = {
{ &hf_1722_cdfield,
{ "Control/Data Indicator", "ieee1722.cdfield",
FT_BOOLEAN, 8, NULL, IEEE_1722_CD_MASK, NULL, HFILL }
FT_BOOLEAN, 8, TFS(&tfs_ieee1722_control_data), IEEE_1722_CD_MASK, NULL, HFILL }
},
{ &hf_1722_subtype,
{ "AVBTP Subtype", "ieee1722.subtype",
FT_UINT8, BASE_HEX, NULL, IEEE_1722_SUBTYPE_MASK, NULL, HFILL }
FT_UINT8, BASE_HEX | BASE_RANGE_STRING, RVALS(ieee1722_subtype_range_vals), IEEE_1722_SUBTYPE_MASK, NULL, HFILL }
},
{ &hf_1722_svfield,
{ "AVBTP Stream ID Valid", "ieee1722.svfield",