diff options
| author | Andreas Leibold <andreas.leibold@harman.com> | 2016-09-12 14:51:51 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-09-25 01:11:29 +0000 |
| commit | 06b09eea72ecbfe937a89a5887274e445b4c1bbf (patch) | |
| tree | bacb67fdec6851ab0b4af373e2274c50782768a3 /epan/dissectors/packet-ieee1722.c | |
| parent | 75ae538514f55f8faa114ce31fc5a2a1d7b7ef22 (diff) | |
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>
Diffstat (limited to 'epan/dissectors/packet-ieee1722.c')
| -rw-r--r-- | epan/dissectors/packet-ieee1722.c | 4 |
1 files changed, 1 insertions, 3 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", |