Wireshark-commits: [Wireshark-commits] master-2.2 2972b6c: Changes to 1722.1 / MAAP to work with 17
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=2972b6cd8357b103d448cd9d6ad5742b57452df3
Submitter: Alexis La Goutte (alexis.lagoutte@xxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark
Commits:
2972b6c by Andreas Leibold (andreas.leibold@xxxxxxxxxx):
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.
# Conflicts:
# epan/dissectors/packet-ieee1722.c
Bug: 13274
Change-Id: I19b2e8237fb87d42ec7bcb6f9f53e8cc8605731d
Reviewed-on: https://code.wireshark.org/review/17664
Petri-Dish: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
Reviewed-on: https://code.wireshark.org/review/19466
Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
Actions performed:
from ac48964 UDLD: Use correct flag bits
adds 2972b6c Changes to 1722.1 / MAAP to work with 1722 draft15
Summary of changes:
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(-)