forked from osmocom/wireshark
Changes to 1722.1 / MAAP to work with 1722 draft15
The C/D control flag was integrated in the subtype field of 1722 after draft 6. These changes are now added to the 1722-1 and MAAP protocol. Change-Id: I19b2e8237fb87d42ec7bcb6f9f53e8cc8605731d Reviewed-on: https://code.wireshark.org/review/17664 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
parent
75ae538514
commit
06b09eea72
|
@ -51,7 +51,6 @@ void proto_reg_handoff_1722_aaf(void);
|
|||
void proto_register_1722_61883(void);
|
||||
void proto_reg_handoff_1722_61883(void);
|
||||
|
||||
|
||||
/**************************************************************************************************/
|
||||
/* 1722 */
|
||||
/* */
|
||||
|
@ -63,7 +62,6 @@ void proto_reg_handoff_1722_61883(void);
|
|||
/* Bit Field Masks */
|
||||
#define IEEE_1722_SV_MASK 0x80
|
||||
#define IEEE_1722_VER_MASK 0x70
|
||||
#define IEEE_1722_SUBTYPE_MASK 0x7F
|
||||
|
||||
/**************************************************************************************************/
|
||||
/* subtype IEC 61883 */
|
||||
|
@ -482,7 +480,7 @@ void proto_register_1722(void)
|
|||
static hf_register_info hf[] = {
|
||||
{ &hf_1722_subtype,
|
||||
{ "AVBTP Subtype", "ieee1722.subtype",
|
||||
FT_UINT8, BASE_HEX | BASE_RANGE_STRING, RVALS(subtype_range_rvals), IEEE_1722_SUBTYPE_MASK, NULL, HFILL }
|
||||
FT_UINT8, BASE_HEX | BASE_RANGE_STRING, RVALS(subtype_range_rvals), 0x00, NULL, HFILL }
|
||||
},
|
||||
{ &hf_1722_svfield,
|
||||
{ "AVTP Stream ID Valid", "ieee1722.svfield",
|
||||
|
|
|
@ -7021,9 +7021,9 @@ proto_reg_handoff_17221(void)
|
|||
/* avb17221_handle = find_dissector("ieee1722"); */
|
||||
|
||||
avb17221_handle = create_dissector_handle(dissect_17221, proto_17221);
|
||||
dissector_add_uint("ieee1722.subtype", 0x7A, avb17221_handle);
|
||||
dissector_add_uint("ieee1722.subtype", 0x7B, avb17221_handle);
|
||||
dissector_add_uint("ieee1722.subtype", 0x7C, avb17221_handle);
|
||||
dissector_add_uint("ieee1722.subtype", 0xFA, avb17221_handle);
|
||||
dissector_add_uint("ieee1722.subtype", 0xFB, avb17221_handle);
|
||||
dissector_add_uint("ieee1722.subtype", 0xFC, avb17221_handle);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -214,7 +214,7 @@ proto_reg_handoff_maap(void)
|
|||
dissector_handle_t maap_handle;
|
||||
|
||||
maap_handle = create_dissector_handle(dissect_maap, proto_maap);
|
||||
dissector_add_uint("ieee1722.subtype", 0x7E, maap_handle);
|
||||
dissector_add_uint("ieee1722.subtype", 0xFE, maap_handle);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in New Issue