Wireshark-commits: [Wireshark-commits] master-3.0 3d7d492: Don't use the same variable for the conf
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=3d7d4927152468de1433e82ae4ab59d539c2c12a
Submitter: "Guy Harris <guy@xxxxxxxxxxxx>"
Changed: branch: master-3.0
Repository: wireshark
Commits:
3d7d492 by Guy Harris (guy@xxxxxxxxxxxx):
Don't use the same variable for the configured FCS type and the tap FCS type.
There's the value the user configured, which should neither be used nor
modified by the 802.15.4 TAP dissector; that dissector should just set
the FCS length variable. It should also call the common dissector, as
most of the other top-level dissectors do.
That lets us have separate types for the "configured FCS type" and "tap
FCS type" variables; do so.
Speaking of calling the common dissector, the "non-ASK" dissector should
do so as well. Make it so.
While we're at it, fail if there's an unknown FCS type in the tap
header.
Change-Id: Ib0de81764670302c771be3851e9717f0a8399ac6
Reviewed-on: https://code.wireshark.org/review/32277
Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
(cherry picked from commit f5164e6eff3f490dc3233b9d74298049a0d8467a)
Reviewed-on: https://code.wireshark.org/review/32324
Actions performed:
from 0c614f0 Clean up ITU-T vs. CCITT, fix some comments.
add 3d7d492 Don't use the same variable for the configured FCS type and the tap FCS type.
Summary of changes:
epan/dissectors/packet-ieee802154.c | 138 +++++++++++++++++++++---------------
1 file changed, 81 insertions(+), 57 deletions(-)