From 06b09eea72ecbfe937a89a5887274e445b4c1bbf Mon Sep 17 00:00:00 2001 From: Andreas Leibold Date: Mon, 12 Sep 2016 14:51:51 +0200 Subject: [PATCH] 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 Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- epan/dissectors/packet-ieee1722.c | 4 +--- epan/dissectors/packet-ieee17221.c | 6 +++--- epan/dissectors/packet-maap.c | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/epan/dissectors/packet-ieee1722.c b/epan/dissectors/packet-ieee1722.c index a2cdb2c414..9c5df24fe7 100644 --- a/epan/dissectors/packet-ieee1722.c +++ b/epan/dissectors/packet-ieee1722.c @@ -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", diff --git a/epan/dissectors/packet-ieee17221.c b/epan/dissectors/packet-ieee17221.c index 5959285340..0ff1f95c2b 100644 --- a/epan/dissectors/packet-ieee17221.c +++ b/epan/dissectors/packet-ieee17221.c @@ -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); } /* diff --git a/epan/dissectors/packet-maap.c b/epan/dissectors/packet-maap.c index 7459ba812a..c741f2fcac 100644 --- a/epan/dissectors/packet-maap.c +++ b/epan/dissectors/packet-maap.c @@ -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); } /*