aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-zbee-zcl-ha.c
AgeCommit message (Collapse)AuthorFilesLines
2017-04-13zbee zcl: fix conflicting entry in its value_stringAlexis La Goutte1-1/+1
Field 'Command' (zbee_zcl_general.applctrl.execcmd.id) has a conflicting entry in its value_string: 4 is at indices 4 (Start Superfreezing) and 5 (Stop Superfreezing)) Field 'Meter Type ID' (zbee_zcl_ha.metidt.attr.meter_type.id) has a conflicting entry in its value_string: 0 is at indices 0 (Utility Primary Meter) and 2 (Data Quality ID)) Change-Id: I9e92a5c58aea0d6ef00e8d5f61fdfb073b41ee80 Reviewed-on: https://code.wireshark.org/review/21058 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22Zbee(zc): Changing comment format(javadoc=>Doxygen)Rishi Dev Singh1-269/+126
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-12Increase ZBEE_ZCL_APPL_EVTALT_NUM_STRUCT_ETT to match ↵Michael Mann1-1/+1
ZBEE_ZCL_APPL_EVTALT_COUNT_NUM_MASK, to prevent invalid ett_ array access. Change-Id: I67e79e97e13081a77bb5202cbbc1e4f1ee872c95 Reviewed-on: https://code.wireshark.org/review/12556 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-09new_register_dissector -> register_dissector for dissector directory.Michael Mann1-4/+4
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-11-14register_dissector -> new_register_dissectorMichael Mann1-8/+8
Picking off "easy" dissectors that only have one or two exit points at most. This concludes a "first pass" over the dissector directory. Change-Id: If5ce5484214be50fe541cba478da1de62e354297 Reviewed-on: https://code.wireshark.org/review/11830 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-18Add a CF_FUNC macro for casting BASE_CUSTOM functions.Gerald Combs1-1/+1
Add a CF_FUNC macro to match VALS, TFS, etc. This should help us to avoid the following warning: warning: ISO C forbids initialization between function pointer and 'void *' [-Wpedantic] We could start adding DIAG_OFF+DIAG_ON everywhere but this seems to be more consistent with the other macros in proto.h. Update each instance of BASE_CUSTOM to use CF_FUNC. Adjust a dummy variable name generated by asn2wrs.py that was triggering an invalid error in checkhf.pl. Fix an encoding arguement in packet-elasticsearch.c found by fix-encoding-args.pl. Change-Id: Id0e75076c2d71736639d486f47b87bab84e07d22 Reviewed-on: https://code.wireshark.org/review/7150 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-15ZigBee: packet scope memory cannot be used for BASE_CUSTOM callbacksPascal Quantin1-1/+4
Change-Id: I28fe21151b9f8c91786ca6c56d141a458419c501 Reviewed-on: https://code.wireshark.org/review/6548 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-11Rename the FT_BYTES separator types to SEP_ from BASE_.Guy Harris1-1/+1
There's no requirement for "display" field values to have names beginning with BASE_; use SEP_, to indicate that they're separators. (And, yes, we should introduce SEP_NONE, with a value of 0, and use it.) While we're at it, fix BASE_SEMICOLON - the separator is a colon, not a semicolon - and document SEP_SPACE in doc/README.dissector. Change-Id: I856aafda2c60b8320dffe287f0deb06a9604a2bf Reviewed-on: https://code.wireshark.org/review/6486 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-04Create BASE_DOT, BASE_DASH, and BASE_SEMICOLON types for the FT_BYTES field ↵Michael Mann1-4/+2
type. These "bases" will put a ".", "-", or ":" respectively between hexidecimal bytes in the field in packet view and display filter. FT_BYTES with BASE_NONE will have no separator in the packet view, but continue to have the ':' as a separator in the display filter. Converted the "string" hf_ entries that used tvb_fc_to_str as a string to use proto_tree_add_item with FT_BYTES/BASE_DOT type. Converted applicable tvb_bytes_to_ep_str_punct() calls to use the new BASE values. Change-Id: I2442185bb314d04a3ff2ba57883652ecd738b5f9 Reviewed-on: https://code.wireshark.org/review/6098 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-25Deleting unnecessary #includes from dissectors.Martin Mathieson1-1/+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 non-generated epan/dissector/*.cBill Meier1-1/+0
Specifically: - Set packet.h to be the first wireshark #include after config.h and "system" #includes. packet.h added as an #include in some cases when missing. - Remove some #includes included (directly/indirectly) in packet.h. E.g., glib.h. (Done only for those files including packet.h). - As needed, move "system" #includes to be after config.h and before wireshark #includes. - Rework various #include file specifications for consistency. - Misc. Change-Id: Ifaa1a14b50b69fbad38ea4838a49dfe595c54c95 Reviewed-on: https://code.wireshark.org/review/5923 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-17Fixed bug in ZigBee (zbee) decryption, added Key Establishment cluster and ↵Chris Brandson1-157/+17
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>
2014-09-29Add editor modelines; fix indentation as needed.Bill Meier1-0/+13
Change-Id: I1ad94654343e5a018a0b3159481d45ffb3a91263 Reviewed-on: https://code.wireshark.org/review/4363 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-07Eliminate proto_tree_add_text from some of the dissectors.Michael Mann1-5/+3
Other minor cleanups while in the area. Change-Id: Id8dab02df6f111c3462238c3de1bf201e037ca48 Reviewed-on: https://code.wireshark.org/review/4022 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-12proto_register_zbee_zcl_appl_evtalt: correct formattingРоман Донченко1-4/+2
The original formatting, besides looking silly, also prevents the function from being picked up by make-dissector-reg. Change-Id: I06e37b0e862064275b07976295eca8f0288a0974 Reviewed-on: https://code.wireshark.org/review/3025 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-28Remove unused variables post commit 7bf6862ecf0d0a508bf097f3b52d07bd19128272Graham Bloice1-1/+0
Change-Id: Id583ab1742241deb9325dcb1dbba8a8cb3df3b90 Reviewed-on: https://code.wireshark.org/review/2691 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-06-28convert to proto_tree_add_subtree[_format]Michael Mann1-12/+6
Change-Id: Ia7014003a3cff5181295172978d6c613c3b83b0b Reviewed-on: https://code.wireshark.org/review/2676 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-19Revert "Fixup: tvb_* -> tvb_captured"Michael Mann1-2/+2
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html This reverts commit 246fe2ca4c67d8c98caa84e2f57694f6322e2f96. Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f Reviewed-on: https://code.wireshark.org/review/2430 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-18Fixup: tvb_* -> tvb_capturedDario Lombardo1-2/+2
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f Reviewed-on: https://code.wireshark.org/review/2377 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-16Convert a bunch of time_to_str functions to wmemEvan Huus1-1/+1
Change-Id: I24fe3cc4a3589dadc4528a77fe7ff13d06b1a983 Reviewed-on: https://code.wireshark.org/review/2245 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-03-04Remove all $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^ \* \$Id\$/,+1 d') Fix manually some typo (in export_object_dicom.c and crc16-plain.c) Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8 Reviewed-on: https://code.wireshark.org/review/497 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-01-17From Fabio Tarabelloni via ↵Pascal Quantin1-3/+3
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9650 : ZigBee ZCL Appliance Identification: fix endianness of Company ID, Brand ID and Product Type ID svn path=/trunk/; revision=54836
2013-12-26Bugfix attribute id parsing in zbee dissectors. Bug 9566 ↵Michael Mann1-12/+9
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9566) From Fabio Tarabelloni svn path=/trunk/; revision=54465
2013-12-19Rename more to_str functions to have ep_ in the name if they return ephemeralEvan Huus1-1/+1
buffers. Remove two unused functions. svn path=/trunk/; revision=54250
2013-12-19Rename a couple of to_str functions to have ep_ in the name. This makes itEvan Huus1-1/+1
obvious that the returned string is ephemeral, and opens up the original names in the API for versions that take a wmem pool (and thus can work in any scope). svn path=/trunk/; revision=54249
2013-12-17From Fabio Tarabelloni via ↵Alexis La Goutte1-17/+76
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9547 Zbee ZCL wrong cmdID in DefaultRespons Default Response command generated by Specific command cluster contains wrong cmdId decoding. The value shows the cross-cluster command id but not the specific cluster command id name. Draft of solution is already created (now is under test). The idea is to add a cmdId function callback in zbee_zcl_init_cluster in order to call it when wireshark has to decode specific cluster cmd in default response. svn path=/trunk/; revision=54171
2013-12-09Reject the packet if data is NULL.Chris Maynard1-4/+16
svn path=/trunk/; revision=53893
2013-12-07- Make local functions static.Anders Broman1-0/+9
- Forward declaration of register function. svn path=/trunk/; revision=53817
2013-11-09Include <epan/to_str.h> only when needed.Jakub Zawadzki1-0/+1
svn path=/trunk/; revision=53189
2013-10-24Have ZigBee dissectors pass data through subdissector parameter instead of ↵Michael Mann1-8/+12
using struct _packet_info. svn path=/trunk/; revision=52827
2013-09-10Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9128 :Pascal Quantin1-2/+4
ZigBee ZCL epoch is January 1, 2000 svn path=/trunk/; revision=51939
2013-07-01A better fix than r50278.Chris Maynard1-36/+32
svn path=/trunk/; revision=50279
2013-07-01Realized that Coverity would have still complained about "explicit null ↵Chris Maynard1-46/+53
dereferences", so add in some additional checks. svn path=/trunk/; revision=50278
2013-07-01Use tvb_reported_length_remaining() instead of tvb_length_remaining().Chris Maynard1-13/+15
svn path=/trunk/; revision=50276
2013-07-01Fix Coverity CID 1040370 (Explicit null dereferenced) by removing the if ↵Chris Maynard1-46/+38
(tree) { ... } tests so that payload_tree is always assigned regardless of whether tree is NULL or not. Fix Coverity CID 1040371 (Negative loop bound) by not assignin the return value of tvb_length_remaining() to an unsigned integer and then using that value for loop termination. Instead, assign the return value to a signed integer and only if tvb_length_remaining() returns a value greater than zero do we even begin to loop. In addition, use tvb_length_remaining() instead of tvb_length() to determine if more data exists, and then if it does, when displaying the payload bytes following the cmd_id, only pass the number of remaining bytes following the cmd_id rather than the entire length, which would include the 1 byte for the cmd_id itself. Other minor changes. svn path=/trunk/; revision=50274
2013-06-29Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-4/+4
svn path=/trunk/; revision=50233
2013-06-28From Fabio Tarabelloni viaEvan Huus1-0/+1511
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8718 More zigbee dissection, adding the following clusters: - appliance identification - meter identification - appliance statistics - appliance events and alert svn path=/trunk/; revision=50202
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 02:18:10 +0000