aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-zbee-zcl-misc.c
AgeCommit message (Collapse)AuthorFilesLines
2021-02-18Fix some spelling errors and update word list.Darius Davis1-2/+2
Celcius -> Celsius. ammendment, framenun and untunelled (with one 'n') are in wireshark_words.txt but do not seem to be present in our codebase anymore (and are not correctly-spelled words), so AFAIK they can be removed from the list. Added a handful of words which don't seem to be in the dictionary on my host but are real words and are in the codebase. Removed two contractions which are now handled within tools/check_spelling.py .
2020-06-19Fix the type of arrays of pointers to hf_ values for bitfield routines.Guy Harris1-3/+3
The static arrays are supposed to be arrays of const pointers to int, not arrays of non-const pointers to const int. Fixing that means some bugs (scribbling on what's *supposed* to be a const array) will be caught (see packet-ieee80211-radiotap.c for examples, the first of which inspired this change and the second of which was discovered while testing compiles with this change), and removes the need for some annoying casts. Also make some of those arrays static while we're at it. Update documentation and dissector-generator tools. Change-Id: I789da5fc60aadc15797cefecfd9a9fbe9a130ccc Reviewed-on: https://code.wireshark.org/review/37517 Petri-Dish: Guy Harris <gharris@sonic.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-07-26HTTPS (almost) everywhere.Guy Harris1-1/+1
Change all wireshark.org URLs to use https. Fix some broken links while we're at it. Change-Id: I161bf8eeca43b8027605acea666032da86f5ea1c Reviewed-on: https://code.wireshark.org/review/34089 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-04-21zbee: Changed encoding for zcl command IDsDana Sy1-4/+4
The command ID was passing the value of the cmd_id instead of the encoding for the proto_tree_add_item. This caused an issue with the color control cluster where it wasn't parsing the command ID properly. Change-Id: Iee42031146e37bb96182f765e79de47f6e4b5a04 Reviewed-on: https://code.wireshark.org/review/27064 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-10Add, and use, "fetch signed value" for lengths < 40 bits.Guy Harris1-3/+3
Add 8-bit, 16-bit, 24-bit, and 32-bit "fetch signed value" routines, and use them rather than casting the result of the 8/16/24/32-bit "fetch unsigned value" routines to a signed type (which, BTW, isn't sufficient for 24-bit values, so this appears to fix a bug in epan/dissectors/packet-zbee-zcl.c). Use numbers rather than sizeof()s in various tvb_get_ routines. Change-Id: I0e48a57fac9f70fe42de815c3fa915f1592548bd Reviewed-on: https://code.wireshark.org/review/26844 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-05ZigBee: Allow a different set of attributes for ZCL client and serverKenneth Soerensen1-6/+10
Some clusters, for example the Smart Energy Metering cluster, requires a different set of attributes for the ZCL client and server but with overlapping IDs. This change allows to specify a different set of attributes for the ZCL client. To avoid breaking existing clusters that might have client attributes the same set of attributes are used for server and client when zbee_zcl_init_cluster is called. This new client attribute set is used in the Smart Energy Metering cluster in this commit. Change-Id: Ie25ad746dac1ccbb233ae8975ef9047d3fc6a170 Reviewed-on: https://code.wireshark.org/review/26694 Reviewed-by: Martin Boye Petersen <martinboyepetersen@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Paul Zander <p.j.zander@lighting.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-14Register the ZigBee ZCL cluster with a manufacturer specific code.Paul Zander1-0/+2
Change-Id: I3ac949ba6d6cd0cd61d0a8bb59f568d6a33998c7 Reviewed-on: https://code.wireshark.org/review/26441 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-09Register and initialize the ZCL clusters in a uniform way.Paul Zander1-14/+4
The cluster registration and initialisation is done in the functions 'proto_reg_handoff_zbee_zcl_XXX'. In these functions the 1st step was to register the dissector. Then the cluster was initialised via the function 'zbee_zcl_init_cluster'. In this patch the registration and initialisation is now done by the function 'zbee_zcl_init_cluster'. In this way we have a more uniform way of registration. Change-Id: If865d904ea51c299a48e5c0004f3f280b7479d49 Reviewed-on: https://code.wireshark.org/review/26325 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-02-12dissectors: use SPDX identifiers.Dario Lombardo1-13/+1
Change-Id: I92c94448e6641716d03158a5f332c8b53709423a Reviewed-on: https://code.wireshark.org/review/25756 Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-13ZigBee ZCL IAS: decode IAS Zone Enroll RequestJohn Keeping1-0/+13
Add missing decoding for the Enroll Request command in the IAS Zone cluster. Change-Id: I8dc0875912c87601f610173014879e13cad0820c Reviewed-on: https://code.wireshark.org/review/23050 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-16ZigBee ZCL IAS: fix dissection of ZoneStatus bitmaskPascal Quantin1-1/+1
Bug: 13493 Change-Id: Ide076bce8032767477df804a97981009a0f64828 Reviewed-on: https://code.wireshark.org/review/20569 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-12-22Zbee(zc): Changing comment format(javadoc=>Doxygen)Rishi Dev Singh1-158/+81
Change-Id: Ic0b5d7139e324cbbe786cb4a0cf7d9f924acdf04 Reviewed-on: https://code.wireshark.org/review/12818 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-09new_register_dissector -> register_dissector for dissector directory.Michael Mann1-2/+2
Change-Id: Ie39ef054a4a942687bd079f3a4d8c2cc55d5f22c Reviewed-on: https://code.wireshark.org/review/12485 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-08zbee-zcl-misc: Minor changesBill Meier1-49/+49
tvb_captured_length() --> tvb_reported_length(); whitespace changes. Change-Id: Id9c302d84f28ec23e554445777c7685c8d09918c Reviewed-on: https://code.wireshark.org/review/6412 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-25Deleting unnecessary #includes from dissectors.Martin Mathieson1-2/+0
Fifth batch (packet-rtp.c -> end). Will look at cleaning up and committing script afterwards. Change-Id: I8ed61dc941d98d3f7259a9d1f74e214eb7b4bfa2 Reviewed-on: https://code.wireshark.org/review/6052 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-21Cleanup use of #includes in a few recently committed dissectors.Bill Meier1-1/+1
Change-Id: Ie66d4c3f0c5d0037cac65ff39e4dedcedff462f1 Reviewed-on: https://code.wireshark.org/review/5938 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-17Fixed bug in ZigBee (zbee) decryption, added Key Establishment cluster and ↵Chris Brandson1-0/+1115
moved IAS, Thermostat and Poll clusters out of the ZCL foundation dissector. Removed attrID and cmdID ZCL cluster functions. Bug in ZCL HVAC attribute registration. Fixed bug in ZCL command ID field registration. Update Manufacturer Codes and Profile Ids to ZigBee-053874r26 Oct 2014 Fixed broken fragmented ZigBee packet collection and reassembly Use protocol fields for Thermostat schedule transitions. Added support for Key Establishment Cluster (CBKE) at SE 1.2a Updated Message cluster to SE 1.2a spec Added attribute reporting status which is common to all SE 1.2a clusters Added SE 1.2a tunnel cluster support ZigBee Smart Energy (SE) decryption appears to have been broken for some time. For SE you do not know the Link Key until after successful completion of Key Establishment and then manually enter it into preferences. Entry in preferences was broken such that when the new Link Key was entered all existing link keys would be lost. This lead to the loss of the Network Key as well when the Transport Key message was re-processed without the Pre-Configured Link Key. The Link Key 'key ring' has been moved to the UAT post-update callback so that it will always be updated correctly after changes to the link keys in preferences The attribute reporting status attribute which is common to all SE clusters was accidentally shared, now each cluster has it's own instance ZigBee security added key display for decrypted packets ZigBee Security Preferences fixed UAT type for Label so key label is editable again Added definition for Retail Service profile Added dissection for profile-wide (General Command Frame) commands when the profile is unknown Added zbee-zcl-misc.c to precommit check whitelist as it contains ias and hvac clusters avoiding proliferation of too many small files Change-Id: I53d85ba9d782db6a0e7e78c51b0bc7cdcdbca3ad Reviewed-on: https://code.wireshark.org/review/5565 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>