aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-zbee-zcl.c
AgeCommit message (Collapse)AuthorFilesLines
2018-06-05ZBEE-NWK-GP:add support for some ZGP commandsJulien Staub1-6/+3
the new dissected commands are: manufacturer specific attribute reporting multicluster reporting manufacturer specific multicluster reporting read attribute and request attribute (have same format) read attribute response write attribute Change-Id: I3125f6acbfb35a72771186f933b0db0798e409f2 Reviewed-on: https://code.wireshark.org/review/27892 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-10Add, and use, "fetch signed value" for lengths < 40 bits.Guy Harris1-4/+4
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-68/+150
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-3/+3
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-14Add support for ZigBee ZCL manufacturer specific attributes and commands.Paul Zander1-57/+82
For each ZCL cluster there is the possibility to implement manufacturer specific attributes and commands. This is done by setting a flag (Manufacturer specific = true/false) in the Frame Control Field of the ZCL frame. If this flag is set then also the Manufacturer Code is added to the ZCL frame. Example: Manufacturer Code = 0x100b = Philips. So basically this means that the meaning of an attribute/command is dependent on the manufacturer code. Currently the ZCL frame is parsed and the manufacturer code is also dissected and displayed correctly. However, the dissection of manufacturer specific attributes and commands is not done properly. Their is no distinction between a global attribute/command and a manufacturer specific attribute/command. This results in the incorrect dissection of these manufacturer specific attributes/commands. This patch fixes this issue. The registration of a cluster is now done with a cluster Id AND the manufacturer specific code. Change-Id: I5d4aeb5473fd56f2a570d2a1f83d1090d42423ab Reviewed-on: https://code.wireshark.org/review/26440 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-7/+14
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-03-05Add missing ZigBee ZCL Scene cluster commands.Paul Zander1-1/+11
The following commands are added: 0x40 - Enhanced add scene 0x41 - Enhanced view scene 0x42 - Copy scene Change-Id: If7f921f7ede7518ecbb88395d6200f600a47bd85 Reviewed-on: https://code.wireshark.org/review/26202 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
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-11-22Add Zigbee encoding, ENC_ZIGBEEMichael Mann1-38/+13
Add the "special handling" of length = 0xFF for single byte or 0xFFFF for uint16 value means size of field to follow is 0. Ping-Bug: 14138 Change-Id: I0baa40f63152b9420a6569ca6cc5eba638fbc790 Reviewed-on: https://code.wireshark.org/review/24428 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Craig Jackson <cejackson51@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-09-22ZigBee ZCL Attributes: Set length of attribute subtreesMartin Boye Petersen1-0/+9
Set length of attribute subtree by setting the end after the attribute has been dissected Change-Id: Ic8bb66206658525635c08f807651a37369d16f6a Reviewed-on: https://code.wireshark.org/review/23651 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>
2017-08-30ZigBee add missing ZCL status codeChris Brandson1-0/+1
Change-Id: I3b7ec4758b32057e0a5ea8f23088dabdd7183ec2 Reviewed-on: https://code.wireshark.org/review/23298 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: Anders Broman <a.broman58@gmail.com>
2017-08-25zbee-zcl: fix parameter 'cluster_id/dir' not found in the function ↵Alexis La Goutte1-2/+0
declaration [-Wdocumentation] Change-Id: I9b0f7d0eefe932e00629269a85ede612438354cf Reviewed-on: https://code.wireshark.org/review/23199 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>
2017-08-18ZigBee fix Default Response dissectionChris Brandson1-16/+12
The ZCL Default Response command can be sent in response to any profile-wide or cluster specific command. The Default Response command is itself a profile-wide command so the Default Response frame control is of no help in deciding whether the original request is profile-wide or cluster-specific. The simplest solution is to not attempt interpretation. A more sophisticated solution would be to cache all ZCL frame counters and match Default Responses based on sequence number, but this is problematic because sequence numbers repeat. At least for now we can always display the information correctly. Change-Id: I827e2d2f9d6e5f7c9dfa572d2ee2ac3c9f170d70 Reviewed-on: https://code.wireshark.org/review/22688 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-19ZigBee make ZCL Frame Control direction more descriptiveChris Brandson1-1/+1
Using just client or server as a direction is a source of confusion so made a more discriptive item Change-Id: I8675aba555b04f6ae8848cf9e1c720eb4b44b553 Reviewed-on: https://code.wireshark.org/review/22628 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-18ZigBee cleanup minor errorsChris Brandson1-0/+2
Alarm Code now correctly displayed as a byte Missing ZCL status codes from ZCL 6 and ZCL 7 have been added Input and Output Cluster Lists now displayed in hex as they are everywhere else The term Device is no longer used, instead Nwk Addr and Address are used as applicable Change-Id: I552f4b64974bf44088a1c8f90d44e5459a0f81a6 Reviewed-on: https://code.wireshark.org/review/22683 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: Anders Broman <a.broman58@gmail.com>
2017-07-09ZigBee: fix ZCL configure reporting response parsingJohn Keeping1-10/+30
If configure reporting succeeds for all attributes, then the response contains only a success status byte but if any attribute fails, then every record contains a direction byte and attribute identifier. By handling the "all successful" case specially, add an expert info message to indicate a problem if the message length indicates that we have hit this special case but the status is not "success". Change-Id: I3facae8ac07f1a249cc6ae1b2454f8381151355b Reviewed-on: https://code.wireshark.org/review/22557 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>
2017-01-20zbee: add shutdown routineDario Lombardo1-0/+15
Change-Id: I12ed488a26bde3a85cd75f61dad8f78412cd52ac Reviewed-on: https://code.wireshark.org/review/19700 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-31Don't do any Decode As stuff for dissector tables not used with Decode As.Guy Harris1-1/+1
Have all dissector tables have a "supports Decode As" flag, which defaults to FALSE, and which is set to TRUE if a register_decode_as() refers to it. When adding a dissector to a dissector table with a given key, only add it for Decode As if the dissector table supports it. For non-FT_STRING dissector tables, always check for multiple entries for the same protocol with different dissectors, and report an error if we found them. This means there's no need for the creator of a dissector table to specify whether duplicates of that sort should be allowed - we always do the check when registering something for "Decode As" (in a non-FT_STRING dissector table), and just don't bother registering anything for "Decode As" if the dissector table doesn't support "Decode As", so there's no check done for those dissector tables. Change-Id: I4a1fdea3bddc2af27a65cfbca23edc99b26c0eed Reviewed-on: https://code.wireshark.org/review/17402 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-15ZigBee: add support for inter-pan transmissions.dsrsupport1-0/+1
Added dissection of inter-pan nwk and aps stub to be used to decode ZLL commissioning cluster. Change-Id: I871016a93854f1caf2f14f2f84e5397de5f1e2ff Reviewed-on: https://code.wireshark.org/review/15918 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: Pascal Quantin <pascal.quantin@gmail.com>
2016-05-19ZigBee: implemented Green Power ZCL cluster dissector.dsrsupport1-0/+1
Implemented basic Green Power ZCL cluster support and parsing of some GP cluster commands. Implemented following commands parsing: GP_NOTIFICATION GP_COMMISSIONING_NOTIFICATION GP_PAIRING GP_PROXY_COMMISSIONING_MODE GP_RESPONSE That is enough for Green Power Basic Proxy commissioning. Change-Id: Icbe00667a6dfb89346288843ce8fa20d62b822dc Reviewed-on: https://code.wireshark.org/review/15363 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: Anders Broman <a.broman58@gmail.com>
2016-03-20Create call_data_dissector() to call data dissector.Michael Mann1-6/+1
This saves many dissectors the need to find the data dissector and store a handle to it. There were also some that were finding it, but not using it. For others this was the only reason for their handoff function, so it could be eliminated. Change-Id: I5d3f951ee1daa3d30c060d21bd12bbc881a8027b Reviewed-on: https://code.wireshark.org/review/14530 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-17Associate dissector tables and heuristic subdissector lists with a protocol.Michael Mann1-1/+1
This will make it easier to determine protocol dependencies. Some LLC OUI dissector tables didn't have an associated protocol, so they were left without one (-1 used) Change-Id: I6339f16476510ef3f393d6fb5d8946419bfb4b7d Reviewed-on: https://code.wireshark.org/review/14446 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-06Bluetooth: GATT: Add support for OTS/OTPMichal Labedzki1-4/+0
OTS/OTP is the newset "profile" announced by Bluetooth SIG. It name describe what it doing: Object Transfer Service/Profile, so it is something like OPP. While we are at this move some HID attributes to get right order in switch-case. Change-Id: I460963a422c7292b2cabf7e88f32dbd6e8d7051f Reviewed-on: https://code.wireshark.org/review/13735 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2016-01-08Fix a lot of typos and misspellingsmoshekaplan1-1/+1
Change-Id: I8512cfa1d424f82a873a0e0e1d22c7b075fdd7f3 Reviewed-on: https://code.wireshark.org/review/13069 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> 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>
2015-12-22Zbee(zc): Changing comment format(javadoc=>Doxygen)Rishi Dev Singh1-352/+205
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-1/+1
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-12-08Adding Zigbee dissectors for Groups Cluster and Scenes Cluster.Rishi Dev Singh1-5/+7
Change-Id: Iac72e5383b623e424ff28d61ff3bdc37ac95fab7 Reviewed-on: https://code.wireshark.org/review/12369 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-12-07Spelling fixes for errors found by lintianBalint Reczey1-2/+2
Change-Id: I889283902875193f4d3f3fd59788f59f8d9bcc20 Reviewed-on: https://code.wireshark.org/review/11945 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-10ZCL (zbee): Use hf_zbee_zcl_attr_uint40 for ZBEE_ZCL_40_BIT_UINTAlexis La Goutte1-1/+1
Change-Id: Ib9719ac893288b9f26acabb81158ed42b2351fb5 Reviewed-on: https://code.wireshark.org/review/11572 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-04Don't allow multiple registrations of a protocol in dissector tables.Michael Mann1-1/+1
The target here is the Decode As dialog where protocols have multiple registrations into a dissector table and that shows up as multiple entries in the Decode As dialog list with the same name so users are unsure which "dissector" they are choosing. The "default" behavior (done in this commit) is to not allow duplicates for a dissector table, whether its part of Decode As or not. It's just ENFORCED for Decode As. Bug: 3949 Change-Id: Ibe14fa61aaeca0881f9cc39b78799e314b5e8127 Reviewed-on: https://code.wireshark.org/review/11405 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-16ZBee ZCL: use tvb_get_guint8() (avoid tvb_get_ptr... !)Alexis La Goutte1-1/+1
Change-Id: I248ddb1dee5398528279807968b095cbc5413ae0 Reviewed-on: https://code.wireshark.org/review/6569 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-16bug 10833 undecoded bitmaps were being displayed raw which is hard to ↵Chris Brandson1-70/+105
interpret, changed to an more friendly format Change-Id: If79a695646837cdfb3e1b168a47b96984c58e328 Reviewed-on: https://code.wireshark.org/review/6563 Reviewed-by: Anders Broman <a.broman58@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-07tvb_bytes_to_ep_str_punct -> tvb_bytes_to_str_punctMichael Mann1-2/+2
Also change bytestring_to_str to match bytes_to_ep_str_punct functionality (limiting byte string size) Change-Id: Idb958c7f0c203d103629469302b81fa922714f7e Reviewed-on: https://code.wireshark.org/review/6369 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-04Create BASE_DOT, BASE_DASH, and BASE_SEMICOLON types for the FT_BYTES field ↵Michael Mann1-8/+5
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-17Fix zbee errors introduced by change 5565, commit ↵Graham Bloice1-5/+0
df639f509e812fff3c5eb4bdf4f77988c6ec122b Reworked zbee_mfr_code_names to be in monotonic order. Fixed implicit shortening of time value with a cast. Change-Id: I629948fbe32543fd2672bbc40af790333b970b10 Reviewed-on: https://code.wireshark.org/review/5808 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-12-17zbee-zcl: swap honeywell codesEvan Huus1-2/+2
they were out of order for the extended value-string, I suspect honeywell1 and honeywell2 had just been put in backwards Change-Id: I4aacf27ba8aa20c137731f1ad652380cd5af5562 Reviewed-on: https://code.wireshark.org/review/5809 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-12-17Fixed bug in ZigBee (zbee) decryption, added Key Establishment cluster and ↵Chris Brandson1-967/+393
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-12-01Use proto_tree_add_bitmask for groups of proto_tree_add_boolean.Michael Mann1-14/+18
Part 3 of many, but this concludes the strict conversion to proto_tree_add_bitmask. Patches to follow with use proto_tree_add_bitmask_xxx (some functions still need to be written) Change-Id: Ic2435667c6a7f1d40602124e5044954d2a296180 Reviewed-on: https://code.wireshark.org/review/5553 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> 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-06-28convert to proto_tree_add_subtree[_format]Michael Mann1-54/+33
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-14/+14
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-14/+14
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f Reviewed-on: https://code.wireshark.org/review/2377 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18Fixup: tvb_get_string(z) -> tvb_get_string(z)_encDario Lombardo1-2/+2
Change-Id: I63a3704effe3fcab01a193dc39b6a22e9f1cf3fe Reviewed-on: https://code.wireshark.org/review/2376 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-07tvb_new_subset -> tvb_new_subset_length when length parameters are equal.Michael Mann1-1/+1
tvb_new_subset -> tvb_new_subset_remaining it appears that's what the intention is. Change-Id: I2334bbf3f10475b3c22391392fc8b6864454de2d Reviewed-on: https://code.wireshark.org/review/1999 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-15Bug 8214. Don't let array ett_ variables limit the number of array elements ↵Michael Mann1-9/+98
dissected. Also add support for set and bag dissection. Change-Id: I11059ec313aba7d289ce06e38b4992429f2fd999 Reviewed-on: https://code.wireshark.org/review/1123 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-12Zcl OTA Upgrade cluster dissector. Bug 9545 ↵Michael Mann1-482/+14
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9545) From Fabio Tarabelloni From me: Reorder function definitions so declarations aren't necessary svn path=/trunk/; revision=54701