osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity
wireshark/epan/dissectors/packet-ieee802154.c

3138 lines
131 KiB
C
Raw Normal View History

From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* packet-ieee802154.c
*
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
* Auxiliary Security Header support and
* option to force TI CC24xx FCS format
* By Jean-Francois Wauthy <jfw@info.fundp.ac.be>
* Copyright 2009 The University of Namur, Belgium
*
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
* IEEE 802.15.4 Dissectors for Wireshark
* By Owen Kirby <osk@exegin.com>
* Copyright 2007 Exegin Technologies Limited
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
Update Free Software Foundation address. (COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
*------------------------------------------------------------
*
* In IEEE 802.15.4 packets, all fields are little endian. And
FT_BOOLEAN hf[] entries with a 0 'bitmask' should have 'display' = BASE_NONE; In some cases: Use val_to_str_const() instead of val_to_str(); Reformat long lines; Do some general whitespace changes. svn path=/trunk/; revision=41587
2012-03-16 02:00:29 +00:00
* Each byte is transmitted least significant bit first (reflected
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
* bit ordering).
*------------------------------------------------------------
*
* IEEE 802.15.4 Packets have the following format:
* | FCF |Seq No| Addressing | Data | FCS |
* |2 bytes|1 byte|0 to 20 bytes|Length-(Overhead) bytes|2 Bytes|
*------------------------------------------------------------
*
* CRC16 is calculated using the x^16 + x^12 + x^5 + 1 polynomial
* as specified by ITU-T, and is calculated over the IEEE 802.15.4
* packet (excluding the FCS) as transmitted over the air. Note,
* that because the least significan bits are transmitted first, this
* will require reversing the bit-order in each byte. Also, unlike
* most CRC algorithms, IEEE 802.15.4 uses an initial and final value
* of 0x0000, instead of 0xffff (which is used by the CCITT).
*------------------------------------------------------------
*
* This dissector supports both link-layer IEEE 802.15.4 captures
* and IEEE 802.15.4 packets encapsulated within other layers.
* Additionally, support has been provided for various formats
* of the frame check sequence:
* - IEEE 802.15.4 compliant FCS.
* - ChipCon/Texas Instruments CC24xx style FCS.
*------------------------------------------------------------
*/
/* Include files */
#include "config.h"
#include <epan/packet.h>
Cleanup use of #includes in non-generated epan/dissector/*.c 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-20 21:23:59 +00:00
#include <epan/decode_as.h>
Add missing includes in order to remove exceptions.h from proto.h (next commit). svn path=/trunk/; revision=53230
2013-11-10 15:59:37 +00:00
#include <epan/exceptions.h>
Second try to move crc routines to libwsutil. This time keep the tvb routines in epan. Now we can use common crc routines outside epan. svn path=/trunk/; revision=38810
2011-08-31 09:00:54 +00:00
#include <epan/crc16-tvb.h>
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
#include <epan/expert.h>
#include <epan/addr_resolv.h>
Add address type registration. Now address types are setup just like field types and must be registered with a structure that provides its string representation (and more things in the future). Address types that are limited to a single dissector are registered by the dissector. More "common" ones are globally registered. There are still a few that really belong in a dissector, but have other dependencies currently not accounted for in the address type support. Many of the "address to string" conversions that involved g_sprintf have be changed to use more "performance friendly" methods (some at the cost of needing to_str-int.h) Leaving all comments regarding this "solution" in address_to_str.c in until all have been implemented Change-Id: I494f413e016b22859c44675def11135f228796e0 Reviewed-on: https://code.wireshark.org/review/7019 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-08 03:15:55 +00:00
#include <epan/address_types.h>
From Colin O'Flynn: The idea is that there is now some hardware that can put 802.15.4 frames over Ethernet. To do so, the 802.15.4 frames are wrapped in an Ethernet frame, with the Ethertype set to a value indicating the payload is 802.15.4. Since there is no official ETHTYPE designated by the IEEE, the number 0x809A is used in this code. However a preference is added to the "IEEE 802.15.4" type in the preference dialog allowing you to change this ethtype to something else. The hardware for those interested is the Atmel Raven USB Stick. svn path=/trunk/; revision=26352
2008-10-05 08:11:35 +00:00
#include <epan/prefs.h>
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
#include <epan/uat.h>
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
#include <epan/strutil.h>
If it's used by dissectors, it belongs in to_str.h, not to_str-int.h. Assuming *any* of the routines that generate printable strings should be thought of as "for internal use by libwireshark routines only, not by dissectors", the ones that *are* used by dissectors obviously shouldn't be. The ability for dissectors to register address types certainly expands the list of routines they would use. Move everything used by dissectors from to_str-int.h into to_str.h, and have dissectors not include to_str-int.h. (Perhaps we should just get rid of to_str-int.h altogether.) Change-Id: I3c583351f038233c9bcd8f9216188f82630267fa Reviewed-on: https://code.wireshark.org/review/11149 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-19 16:39:59 +00:00
#include <epan/to_str.h>
Move show_exception() and show_reported_bounds_error() to epan/show_exception.c, as it's used outside epan/dissectors/packet-frame.c. Update their callers to include <epan/show_exception.h> to get their declaration. Add a CATCH_NONFATAL_ERRORS macro that catches all exceptions that, if there's more stuff in the packet to dissect after the dissector call that threw the exception, doesn't mean you shouldn't go ahead and dissect that stuff. Use it in all those cases, including ones where BoundsError was inappropriately being caught (you want those passed up to the top level, so that the packet is reported as having been cut short in the capture process). Add a CATCH_BOUNDS_ERRORS macro that catches all exceptions that correspond to running past the end of the data for a tvbuff; use it rather than explicitly catching those exceptions individually, and rather than just catching all exceptions (the only place that DissectorError should be caught, for example, is at the top level, so dissector bugs show up in the protocol tree). Don't catch and then immediately rethrow exceptions without doing anything else; just let the exceptions go up to the final catcher. Use show_exception() to report non-fatal errors, rather than doing it yourself. If a dissector is called from Lua, catch all non-fatal errors and use show_exception() to report them rather than catching only ReportedBoundsError and adding a proto_malformed item. Don't catch exceptions when constructing a trailer tvbuff in packet-ieee8023.c - just construct it after the payload has been dissected, and let whatever exceptions that throws be handled at the top level. Avoid some TRY/CATCH/ENDTRY cases by using checks such as tvb_bytes_exist() before even looking in the tvbuff. svn path=/trunk/; revision=47924
2013-02-27 22:43:54 +00:00
#include <epan/show_exception.h>
Cleanup use of #includes in non-generated epan/dissector/*.c 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-20 21:23:59 +00:00
#include <wsutil/pint.h>
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Use libgcrypt for cipher libraries. */
include the wsutil/wsgcrypt.h instead of including gcrypt.h directly svn path=/trunk/; revision=47802
2013-02-21 18:23:29 +00:00
#include <wsutil/wsgcrypt.h>
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
#include "packet-ieee802154.h"
From Sascha Herrmann: Patch registering ieee802154 dissector to Linux SLL frames. svn path=/trunk/; revision=47649
2013-02-13 07:16:14 +00:00
#include "packet-sll.h"
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
Fix [-Wmissing-prototypes] svn path=/trunk/; revision=54135
2013-12-15 23:44:12 +00:00
void proto_register_ieee802154(void);
void proto_reg_handoff_ieee802154(void);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Dissection Options for dissect_ieee802154_common */
#define DISSECT_IEEE802154_OPTION_CC24xx 0x00000001 /* FCS field contains a TI CC24xx style FCS. */
#define DISSECT_IEEE802154_OPTION_LINUX 0x00000002 /* Addressing fields are padded DLT_IEEE802_15_4_LINUX, not implemented. */
From Colin O'Flynn: The idea is that there is now some hardware that can put 802.15.4 frames over Ethernet. To do so, the 802.15.4 frames are wrapped in an Ethernet frame, with the Ethertype set to a value indicating the payload is 802.15.4. Since there is no official ETHTYPE designated by the IEEE, the number 0x809A is used in this code. However a preference is added to the "IEEE 802.15.4" type in the preference dialog allowing you to change this ethtype to something else. The hardware for those interested is the Atmel Raven USB Stick. svn path=/trunk/; revision=26352
2008-10-05 08:11:35 +00:00
/* ethertype for 802.15.4 tag - encapsulating an Ethernet packet */
static unsigned int ieee802154_ethertype = 0x809A;
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
/* boolean value set if the FCS field is using the TI CC24xx format */
static gboolean ieee802154_cc24xx = FALSE;
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
/* boolean value set if the FCS must be ok before payload is dissected */
Fix for bug 4076: Have the option to continue dissection of data even with failed FCS check. svn path=/trunk/; revision=30786
2009-10-31 20:55:33 +00:00
static gboolean ieee802154_fcs_ok = TRUE;
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* User string with the decryption key. */
static const gchar *ieee802154_key_str = NULL;
static gboolean ieee802154_key_valid;
static guint8 ieee802154_key[IEEE802154_CIPHER_SIZE];
FT_BOOLEAN hf[] entries with a 0 'bitmask' should have 'display' = BASE_NONE; In some cases: Use val_to_str_const() instead of val_to_str(); Reformat long lines; Do some general whitespace changes. svn path=/trunk/; revision=41587
2012-03-16 02:00:29 +00:00
static const char *ieee802154_user = "User";
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/*
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
* Address Hash Tables
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
*
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
*/
From Fred Fierling via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5395 : The ZigBee security dissector was not recording the short to long address mappings in Security Headers, preventing the decryption of some payloads. This patch eliminates the Undecoded warnings in packets 1 and 19 in this test capture: https://bugs.wireshark.org/bugzilla/attachment.cgi?id=5457 The keys to decrypt these packets are listed in the bug. svn path=/trunk/; revision=34886
2010-11-15 20:52:41 +00:00
static ieee802154_map_tab_t ieee802154_map = { NULL, NULL };
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/*
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
* Static Address Mapping UAT
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
*
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
*/
/* UAT entry structure. */
typedef struct {
FT_BOOLEAN hf[] entries with a 0 'bitmask' should have 'display' = BASE_NONE; In some cases: Use val_to_str_const() instead of val_to_str(); Reformat long lines; Do some general whitespace changes. svn path=/trunk/; revision=41587
2012-03-16 02:00:29 +00:00
guchar *eui64;
guint eui64_len;
guint addr16;
guint pan;
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
} static_addr_t;
/* UAT variables */
FT_BOOLEAN hf[] entries with a 0 'bitmask' should have 'display' = BASE_NONE; In some cases: Use val_to_str_const() instead of val_to_str(); Reformat long lines; Do some general whitespace changes. svn path=/trunk/; revision=41587
2012-03-16 02:00:29 +00:00
static uat_t *static_addr_uat = NULL;
static static_addr_t *static_addrs = NULL;
static guint num_static_addrs = 0;
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
/* Sanity-checks a UAT record. */
Make UAT record update callbacks return a success/failure indication. Have them return TRUE on success and FALSE on failure. Check the return value rather than whether the error string pointer is null or not. Change-Id: I800a03bcd70a6bbb7b217cf7c4800e9cdcf2189c Reviewed-on: https://code.wireshark.org/review/7222 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-18 00:40:28 +00:00
static gboolean
UAT error string pointers should not be const pointers. UAT error strings are usually allocated by g_strdup() or g_strdup_printf(), and must ultimately be freed by the caller. Make the pointer-to-error-string-pointer arguments to various functions be "char **", not "const char **". Fix cases that finds where a raw string was being used, as that won't work if you try to free it; g_strdup() it instead. Add a missing free of an error string. Remove some no-longer-necessary casts. Remove some unnecessary g_strdup()s (the string being handed to it was already g_malloc()ated). Change some variable declarations to match. Put in XXX comments for some cases where the error string is just freed, without being shown to the user. Change-Id: I40297746a2ef729c56763baeddbb0842386fa0d0 Reviewed-on: https://code.wireshark.org/review/6525 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-13 20:13:45 +00:00
addr_uat_update_cb(void *r, char **err)
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
{
From beroset: remove C++ incompatibilities https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 (catch the one that almost slipped away) svn path=/trunk/; revision=48404
2013-03-18 22:16:58 +00:00
static_addr_t *map = (static_addr_t *)r;
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
/* Ensure a valid short address */
if (map->addr16 >= IEEE802154_NO_ADDR16) {
Add a very small hack to make the UAT update callback error string freeable, and convert all existing UAT update callbacks to use glib memory instead of ephemeral memory for that string. UAT code paths are entirely distinct from packet dissection, so using ephemeral memory was the wrong choice, because there was no guarantees about when it would be freed. The move away from emem still needs to be propogated deeper into the UAT code itself at some point. Net effect: remove another bunch of emem calls from dissectors, where replacing with wmem would have caused assertions. svn path=/trunk/; revision=52854
2013-10-25 22:14:25 +00:00
*err = g_strdup("Invalid short address");
Make UAT record update callbacks return a success/failure indication. Have them return TRUE on success and FALSE on failure. Check the return value rather than whether the error string pointer is null or not. Change-Id: I800a03bcd70a6bbb7b217cf7c4800e9cdcf2189c Reviewed-on: https://code.wireshark.org/review/7222 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-18 00:40:28 +00:00
return FALSE;
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
}
/* Ensure a valid PAN identifier. */
if (map->pan >= IEEE802154_BCAST_PAN) {
Add a very small hack to make the UAT update callback error string freeable, and convert all existing UAT update callbacks to use glib memory instead of ephemeral memory for that string. UAT code paths are entirely distinct from packet dissection, so using ephemeral memory was the wrong choice, because there was no guarantees about when it would be freed. The move away from emem still needs to be propogated deeper into the UAT code itself at some point. Net effect: remove another bunch of emem calls from dissectors, where replacing with wmem would have caused assertions. svn path=/trunk/; revision=52854
2013-10-25 22:14:25 +00:00
*err = g_strdup("Invalid PAN identifier");
Make UAT record update callbacks return a success/failure indication. Have them return TRUE on success and FALSE on failure. Check the return value rather than whether the error string pointer is null or not. Change-Id: I800a03bcd70a6bbb7b217cf7c4800e9cdcf2189c Reviewed-on: https://code.wireshark.org/review/7222 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-18 00:40:28 +00:00
return FALSE;
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
}
/* Ensure a valid EUI-64 length */
if (map->eui64_len != sizeof(guint64)) {
Add a very small hack to make the UAT update callback error string freeable, and convert all existing UAT update callbacks to use glib memory instead of ephemeral memory for that string. UAT code paths are entirely distinct from packet dissection, so using ephemeral memory was the wrong choice, because there was no guarantees about when it would be freed. The move away from emem still needs to be propogated deeper into the UAT code itself at some point. Net effect: remove another bunch of emem calls from dissectors, where replacing with wmem would have caused assertions. svn path=/trunk/; revision=52854
2013-10-25 22:14:25 +00:00
*err = g_strdup("Invalid EUI-64 length");
Make UAT record update callbacks return a success/failure indication. Have them return TRUE on success and FALSE on failure. Check the return value rather than whether the error string pointer is null or not. Change-Id: I800a03bcd70a6bbb7b217cf7c4800e9cdcf2189c Reviewed-on: https://code.wireshark.org/review/7222 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-18 00:40:28 +00:00
return FALSE;
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
}
Make UAT record update callbacks return a success/failure indication. Have them return TRUE on success and FALSE on failure. Check the return value rather than whether the error string pointer is null or not. Change-Id: I800a03bcd70a6bbb7b217cf7c4800e9cdcf2189c Reviewed-on: https://code.wireshark.org/review/7222 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-18 00:40:28 +00:00
return TRUE;
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
} /* ieee802154_addr_uat_update_cb */
/* Field callbacks. */
UAT_HEX_CB_DEF(addr_uat, addr16, static_addr_t)
UAT_HEX_CB_DEF(addr_uat, pan, static_addr_t)
UAT_BUFFER_CB_DEF(addr_uat, eui64, static_addr_t, eui64, eui64_len)
/*-------------------------------------
* Dissector Function Prototypes
*-------------------------------------
*/
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Dissection Routines. */
register_dissector -> new_register_dissector Picking off "easy" dissectors that only have one or two exit points at most. Change-Id: I25fe6a0aac93980333217d007702799d16946563 Reviewed-on: https://code.wireshark.org/review/11816 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-14 01:18:34 +00:00
static int dissect_ieee802154_nonask_phy (tvbuff_t *, packet_info *, proto_tree *, void *);
static int dissect_ieee802154 (tvbuff_t *, packet_info *, proto_tree *, void *);
static int dissect_ieee802154_nofcs (tvbuff_t *, packet_info *, proto_tree *, void *);
static int dissect_ieee802154_cc24xx (tvbuff_t *, packet_info *, proto_tree *, void *);
Mark a couple of variables volatile Remove two unused dissector handles Comment out a function declaration labeled as "TODO" svn path=/trunk/; revision=24571
2008-03-05 22:28:29 +00:00
/*static void dissect_ieee802154_linux (tvbuff_t *, packet_info *, proto_tree *); TODO: Implement Me. */
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static void dissect_ieee802154_common (tvbuff_t *, packet_info *, proto_tree *, guint);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/* Information Elements */
static void dissect_ieee802154_header_ie (tvbuff_t *, packet_info *, proto_tree *, guint *, ieee802154_packet *);
static void dissect_ieee802154_payload_ie (tvbuff_t *, packet_info *, proto_tree *, guint *);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Sub-dissector helpers. */
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
static void dissect_ieee802154_fcf (tvbuff_t *, packet_info *, proto_tree *, ieee802154_packet *, guint *);
static void dissect_ieee802154_superframe (tvbuff_t *, packet_info *, proto_tree *, guint *);
static void dissect_ieee802154_gtsinfo (tvbuff_t *, packet_info *, proto_tree *, guint *);
static void dissect_ieee802154_pendaddr (tvbuff_t *, packet_info *, proto_tree *, guint *);
static void dissect_ieee802154_command (tvbuff_t *, packet_info *, proto_tree *, ieee802154_packet *);
static void dissect_ieee802154_assoc_req (tvbuff_t *, packet_info *, proto_tree *, ieee802154_packet *);
static void dissect_ieee802154_assoc_rsp (tvbuff_t *, packet_info *, proto_tree *, ieee802154_packet *);
static void dissect_ieee802154_disassoc (tvbuff_t *, packet_info *, proto_tree *, ieee802154_packet *);
static void dissect_ieee802154_realign (tvbuff_t *, packet_info *, proto_tree *, ieee802154_packet *);
static void dissect_ieee802154_gtsreq (tvbuff_t *, packet_info *, proto_tree *, ieee802154_packet *);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Decryption helpers. */
Clean up decryption; have it return various indications for whether it was able to decrypt and, if it wasn't, why it wasn't, and put that information into an expert information indication. svn path=/trunk/; revision=31922
2010-02-19 10:24:13 +00:00
typedef enum {
DECRYPT_PACKET_SUCCEEDED,
DECRYPT_NOT_ENCRYPTED,
DECRYPT_VERSION_UNSUPPORTED,
DECRYPT_PACKET_TOO_SMALL,
DECRYPT_PACKET_NO_EXT_SRC_ADDR,
DECRYPT_PACKET_NO_KEY,
DECRYPT_PACKET_DECRYPT_FAILED,
Remove comma at the end of several enumerator lists. svn path=/trunk/; revision=39700
2011-11-01 01:23:10 +00:00
DECRYPT_PACKET_MIC_CHECK_FAILED
Clean up decryption; have it return various indications for whether it was able to decrypt and, if it wasn't, why it wasn't, and put that information into an expert information indication. svn path=/trunk/; revision=31922
2010-02-19 10:24:13 +00:00
} ws_decrypt_status;
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
Add XXX comment as follows: /* XXX: GINT_MAX is not defined so #if ... will always be false */ #if (GINT_MAX >= (1LL << 32)) ... #endif Remove _U_ on several function parameters. Do some very minor whitespace changes; Add editor modelines. svn path=/trunk/; revision=54268
2013-12-19 20:34:13 +00:00
static tvbuff_t *dissect_ieee802154_decrypt(tvbuff_t *, guint, packet_info *, ieee802154_packet *,
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
ws_decrypt_status *);
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
static void ccm_init_block (gchar *, gboolean, gint, guint64, ieee802154_packet *, gint);
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
static gboolean ccm_ctr_encrypt (const gchar *, const gchar *, gchar *, gchar *, gint);
static gboolean ccm_cbc_mac (const gchar *, const gchar *, const gchar *, gint, const gchar *, gint, gchar *);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Initialize Protocol and Registered fields */
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
static int proto_ieee802154_nonask_phy = -1;
static int hf_ieee802154_nonask_phy_preamble = -1;
static int hf_ieee802154_nonask_phy_sfd = -1;
static int hf_ieee802154_nonask_phy_length = -1;
Eliminate proto_tree_add_text from some dissectors. Other minor cleanup while in the neighborhood. Change-Id: Ib76f4a9f89b5933425760af0a980c6a549031b8f Reviewed-on: https://code.wireshark.org/review/3537 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-09 17:43:44 +00:00
static int hf_ieee802154_nonask_phr = -1;
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static int proto_ieee802154 = -1;
From Colin O'Flynn: Fix name of wpan (IEEE 802.15.4) fields to be more consistent, add in generic wpan.length field. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5952 svn path=/trunk/; revision=40838
2012-02-04 13:43:58 +00:00
static int hf_ieee802154_frame_length = -1;
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
static int hf_ieee802154_fcf = -1;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static int hf_ieee802154_frame_type = -1;
static int hf_ieee802154_security = -1;
static int hf_ieee802154_pending = -1;
static int hf_ieee802154_ack_request = -1;
Changed references for IntraPAN to PAN ID Compression as per all versions 802.15.4-2006 and laterChange-Id: I99e66919c86712533cd37fef9d4c464b75444d93 Change-Id: I9ec2b1a6d457d887a7202f7fe0894c3894cb1ecb Reviewed-on: https://code.wireshark.org/review/12514 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-11 01:06:04 +00:00
static int hf_ieee802154_pan_id_compression = -1;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
static int hf_ieee802154_seqno_suppression = -1;
static int hf_ieee802154_ie_present = -1;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static int hf_ieee802154_src_addr_mode = -1;
static int hf_ieee802154_version = -1;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
static int hf_ieee802154_dst_addr_mode = -1;
static int hf_ieee802154_header_ie = -1;
static int hf_ieee802154_header_ie_type = -1;
static int hf_ieee802154_header_ie_id = -1;
static int hf_ieee802154_header_ie_length = -1;
static int hf_ieee802154_header_ie_data = -1;
static int hf_ieee802154_payload_ie = -1;
static int hf_ieee802154_payload_ie_type = -1;
static int hf_ieee802154_payload_ie_id = -1;
static int hf_ieee802154_payload_ie_length = -1;
static int hf_ieee802154_payload_ie_data = -1;
static int hf_ieee802154_seqno = -1;
From Colin O'Flynn: Fix name of wpan (IEEE 802.15.4) fields to be more consistent, add in generic wpan.length field. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5952 svn path=/trunk/; revision=40838
2012-02-04 13:43:58 +00:00
static int hf_ieee802154_dst_panID = -1;
static int hf_ieee802154_dst16 = -1;
static int hf_ieee802154_dst64 = -1;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static int hf_ieee802154_src_panID = -1;
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
static int hf_ieee802154_src16 = -1;
static int hf_ieee802154_src64 = -1;
static int hf_ieee802154_src64_origin = -1;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static int hf_ieee802154_fcs = -1;
static int hf_ieee802154_rssi = -1;
static int hf_ieee802154_fcs_ok = -1;
Initialize some hf_... vars to -1; (Reduces the number of checkhf false positives) svn path=/trunk/; revision=47310
2013-01-26 21:42:36 +00:00
static int hf_ieee802154_correlation = -1;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Registered fields for Command Packets */
static int hf_ieee802154_cmd_id = -1;
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
static int hf_ieee802154_cinfo_alt_coord = -1;
static int hf_ieee802154_cinfo_device_type = -1;
static int hf_ieee802154_cinfo_power_src = -1;
static int hf_ieee802154_cinfo_idle_rx = -1;
static int hf_ieee802154_cinfo_sec_capable = -1;
static int hf_ieee802154_cinfo_alloc_addr = -1;
static int hf_ieee802154_assoc_addr = -1;
static int hf_ieee802154_assoc_status = -1;
static int hf_ieee802154_disassoc_reason = -1;
static int hf_ieee802154_realign_pan = -1;
static int hf_ieee802154_realign_caddr = -1;
static int hf_ieee802154_realign_channel = -1;
static int hf_ieee802154_realign_addr = -1;
static int hf_ieee802154_realign_channel_page = -1;
static int hf_ieee802154_gtsreq_len = -1;
static int hf_ieee802154_gtsreq_dir = -1;
static int hf_ieee802154_gtsreq_type = -1;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Registered fields for Beacon Packets */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
static int hf_ieee802154_beacon_order = -1;
static int hf_ieee802154_superframe_order = -1;
static int hf_ieee802154_cap = -1;
static int hf_ieee802154_superframe_battery_ext = -1;
static int hf_ieee802154_superframe_coord = -1;
static int hf_ieee802154_assoc_permit = -1;
static int hf_ieee802154_gts_count = -1;
static int hf_ieee802154_gts_permit = -1;
static int hf_ieee802154_gts_direction = -1;
Eliminate proto_tree_add_text from some dissectors. Other minor cleanup while in the neighborhood. Change-Id: Ib76f4a9f89b5933425760af0a980c6a549031b8f Reviewed-on: https://code.wireshark.org/review/3537 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-09 17:43:44 +00:00
static int hf_ieee802154_gts_address = -1;
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
static int hf_ieee802154_pending16 = -1;
static int hf_ieee802154_pending64 = -1;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
/* Registered fields for Auxiliary Security Header */
Eliminate proto_tree_add_text from some dissectors. Other minor cleanup while in the neighborhood. Change-Id: Ib76f4a9f89b5933425760af0a980c6a549031b8f Reviewed-on: https://code.wireshark.org/review/3537 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-09 17:43:44 +00:00
static int hf_ieee802154_security_control_field = -1;
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
static int hf_ieee802154_security_level = -1;
static int hf_ieee802154_key_id_mode = -1;
static int hf_ieee802154_aux_sec_reserved = -1;
static int hf_ieee802154_aux_sec_frame_counter = -1;
static int hf_ieee802154_aux_sec_key_source = -1;
static int hf_ieee802154_aux_sec_key_index = -1;
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
/* 802.15.4-2003 security */
static int hf_ieee802154_sec_frame_counter = -1;
static int hf_ieee802154_sec_key_sequence_counter = -1;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Initialize Subtree Pointers */
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
static gint ett_ieee802154_nonask_phy = -1;
static gint ett_ieee802154_nonask_phy_phr = -1;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static gint ett_ieee802154 = -1;
static gint ett_ieee802154_fcf = -1;
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
static gint ett_ieee802154_auxiliary_security = -1;
static gint ett_ieee802154_aux_sec_control = -1;
static gint ett_ieee802154_aux_sec_key_id = -1;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static gint ett_ieee802154_fcs = -1;
static gint ett_ieee802154_cmd = -1;
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
static gint ett_ieee802154_superframe = -1;
static gint ett_ieee802154_gts = -1;
static gint ett_ieee802154_gts_direction = -1;
static gint ett_ieee802154_gts_descriptors = -1;
static gint ett_ieee802154_pendaddr = -1;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
static gint ett_ieee802154_header = -1;
static gint ett_ieee802154_header_ie = -1;
static gint ett_ieee802154_payload = -1;
static gint ett_ieee802154_payload_ie = -1;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
Batch of filterable expert info. svn path=/trunk/; revision=51688
2013-09-02 23:32:31 +00:00
static expert_field ei_ieee802154_invalid_addressing = EI_INIT;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
static expert_field ei_ieee802154_invalid_panid_compression = EI_INIT;
Batch of filterable expert info. svn path=/trunk/; revision=51688
2013-09-02 23:32:31 +00:00
static expert_field ei_ieee802154_fcs = EI_INIT;
static expert_field ei_ieee802154_decrypt_error = EI_INIT;
static expert_field ei_ieee802154_dst = EI_INIT;
static expert_field ei_ieee802154_src = EI_INIT;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
static expert_field ei_ieee802154_frame_ver = EI_INIT;
static expert_field ei_ieee802154_frame_type = EI_INIT;
static expert_field ei_ieee802154_seqno_suppression = EI_INIT;
Batch of filterable expert info. svn path=/trunk/; revision=51688
2013-09-02 23:32:31 +00:00
Add address type registration. Now address types are setup just like field types and must be registered with a structure that provides its string representation (and more things in the future). Address types that are limited to a single dissector are registered by the dissector. More "common" ones are globally registered. There are still a few that really belong in a dissector, but have other dependencies currently not accounted for in the address type support. Many of the "address to string" conversions that involved g_sprintf have be changed to use more "performance friendly" methods (some at the cost of needing to_str-int.h) Leaving all comments regarding this "solution" in address_to_str.c in until all have been implemented Change-Id: I494f413e016b22859c44675def11135f228796e0 Reviewed-on: https://code.wireshark.org/review/7019 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-08 03:15:55 +00:00
static int ieee802_15_4_short_address_type = -1;
Tighten heuristic checks for IEEE 802.15.4 protocols, and add Decode-As by PANID for when we still get it wrong. Change-Id: Icc2b274d2478a9426da881998bbbbfb3bf34ec4a Reviewed-on: https://code.wireshark.org/review/1167 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18 03:33:42 +00:00
/*
* Dissector handles
* - beacon dissection is always heuristic.
* - the PANID table is for stateful dissectors only (ie: Decode-As)
* - otherwise, data dissectors fall back to the heuristic dissectors.
*/
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static dissector_handle_t data_handle;
Tighten heuristic checks for IEEE 802.15.4 protocols, and add Decode-As by PANID for when we still get it wrong. Change-Id: Icc2b274d2478a9426da881998bbbbfb3bf34ec4a Reviewed-on: https://code.wireshark.org/review/1167 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18 03:33:42 +00:00
static dissector_table_t panid_dissector_table;
static heur_dissector_list_t ieee802154_beacon_subdissector_list;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static heur_dissector_list_t ieee802154_heur_subdissector_list;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/* Versions */
static const value_string ieee802154_frame_versions[] = {
{ IEEE802154_VERSION_2003, "IEEE Std 802.15.4-2003" },
{ IEEE802154_VERSION_2006, "IEEE Std 802.15.4-2006" },
{ IEEE802154_VERSION_2012e, "IEEE Std 802.15.4-2012e" },
{ IEEE802154_VERSION_RESERVED, "Reserved" },
{ 0, NULL }
};
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Name Strings */
Fix typos. svn path=/trunk/; revision=24570
2008-03-05 21:04:42 +00:00
static const value_string ieee802154_frame_types[] = {
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
{ IEEE802154_FCF_BEACON, "Beacon" },
{ IEEE802154_FCF_DATA, "Data" },
{ IEEE802154_FCF_ACK, "Ack" },
{ IEEE802154_FCF_CMD, "Command" },
{ IEEE802154_FCF_RESERVED, "Reserved" },
{ IEEE802154_FCF_MULTIPURPOSE, "Multipurpose" },
{ IEEE802154_FCF_FRAGMENT, "Fragment or Frak" },
{ IEEE802154_FCF_EXTENDED, "Extended" },
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{ 0, NULL }
};
Fix typos. svn path=/trunk/; revision=24570
2008-03-05 21:04:42 +00:00
static const value_string ieee802154_addr_modes[] = {
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
{ IEEE802154_FCF_ADDR_NONE, "None" },
{ IEEE802154_FCF_ADDR_RESERVED, "Reserved" },
{ IEEE802154_FCF_ADDR_SHORT, "Short/16-bit" },
{ IEEE802154_FCF_ADDR_EXT, "Long/64-bit" },
Fix typos. svn path=/trunk/; revision=24570
2008-03-05 21:04:42 +00:00
{ 0, NULL }
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
};
Fix typos. svn path=/trunk/; revision=24570
2008-03-05 21:04:42 +00:00
static const value_string ieee802154_cmd_names[] = {
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
{ IEEE802154_CMD_ASSOC_REQ, "Association Request" },
{ IEEE802154_CMD_ASSOC_RSP, "Association Response" },
{ IEEE802154_CMD_DISASSOC_NOTIFY, "Disassociation Notification" },
{ IEEE802154_CMD_DATA_RQ, "Data Request" },
{ IEEE802154_CMD_PANID_CONFLICT, "PAN ID Conflict" },
{ IEEE802154_CMD_ORPHAN_NOTIFY, "Orphan Notification" },
{ IEEE802154_CMD_BEACON_REQ, "Beacon Request" },
{ IEEE802154_CMD_COORD_REALIGN, "Coordinator Realignment" },
{ IEEE802154_CMD_GTS_REQ, "GTS Request" },
{ IEEE802154_CMD_TRLE_MGMT_REQ, "TRLE Management Request"},
{ IEEE802154_CMD_TRLE_MGMT_RSP, "TRLE Management Response"},
{ IEEE802154_CMD_DSME_ASSOC_REQ, "DSME Association Request"},
{ IEEE802154_CMD_DSME_ASSOC_RSP, "DSME Association Response"},
{ IEEE802154_CMD_DSME_GTS_REQ, "DSME GTS Request"},
{ IEEE802154_CMD_DSME_GTS_RSP, "DSME GTS Response"},
{ IEEE802154_CMD_DSME_GTS_NOTIFY, "DSME GTS Notify"},
{ IEEE802154_CMD_DSME_INFO_REQ, "DSME Information Request"},
{ IEEE802154_CMD_DSME_INFO_RSP, "DSME Information Reponse"},
{ IEEE802154_CMD_DSME_BEACON_ALLOC_NOTIFY, "DSME Beacon Allocation Notification"},
{ IEEE802154_CMD_DSME_BEACON_COLL_NOTIFY, "DSME Beacon Collision Notification"},
{ IEEE802154_CMD_DSME_LINK_REPORT, "DSME Link Report"},
{ IEEE802154_CMD_RIT_DATA_REQ, "RIT Data Request"},
{ IEEE802154_CMD_DBS_REQ, "DBS Request"},
{ IEEE802154_CMD_DBS_RSP, "DBS Response"},
Fix typos. svn path=/trunk/; revision=24570
2008-03-05 21:04:42 +00:00
{ 0, NULL }
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
};
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
static const value_string ieee802154_sec_level_names[] = {
{ SECURITY_LEVEL_NONE, "No Security" },
{ SECURITY_LEVEL_MIC_32, "32-bit Message Integrity Code" },
{ SECURITY_LEVEL_MIC_64, "64-bit Message Integrity Code" },
{ SECURITY_LEVEL_MIC_128, "128-bit Message Integrity Code" },
{ SECURITY_LEVEL_ENC, "Encryption" },
{ SECURITY_LEVEL_ENC_MIC_32, "Encryption with 32-bit Message Integrity Code" },
{ SECURITY_LEVEL_ENC_MIC_64, "Encryption with 64-bit Message Integrity Code" },
{ SECURITY_LEVEL_ENC_MIC_128, "Encryption with 128-bit Message Integrity Code" },
{ 0, NULL }
};
static const value_string ieee802154_key_id_mode_names[] = {
{ KEY_ID_MODE_IMPLICIT, "Implicit Key" },
{ KEY_ID_MODE_KEY_INDEX, "Indexed Key using the Default Key Source" },
{ KEY_ID_MODE_KEY_EXPLICIT_4, "Explicit Key with 4-octet Key Source" },
{ KEY_ID_MODE_KEY_EXPLICIT_8, "Explicit Key with 8-octet Key Source" },
{ 0, NULL }
};
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
static const true_false_string ieee802154_gts_direction_tfs = {
"Receive Only",
"Transmit Only"
};
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
/* The 802.15.4-2003 security suites for the security preferences (only AES-CCM suites are supported). */
/* NOTE: The equivalent 2006 security level identifer enumerations are used to simplify 2003 & 2006 integration! */
Make all enum_val_t's const. svn path=/trunk/; revision=46292
2012-11-29 20:15:37 +00:00
static const enum_val_t ieee802154_2003_sec_suite_enums[] = {
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
{ "AES-CCM-128", "AES-128 Encryption, 128-bit Integrity Protection", SECURITY_LEVEL_ENC_MIC_128 },
{ "AES-CCM-64", "AES-128 Encryption, 64-bit Integrity Protection", SECURITY_LEVEL_ENC_MIC_64 },
{ "AES-CCM-32", "AES-128 Encryption, 32-bit Integrity Protection", SECURITY_LEVEL_ENC_MIC_32 },
{ NULL, NULL, 0 }
};
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
static const value_string ieee802154_ie_types[] = {
{ 0, "Header" },
{ 1, "Payload" },
{ 0, NULL }
};
static const value_string ieee802154_header_ie_names[] = {
{ IEEE802154_HEADER_IE_EID_TERM1, "Header Termination 1" },
{ IEEE802154_HEADER_IE_EID_TERM2, "Header Termination 2" },
{ 0, NULL }
};
static const value_string ieee802154_payload_ie_names[] = {
{ IEEE802154_PAYLOAD_IE_GID_TERM, "Payload Termination IE" },
{ 0, NULL }
};
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
/* Preferences for 2003 security */
static gint ieee802154_sec_suite = SECURITY_LEVEL_ENC_MIC_64;
static gboolean ieee802154_extend_auth = TRUE;
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Macro to check addressing, and throw a warning flag if incorrect. */
Batch of filterable expert info. svn path=/trunk/; revision=51688
2013-09-02 23:32:31 +00:00
#define IEEE802154_CMD_ADDR_CHECK(_pinfo_, _item_, _cmdid_, _x_) \
if (!(_x_)) \
expert_add_info_format_text -> expert_add_info_format svn path=/trunk/; revision=51852
2013-09-09 00:44:09 +00:00
expert_add_info_format(_pinfo_, _item_, &ei_ieee802154_invalid_addressing, \
Batch of filterable expert info. svn path=/trunk/; revision=51688
2013-09-02 23:32:31 +00:00
"Invalid Addressing for %s", \
Use val_to_str_const() where appropriate; Also (for a few files): - create/use some extended value strings; - remove unneeded #include files; - remove unneeded variable initialization; - re-order fcns slightly so prefs_reg_handoff...() at end, etc svn path=/trunk/; revision=44438
2012-08-10 22:55:02 +00:00
val_to_str_const(_cmdid_, ieee802154_cmd_names, "Unknown Command"))
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* CRC definitions. IEEE 802.15.4 CRCs vary from CCITT by using an initial value of
* 0x0000, and no XOR out. IEEE802154_CRC_XOR is defined as 0xFFFF in order to un-XOR
* the output from the CCITT CRC routines in Wireshark.
*/
#define IEEE802154_CRC_SEED 0x0000
#define IEEE802154_CRC_XOROUT 0xFFFF
#define ieee802154_crc_tvb(tvb, offset) (crc16_ccitt_tvb_seed(tvb, offset, IEEE802154_CRC_SEED) ^ IEEE802154_CRC_XOROUT)
Add address type registration. Now address types are setup just like field types and must be registered with a structure that provides its string representation (and more things in the future). Address types that are limited to a single dissector are registered by the dissector. More "common" ones are globally registered. There are still a few that really belong in a dissector, but have other dependencies currently not accounted for in the address type support. Many of the "address to string" conversions that involved g_sprintf have be changed to use more "performance friendly" methods (some at the cost of needing to_str-int.h) Leaving all comments regarding this "solution" in address_to_str.c in until all have been implemented Change-Id: I494f413e016b22859c44675def11135f228796e0 Reviewed-on: https://code.wireshark.org/review/7019 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-08 03:15:55 +00:00
Add name resolution support to address type. Add address_with_resolution_to_str API that returns address string + name resolution in the format %s (%s), first string is resolved name (if available) and second string is raw address string. Convert AT_FCWWN to using proper name resolution format First use of address_with_resolution_to_str with field types in proto.c Change-Id: I2ae77c29a4ffc30bb919fbec00f06629830898c2 Reviewed-on: https://code.wireshark.org/review/7196 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-12 17:03:49 +00:00
static int ieee802_15_4_short_address_to_str(const address* addr, gchar *buf, int buf_len)
Add address type registration. Now address types are setup just like field types and must be registered with a structure that provides its string representation (and more things in the future). Address types that are limited to a single dissector are registered by the dissector. More "common" ones are globally registered. There are still a few that really belong in a dissector, but have other dependencies currently not accounted for in the address type support. Many of the "address to string" conversions that involved g_sprintf have be changed to use more "performance friendly" methods (some at the cost of needing to_str-int.h) Leaving all comments regarding this "solution" in address_to_str.c in until all have been implemented Change-Id: I494f413e016b22859c44675def11135f228796e0 Reviewed-on: https://code.wireshark.org/review/7019 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-08 03:15:55 +00:00
{
guint16 ieee_802_15_4_short_addr = pletoh16(addr->data);
if (ieee_802_15_4_short_addr == 0xffff)
{
g_strlcpy(buf, "Broadcast", buf_len);
Add name resolution support to address type. Add address_with_resolution_to_str API that returns address string + name resolution in the format %s (%s), first string is resolved name (if available) and second string is raw address string. Convert AT_FCWWN to using proper name resolution format First use of address_with_resolution_to_str with field types in proto.c Change-Id: I2ae77c29a4ffc30bb919fbec00f06629830898c2 Reviewed-on: https://code.wireshark.org/review/7196 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-12 17:03:49 +00:00
return 10;
Add address type registration. Now address types are setup just like field types and must be registered with a structure that provides its string representation (and more things in the future). Address types that are limited to a single dissector are registered by the dissector. More "common" ones are globally registered. There are still a few that really belong in a dissector, but have other dependencies currently not accounted for in the address type support. Many of the "address to string" conversions that involved g_sprintf have be changed to use more "performance friendly" methods (some at the cost of needing to_str-int.h) Leaving all comments regarding this "solution" in address_to_str.c in until all have been implemented Change-Id: I494f413e016b22859c44675def11135f228796e0 Reviewed-on: https://code.wireshark.org/review/7019 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-08 03:15:55 +00:00
}
*buf++ = '0';
*buf++ = 'x';
buf = word_to_hex(buf, ieee_802_15_4_short_addr);
*buf = '\0'; /* NULL terminate */
Add name resolution support to address type. Add address_with_resolution_to_str API that returns address string + name resolution in the format %s (%s), first string is resolved name (if available) and second string is raw address string. Convert AT_FCWWN to using proper name resolution format First use of address_with_resolution_to_str with field types in proto.c Change-Id: I2ae77c29a4ffc30bb919fbec00f06629830898c2 Reviewed-on: https://code.wireshark.org/review/7196 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-12 17:03:49 +00:00
return 7;
Add address type registration. Now address types are setup just like field types and must be registered with a structure that provides its string representation (and more things in the future). Address types that are limited to a single dissector are registered by the dissector. More "common" ones are globally registered. There are still a few that really belong in a dissector, but have other dependencies currently not accounted for in the address type support. Many of the "address to string" conversions that involved g_sprintf have be changed to use more "performance friendly" methods (some at the cost of needing to_str-int.h) Leaving all comments regarding this "solution" in address_to_str.c in until all have been implemented Change-Id: I494f413e016b22859c44675def11135f228796e0 Reviewed-on: https://code.wireshark.org/review/7019 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-08 03:15:55 +00:00
}
static int ieee802_15_4_short_address_str_len(const address* addr _U_)
{
return 11;
}
Add fixed length function for address types. This allows for even more cleanup with respect to how address types are handled, including removing address_to_str.c. Most of the functionality was folded into address_types.c, but the remainder was just dispersed because it didn't make sense to keep the file. Change-Id: Id4e9391f0c3c26eff8c27b362e4f7a1970d718b4 Reviewed-on: https://code.wireshark.org/review/7038 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-09 01:36:03 +00:00
static int ieee802_15_4_short_address_len(void)
{
return 2;
}
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
* Dissector helper, parses and displays the frame control field.
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
*
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
*@param tvb pointer to buffer containing raw packet.
*@param pinfo pointer to packet information fields
*@param tree pointer to data tree wireshark uses to display packet.
*@param packet IEEE 802.15.4 packet information.
*@param offset offset into the tvb to find the FCF.
*
*/
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static void
dissect_ieee802154_fcf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ieee802154_packet *packet, guint *offset)
{
Use tvb_new_subset_remaining() rather than tvb_new_subset(); #include <styring.h> not req'd (in a few cases); Minor reformating & whitespace cleanup. svn path=/trunk/; revision=41374
2012-03-06 16:58:09 +00:00
guint16 fcf;
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
static const int * fields[] = {
&hf_ieee802154_frame_type,
&hf_ieee802154_security,
&hf_ieee802154_pending,
&hf_ieee802154_ack_request,
Changed references for IntraPAN to PAN ID Compression as per all versions 802.15.4-2006 and laterChange-Id: I99e66919c86712533cd37fef9d4c464b75444d93 Change-Id: I9ec2b1a6d457d887a7202f7fe0894c3894cb1ecb Reviewed-on: https://code.wireshark.org/review/12514 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-11 01:06:04 +00:00
&hf_ieee802154_pan_id_compression,
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
&hf_ieee802154_seqno_suppression,
&hf_ieee802154_ie_present,
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
&hf_ieee802154_dst_addr_mode,
&hf_ieee802154_version,
&hf_ieee802154_src_addr_mode,
NULL
};
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Get the FCF field. */
fcf = tvb_get_letohs(tvb, *offset);
/* Parse FCF Flags. */
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
packet->frame_type = (fcf & IEEE802154_FCF_TYPE_MASK);
packet->security_enable = (fcf & IEEE802154_FCF_SEC_EN) >> 3;
packet->frame_pending = (fcf & IEEE802154_FCF_FRAME_PND) >> 4;
packet->ack_request = (fcf & IEEE802154_FCF_ACK_REQ) >> 5;
packet->pan_id_compression = (fcf & IEEE802154_FCF_PAN_ID_COMPRESSION) >> 6;
/* bit 7 reserved */
packet->seqno_suppression = (fcf & IEEE802154_FCF_SEQNO_SUPPRESSION) >> 8;
packet->ie_present = (fcf & IEEE802154_FCF_IE_PRESENT) >> 9;
Changed references for IntraPAN to PAN ID Compression as per all versions 802.15.4-2006 and laterChange-Id: I99e66919c86712533cd37fef9d4c464b75444d93 Change-Id: I9ec2b1a6d457d887a7202f7fe0894c3894cb1ecb Reviewed-on: https://code.wireshark.org/review/12514 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-11 01:06:04 +00:00
packet->dst_addr_mode = (fcf & IEEE802154_FCF_DADDR_MASK) >> 10;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
packet->version = (fcf & IEEE802154_FCF_VERSION) >> 12;
Changed references for IntraPAN to PAN ID Compression as per all versions 802.15.4-2006 and laterChange-Id: I99e66919c86712533cd37fef9d4c464b75444d93 Change-Id: I9ec2b1a6d457d887a7202f7fe0894c3894cb1ecb Reviewed-on: https://code.wireshark.org/review/12514 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-11 01:06:04 +00:00
packet->src_addr_mode = (fcf & IEEE802154_FCF_SADDR_MASK) >> 14;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Display the frame type. */
Remove check_col() and the occasional tree. svn path=/trunk/; revision=49920
2013-06-14 01:02:11 +00:00
proto_item_append_text(tree, " %s", val_to_str_const(packet->frame_type, ieee802154_frame_types, "Reserved"));
col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(packet->frame_type, ieee802154_frame_types, "Reserved"));
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
proto_tree_add_bitmask(tree, tvb, *offset, hf_ieee802154_fcf,
ett_ieee802154_fcf, fields, ENC_LITTLE_ENDIAN);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
*offset += 2;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
} /* dissect_ieee802154_fcf */
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/*
*Dissector for IEEE 802.15.4 non-ASK PHY packet with an FCS containing a 16-bit CRC value.
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
*
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
*@param tvb pointer to buffer containing raw packet.
*@param pinfo pointer to packet information fields
*@param tree pointer to data tree wireshark uses to display packet.
*/
register_dissector -> new_register_dissector Picking off "easy" dissectors that only have one or two exit points at most. Change-Id: I25fe6a0aac93980333217d007702799d16946563 Reviewed-on: https://code.wireshark.org/review/11816 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-14 01:18:34 +00:00
static int
dissect_ieee802154_nonask_phy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
{
Use tvb_new_subset_remaining() rather than tvb_new_subset(); #include <styring.h> not req'd (in a few cases); Minor reformating & whitespace cleanup. svn path=/trunk/; revision=41374
2012-03-06 16:58:09 +00:00
proto_tree *ieee802154_tree = NULL;
proto_item *proto_root = NULL;
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
Use tvb_new_subset_remaining() rather than tvb_new_subset(); #include <styring.h> not req'd (in a few cases); Minor reformating & whitespace cleanup. svn path=/trunk/; revision=41374
2012-03-06 16:58:09 +00:00
guint offset = 0;
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
guint8 phr;
Use tvb_new_subset_remaining() rather than tvb_new_subset(); #include <styring.h> not req'd (in a few cases); Minor reformating & whitespace cleanup. svn path=/trunk/; revision=41374
2012-03-06 16:58:09 +00:00
tvbuff_t* mac;
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
/* Create the protocol tree. */
if (tree) {
replace another bunch of deprecated tvb_length calls Change-Id: Ib7c50b55942220d48de025642154b4bf3f39c8a2 Reviewed-on: https://code.wireshark.org/review/9074 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-23 20:58:55 +00:00
proto_root = proto_tree_add_protocol_format(tree, proto_ieee802154_nonask_phy, tvb, 0, tvb_captured_length(tvb), "IEEE 802.15.4 non-ASK PHY");
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
ieee802154_tree = proto_item_add_subtree(proto_root, ett_ieee802154_nonask_phy);
}
/* Add the protocol name. */
Don't guard col_set_str (COL_INFO/COL_PROTOCOL) with col_check svn path=/trunk/; revision=29345
2009-08-09 07:59:51 +00:00
col_set_str(pinfo->cinfo, COL_PROTOCOL, "IEEE 802.15.4 non-ASK PHY");
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
/* Add the packet length. */
replace another bunch of deprecated tvb_length calls Change-Id: Ib7c50b55942220d48de025642154b4bf3f39c8a2 Reviewed-on: https://code.wireshark.org/review/9074 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-23 20:58:55 +00:00
col_add_fstr(pinfo->cinfo, COL_PACKET_LENGTH, "%i", tvb_captured_length(tvb));
Back out 34627 and friends again. svn path=/trunk/; revision=34633
2010-10-24 15:22:44 +00:00
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
phr=tvb_get_guint8(tvb,offset+4+1);
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
if(tree) {
guint loffset=offset;
Eliminate proto_tree_add_text from some dissectors. Other minor cleanup while in the neighborhood. Change-Id: Ib76f4a9f89b5933425760af0a980c6a549031b8f Reviewed-on: https://code.wireshark.org/review/3537 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-09 17:43:44 +00:00
static const int * phr_fields[] = {
&hf_ieee802154_nonask_phy_length,
NULL
};
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
proto_tree_add_item(ieee802154_tree, hf_ieee802154_nonask_phy_preamble, tvb, loffset, 4, ENC_LITTLE_ENDIAN);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
loffset+=4;
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
proto_tree_add_item(ieee802154_tree, hf_ieee802154_nonask_phy_sfd, tvb, loffset, 1, ENC_LITTLE_ENDIAN);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
loffset+=1;
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
Eliminate proto_tree_add_text from some dissectors. Other minor cleanup while in the neighborhood. Change-Id: Ib76f4a9f89b5933425760af0a980c6a549031b8f Reviewed-on: https://code.wireshark.org/review/3537 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-09 17:43:44 +00:00
proto_tree_add_bitmask(ieee802154_tree, tvb, loffset, hf_ieee802154_nonask_phr, ett_ieee802154_nonask_phy_phr,
phr_fields, ENC_NA);
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
}
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
offset+=4+2*1;
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
mac=tvb_new_subset(tvb,offset,-1, phr & IEEE802154_PHY_LENGTH_MASK);
/* Call the common dissector. */
register_dissector -> new_register_dissector Picking off "easy" dissectors that only have one or two exit points at most. Change-Id: I25fe6a0aac93980333217d007702799d16946563 Reviewed-on: https://code.wireshark.org/review/11816 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-14 01:18:34 +00:00
dissect_ieee802154(mac, pinfo, ieee802154_tree, NULL);
return tvb_captured_length(tvb);
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
} /* dissect_ieee802154_nonask_phy */
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
*Dissector for IEEE 802.15.4 packet with an FCS containing a 16-bit CRC value.
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
*
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
*@param tvb pointer to buffer containing raw packet.
*@param pinfo pointer to packet information fields.
*@param tree pointer to data tree wireshark uses to display packet.
*/
register_dissector -> new_register_dissector Picking off "easy" dissectors that only have one or two exit points at most. Change-Id: I25fe6a0aac93980333217d007702799d16946563 Reviewed-on: https://code.wireshark.org/review/11816 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-14 01:18:34 +00:00
static int
dissect_ieee802154(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{
/* Call the common dissector. */
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
dissect_ieee802154_common(tvb, pinfo, tree, (ieee802154_cc24xx ? DISSECT_IEEE802154_OPTION_CC24xx : 0));
register_dissector -> new_register_dissector Picking off "easy" dissectors that only have one or two exit points at most. Change-Id: I25fe6a0aac93980333217d007702799d16946563 Reviewed-on: https://code.wireshark.org/review/11816 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-14 01:18:34 +00:00
return tvb_captured_length(tvb);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
} /* dissect_ieee802154 */
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
* Dissector for IEEE 802.15.4 packet with no FCS present.
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
*
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
*@param tvb pointer to buffer containing raw packet.
*@param pinfo pointer to packet information fields
*@param tree pointer to data tree wireshark uses to display packet.
*@return captured length.
*/
register_dissector -> new_register_dissector Picking off "easy" dissectors that only have one or two exit points at most. Change-Id: I25fe6a0aac93980333217d007702799d16946563 Reviewed-on: https://code.wireshark.org/review/11816 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-14 01:18:34 +00:00
static int
dissect_ieee802154_nofcs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * data _U_)
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{
tvbuff_t *new_tvb;
/* If there is no FCS present in the reported packet, then the length of
* the true IEEE 802.15.4 packet is actually 2 bytes longer. Re-create
* the buffer with an extended reported length so that the packet will
* be handled as though the FCS were truncated.
*
* Note, we can't just call tvb_set_reported_length(), because it includes
* checks to ensure that the new reported length is not longer than the old
* reported length (why?), and will throw an exception.
*/
new_tvb = tvb_new_subset(tvb, 0, -1, tvb_reported_length(tvb)+IEEE802154_FCS_LEN);
/* Call the common dissector. */
dissect_ieee802154_common(new_tvb, pinfo, tree, 0);
register_dissector -> new_register_dissector Picking off "easy" dissectors that only have one or two exit points at most. Change-Id: I25fe6a0aac93980333217d007702799d16946563 Reviewed-on: https://code.wireshark.org/review/11816 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-14 01:18:34 +00:00
return tvb_captured_length(tvb);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
} /* dissect_ieee802154_nofcs */
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
*Dissector for IEEE 802.15.4 packet with a ChipCon/Texas
*Instruments compatible FCS. This is typically called by
*layers encapsulating an IEEE 802.15.4 packet.
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
*
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
*@param tvb pointer to buffer containing raw packet.
*@param pinfo pointer to packet information fields
*@param tree pointer to data tree wireshark uses to display packet.
*/
register_dissector -> new_register_dissector Picking off "easy" dissectors that only have one or two exit points at most. Change-Id: I25fe6a0aac93980333217d007702799d16946563 Reviewed-on: https://code.wireshark.org/review/11816 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-14 01:18:34 +00:00
static int
dissect_ieee802154_cc24xx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * data _U_)
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{
/* Call the common dissector. */
dissect_ieee802154_common(tvb, pinfo, tree, DISSECT_IEEE802154_OPTION_CC24xx);
register_dissector -> new_register_dissector Picking off "easy" dissectors that only have one or two exit points at most. Change-Id: I25fe6a0aac93980333217d007702799d16946563 Reviewed-on: https://code.wireshark.org/review/11816 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-14 01:18:34 +00:00
return tvb_captured_length(tvb);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
} /* dissect_ieee802154_cc24xx */
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
*IEEE 802.15.4 packet dissection routine for Wireshark.
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
*
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
*This function extracts all the information first before displaying.
*If payload exists, that portion will be passed into another dissector
*for further processing.
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
*
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
*This is called after the individual dissect_ieee802154* functions
*have been called to determine what sort of FCS is present.
*The dissect_ieee802154* functions will set the parameters
*in the ieee802154_packet structure, and pass it to this one
*through the data parameter.
*
*@param tvb pointer to buffer containing raw packet.
*@param pinfo pointer to packet information fields
*@param tree pointer to data tree wireshark uses to display packet.
*@param options bitwise or of dissector options (see DISSECT_IEEE802154_OPTION_xxx).
*/
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static void
dissect_ieee802154_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint options)
{
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
tvbuff_t *volatile payload_tvb;
proto_tree *volatile ieee802154_tree = NULL;
proto_item *volatile proto_root = NULL;
From Colin O'Flynn: Fix name of wpan (IEEE 802.15.4) fields to be more consistent, add in generic wpan.length field. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5952 svn path=/trunk/; revision=40838
2012-02-04 13:43:58 +00:00
proto_item *hidden_item;
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
proto_item *ti;
guint offset = 0;
volatile gboolean fcs_ok = TRUE;
const char *saved_proto;
ws_decrypt_status status;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
gboolean dstPanPresent = FALSE;
gboolean srcPanPresent = FALSE;
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
Ensure ieee802154_packet struct is initialized. A malformed capture could cause the zbee-nwk-gp and 6lowpan heuristics to be called with an incompletely-initialized structure, leading to valgrind errors. Change-Id: Iaea6daecdca6856466b58071f095930e68c6e159 Closes-Bug: #9735 Reviewed-on: https://code.wireshark.org/review/418 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-27 00:11:12 +00:00
ieee802154_packet *packet = wmem_new0(wmem_packet_scope(), ieee802154_packet);
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
ieee802154_short_addr addr16;
ieee802154_hints_t *ieee_hints;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
Missed update of one dissector_try_heuristic() when merging. ssed# asn1/s1ap/s1ap.diff Change-Id: I4bb473860bf116138fa82791aa0f4a952164476a Reviewed-on: https://code.wireshark.org/review/1724 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-22 15:47:30 +00:00
heur_dtbl_entry_t *hdtbl_entry;
Change the signature of dissector_try_heuristic() to return hdtbl_entry which can be used to call the found heuristic dissector on the next pass. Introduce call_heur_dissector_direct() to be used to call a heuristic dissector which accepted the frame on the first pass. Change-Id: I524edd717b7d92b510bd60acfeea686d5f2b4582 Reviewed-on: https://code.wireshark.org/review/1697 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-20 10:54:20 +00:00
From Fred Fierling via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5395 : The ZigBee security dissector was not recording the short to long address mappings in Security Headers, preventing the decryption of some payloads. This patch eliminates the Undecoded warnings in packets 1 and 19 in this test capture: https://bugs.wireshark.org/bugzilla/attachment.cgi?id=5457 The keys to decrypt these packets are listed in the bug. svn path=/trunk/; revision=34886
2010-11-15 20:52:41 +00:00
packet->short_table = ieee802154_map.short_table;
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
/* Allocate frame data with hints for upper layers */
if(!pinfo->fd->flags.visited){
More wmem conversion (leaving uat related functions aside) svn path=/trunk/; revision=52055
2013-09-15 13:46:13 +00:00
ieee_hints = wmem_new0(wmem_file_scope(), ieee802154_hints_t);
Create the ability to have packet scoped "proto" data. Bug 9470 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9470) I'm not sold on the name or module the proto_data functions live in, but I believe the function arguments are solid and gives us the most flexibility for the future. And search/replace of a function name is easy enough to do. The big driving force for getting this in sooner rather than later is the saved memory on ethernet packets (and IP packets soon), that used to have file_scope() proto data when all it needed was packet_scope() data (technically packet_info->pool scoped), strictly for Decode As. All dissectors that use p_add_proto_data() only for Decode As functionality have been converted to using packet_scope(). All other dissectors were converted to using file_scope() which was the original scope for "proto" data. svn path=/trunk/; revision=53520
2013-11-23 02:20:13 +00:00
p_add_proto_data(wmem_file_scope(), pinfo, proto_ieee802154, 0, ieee_hints);
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
} else {
Create the ability to have packet scoped "proto" data. Bug 9470 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9470) I'm not sold on the name or module the proto_data functions live in, but I believe the function arguments are solid and gives us the most flexibility for the future. And search/replace of a function name is easy enough to do. The big driving force for getting this in sooner rather than later is the saved memory on ethernet packets (and IP packets soon), that used to have file_scope() proto data when all it needed was packet_scope() data (technically packet_info->pool scoped), strictly for Decode As. All dissectors that use p_add_proto_data() only for Decode As functionality have been converted to using packet_scope(). All other dissectors were converted to using file_scope() which was the original scope for "proto" data. svn path=/trunk/; revision=53520
2013-11-23 02:20:13 +00:00
ieee_hints = (ieee802154_hints_t *)p_get_proto_data(wmem_file_scope(), pinfo, proto_ieee802154, 0);
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
}
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Create the protocol tree. */
if (tree) {
replace another bunch of deprecated tvb_length calls Change-Id: Ib7c50b55942220d48de025642154b4bf3f39c8a2 Reviewed-on: https://code.wireshark.org/review/9074 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-23 20:58:55 +00:00
proto_root = proto_tree_add_protocol_format(tree, proto_ieee802154, tvb, 0, tvb_captured_length(tvb), "IEEE 802.15.4");
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
ieee802154_tree = proto_item_add_subtree(proto_root, ett_ieee802154);
}
/* Add the protocol name. */
Don't guard col_set_str (COL_INFO/COL_PROTOCOL) with col_check svn path=/trunk/; revision=29345
2009-08-09 07:59:51 +00:00
col_set_str(pinfo->cinfo, COL_PROTOCOL, "IEEE 802.15.4");
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Add the packet length. */
replace another bunch of deprecated tvb_length calls Change-Id: Ib7c50b55942220d48de025642154b4bf3f39c8a2 Reviewed-on: https://code.wireshark.org/review/9074 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-23 20:58:55 +00:00
col_add_fstr(pinfo->cinfo, COL_PACKET_LENGTH, "%i", tvb_captured_length(tvb));
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
FT_BOOLEAN hf[] entries with a 0 'bitmask' should have 'display' = BASE_NONE; In some cases: Use val_to_str_const() instead of val_to_str(); Reformat long lines; Do some general whitespace changes. svn path=/trunk/; revision=41587
2012-03-16 02:00:29 +00:00
/* Add the packet length to the filter field */
Add the hidden wpan.frame_length to the IEEE 802.15.4 tree, not the top-level tree. svn path=/trunk/; revision=50541
2013-07-12 21:32:03 +00:00
hidden_item = proto_tree_add_uint(ieee802154_tree, hf_ieee802154_frame_length, NULL, 0, 0, tvb_reported_length(tvb));
From Colin O'Flynn: Fix name of wpan (IEEE 802.15.4) fields to be more consistent, add in generic wpan.length field. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5952 svn path=/trunk/; revision=40838
2012-02-04 13:43:58 +00:00
PROTO_ITEM_SET_HIDDEN(hidden_item);
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/* Frame Control Field */
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
dissect_ieee802154_fcf(tvb, pinfo, ieee802154_tree, packet, &offset);
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/* Sequence Number */
if (packet->seqno_suppression) {
if (packet->version != IEEE802154_VERSION_2012e) {
expert_add_info(pinfo, proto_root, &ei_ieee802154_seqno_suppression);
}
} else { /* IEEE 802.15.4 Sequence Number Suppression */
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
packet->seqno = tvb_get_guint8(tvb, offset);
if (tree) {
proto_tree_add_uint(ieee802154_tree, hf_ieee802154_seqno, tvb, offset, 1, packet->seqno);
/* For Ack packets display this in the root. */
if (packet->frame_type == IEEE802154_FCF_ACK) {
proto_item_append_text(proto_root, ", Sequence Number: %u", packet->seqno);
}
}
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
offset += 1;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
}
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/*
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
* ADDRESSING FIELDS
*/
/* Clear out the addressing strings. */
Use address functions instead of ADDRESS macros in asn1 and epan Replace CMP_ADDRESS, COPY_ADDRESS, et al with their lower-case equivalents in the asn1 and epan directories. Change-Id: I4043b0931d4353d60cffbd829e30269eb8d08cf4 Reviewed-on: https://code.wireshark.org/review/11200 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.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-10-21 19:04:16 +00:00
set_address(&pinfo->net_dst, AT_NONE, 0, NULL);
copy_address_shallow(&pinfo->dl_dst, &pinfo->net_dst);
copy_address_shallow(&pinfo->dst, &pinfo->net_dst);
set_address(&pinfo->net_src, AT_NONE, 0, NULL);
copy_address_shallow(&pinfo->dl_src, &pinfo->net_src);
copy_address_shallow(&pinfo->src, &pinfo->net_src);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
if (packet->dst_addr_mode == IEEE802154_FCF_ADDR_RESERVED) {
/* Invalid Destination Address Mode. Abort Dissection. */
expert_add_info(pinfo, proto_root, &ei_ieee802154_dst);
return;
}
if (packet->src_addr_mode == IEEE802154_FCF_ADDR_RESERVED) {
/* Invalid Source Address Mode. Abort Dissection. */
expert_add_info(pinfo, proto_root, &ei_ieee802154_src);
return;
}
if (packet->version == IEEE802154_VERSION_RESERVED) {
/* Unknown Frame Version. Abort Dissection. */
expert_add_info(pinfo, proto_root, &ei_ieee802154_frame_ver);
return;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
}
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
if ((packet->frame_type == IEEE802154_FCF_BEACON) ||
(packet->frame_type == IEEE802154_FCF_DATA) ||
(packet->frame_type == IEEE802154_FCF_ACK) ||
(packet->frame_type == IEEE802154_FCF_CMD) ) {
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/*
* Table 6 in 802.15.4-2015
*/
if (packet->dst_addr_mode == IEEE802154_FCF_ADDR_NONE) { /* dst not present */
if (packet->src_addr_mode == IEEE802154_FCF_ADDR_NONE) {
if ((packet->version == IEEE802154_VERSION_2003) ||
(packet->version == IEEE802154_VERSION_2006)) {
if (packet->frame_type != IEEE802154_FCF_ACK) {
/* In IEEE 802.15.4-2003 and 2006 only Acknowledgment is
* allowed to have neither a source nor destination address */
expert_add_info(pinfo, proto_root, &ei_ieee802154_invalid_addressing);
return;
}
if (packet->pan_id_compression == 1) {
expert_add_info(pinfo, proto_root, &ei_ieee802154_invalid_panid_compression);
return;
}
}
else { /* Frame Version 0b10 */
if (packet->pan_id_compression == 1) {
dstPanPresent = TRUE;
}
/* else neither are present */
}
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
}
else { /* src present, dst not present */
if ((packet->version == IEEE802154_VERSION_2003) ||
(packet->version == IEEE802154_VERSION_2006)) {
if (packet->pan_id_compression == 1) {
expert_add_info(pinfo, proto_root, &ei_ieee802154_invalid_panid_compression);
return;
}
else {
srcPanPresent = TRUE;
}
}
else { /* Frame Version 0b10 */
if (packet->pan_id_compression == 0) {
srcPanPresent = TRUE;
}
/* else neither present */
}
}
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
}
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/*
* Destination Present
*/
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
else {
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
if (packet->src_addr_mode == IEEE802154_FCF_ADDR_NONE) {
if ((packet->version == IEEE802154_VERSION_2003) ||
(packet->version == IEEE802154_VERSION_2006)) {
if (packet->pan_id_compression == 1) {
expert_add_info(pinfo, proto_root, &ei_ieee802154_invalid_panid_compression);
return;
}
else {
dstPanPresent = TRUE;
}
}
else { /* Frame Version 0b10 */
if (packet->pan_id_compression == 0) {
dstPanPresent = TRUE;
}
}
}
else { /* src present, dst present */
if ((packet->version == IEEE802154_VERSION_2003) ||
(packet->version == IEEE802154_VERSION_2006)) {
if (packet->pan_id_compression == 0) {
dstPanPresent = TRUE;
srcPanPresent = TRUE;
}
else {
dstPanPresent = TRUE;
}
}
else { /* Frame Version 0b10 */
if (packet->pan_id_compression == 0) {
dstPanPresent = TRUE;
}
/* else neither PAN Ids */
}
}
From Owen Kirby: 6LoWPAN: Automatic context detection and draft-ietf-6lowpan-nd-19 updates. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7521 svn path=/trunk/; revision=44723
2012-09-01 11:54:16 +00:00
}
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/*
* Addressing Fields
*/
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/* Destination PAN Id */
if (dstPanPresent) {
packet->dst_pan = tvb_get_letohs(tvb, offset);
if (tree) {
proto_tree_add_uint(ieee802154_tree, hf_ieee802154_dst_panID, tvb, offset, 2, packet->dst_pan);
}
offset += 2;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
}
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/* Destination Address */
if (packet->dst_addr_mode == IEEE802154_FCF_ADDR_SHORT) {
char dst_addr[32];
IEEE 802.15.4: fix display of 64 bits address (broken in gecaa1f8) Change-Id: I1fc117ac6522b4df53ceafb635aeb3b1f34a54d3 Reviewed-on: https://code.wireshark.org/review/6695 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-20 22:22:40 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/* Get the address. */
packet->dst16 = tvb_get_letohs(tvb, offset);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/* Display the destination address. */
if ( packet->dst16 == IEEE802154_BCAST_ADDR ) {
g_snprintf(dst_addr, 32, "Broadcast");
}
else {
g_snprintf(dst_addr, 32, "0x%04x", packet->dst16);
}
/* Provide address hints to higher layers that need it. */
if (ieee_hints) {
ieee_hints->dst16 = packet->dst16;
}
IEEE 802.15.4: fix display of 64 bits address (broken in gecaa1f8) Change-Id: I1fc117ac6522b4df53ceafb635aeb3b1f34a54d3 Reviewed-on: https://code.wireshark.org/review/6695 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-20 22:22:40 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
set_address_tvb(&pinfo->dl_dst, ieee802_15_4_short_address_type, 2, tvb, offset);
copy_address_shallow(&pinfo->dst, &pinfo->dl_dst);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
if (tree) {
proto_tree_add_uint(ieee802154_tree, hf_ieee802154_dst16, tvb, offset, 2, packet->dst16);
proto_item_append_text(proto_root, ", Dst: %s", dst_addr);
}
col_append_fstr(pinfo->cinfo, COL_INFO, ", Dst: %s", dst_addr);
offset += 2;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
}
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
else if (packet->dst_addr_mode == IEEE802154_FCF_ADDR_EXT) {
guint64 *p_addr = (guint64 *)wmem_new(pinfo->pool, guint64);
From Colin O'Flynn: Add a missing NULL pointer check. svn path=/trunk/; revision=34761
2010-11-03 17:52:11 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/* Get the address */
packet->dst64 = tvb_get_letoh64(tvb, offset);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/* Copy and convert the address to network byte order. */
*p_addr = pntoh64(&(packet->dst64));
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/* Display the destination address. */
/* XXX - OUI resolution doesn't happen when displaying resolved
* EUI64 addresses; that should probably be fixed in
* epan/addr_resolv.c.
*/
set_address(&pinfo->dl_dst, AT_EUI64, 8, p_addr);
copy_address_shallow(&pinfo->dst, &pinfo->dl_dst);
if (tree) {
proto_tree_add_item(ieee802154_tree, hf_ieee802154_dst64, tvb, offset, 8, ENC_LITTLE_ENDIAN);
proto_item_append_text(proto_root, ", Dst: %s", eui64_to_display(wmem_packet_scope(), packet->dst64));
}
col_append_fstr(pinfo->cinfo, COL_INFO, ", Dst: %s", eui64_to_display(wmem_packet_scope(), packet->dst64));
offset += 8;
}
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/* Source PAN Id */
if (srcPanPresent) {
packet->src_pan = tvb_get_letohs(tvb, offset);
if (tree) {
proto_tree_add_uint(ieee802154_tree, hf_ieee802154_src_panID, tvb, offset, 2, packet->src_pan);
}
offset += 2;
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
}
else {
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
if (dstPanPresent) {
packet->src_pan = packet->dst_pan;
}
else {
packet->src_pan = IEEE802154_BCAST_PAN;
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
}
}
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
if (ieee_hints) {
ieee_hints->src_pan = packet->src_pan;
}
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/* Source Address */
if (packet->src_addr_mode == IEEE802154_FCF_ADDR_SHORT) {
char src_addr[32];
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/* Get the address. */
packet->src16 = tvb_get_letohs(tvb, offset);
/* Update the Address fields. */
if (packet->src16==IEEE802154_BCAST_ADDR) {
g_snprintf(src_addr, 32, "Broadcast");
}
else {
g_snprintf(src_addr, 32, "0x%04x", packet->src16);
if (!pinfo->fd->flags.visited) {
/* If we know our extended source address from previous packets,
* provide a pointer to it in a hint for upper layers */
addr16.addr = packet->src16;
addr16.pan = packet->src_pan;
if (ieee_hints) {
ieee_hints->src16 = packet->src16;
ieee_hints->map_rec = (ieee802154_map_rec *)
g_hash_table_lookup(ieee802154_map.short_table, &addr16);
}
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
}
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
}
set_address_tvb(&pinfo->dl_src, ieee802_15_4_short_address_type, 2, tvb, offset);
copy_address_shallow(&pinfo->src, &pinfo->dl_src);
/* Add the addressing info to the tree. */
if (tree) {
proto_tree_add_uint(ieee802154_tree, hf_ieee802154_src16, tvb, offset, 2, packet->src16);
proto_item_append_text(proto_root, ", Src: %s", src_addr);
if (ieee_hints && ieee_hints->map_rec) {
/* Display inferred source address info */
ti = proto_tree_add_eui64(ieee802154_tree, hf_ieee802154_src64, tvb, offset, 0,
ieee_hints->map_rec->addr64);
PROTO_ITEM_SET_GENERATED(ti);
if ( ieee_hints->map_rec->start_fnum ) {
ti = proto_tree_add_uint(ieee802154_tree, hf_ieee802154_src64_origin, tvb, 0, 0,
ieee_hints->map_rec->start_fnum);
}
else {
ti = proto_tree_add_uint_format_value(ieee802154_tree, hf_ieee802154_src64_origin, tvb, 0, 0,
ieee_hints->map_rec->start_fnum, "Pre-configured");
}
PROTO_ITEM_SET_GENERATED(ti);
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
}
}
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
col_append_fstr(pinfo->cinfo, COL_INFO, ", Src: %s", src_addr);
Remove check_col() and the occasional tree. svn path=/trunk/; revision=49920
2013-06-14 01:02:11 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
offset += 2;
}
else if (packet->src_addr_mode == IEEE802154_FCF_ADDR_EXT) {
guint64 *p_addr = (guint64 *)wmem_new(pinfo->pool, guint64);
IEEE 802.15.4: fix display of 64 bits address (broken in gecaa1f8) Change-Id: I1fc117ac6522b4df53ceafb635aeb3b1f34a54d3 Reviewed-on: https://code.wireshark.org/review/6695 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-20 22:22:40 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/* Get the address. */
packet->src64 = tvb_get_letoh64(tvb, offset);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/* Copy and convert the address to network byte order. */
*p_addr = pntoh64(&(packet->src64));
IEEE 802.15.4: fix display of 64 bits address (broken in gecaa1f8) Change-Id: I1fc117ac6522b4df53ceafb635aeb3b1f34a54d3 Reviewed-on: https://code.wireshark.org/review/6695 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-20 22:22:40 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/* Display the source address. */
/* XXX - OUI resolution doesn't happen when displaying resolved
* EUI64 addresses; that should probably be fixed in
* epan/addr_resolv.c.
*/
set_address(&pinfo->dl_src, AT_EUI64, 8, p_addr);
copy_address_shallow(&pinfo->src, &pinfo->dl_src);
if (tree) {
proto_tree_add_item(ieee802154_tree, hf_ieee802154_src64, tvb, offset, 8, ENC_LITTLE_ENDIAN);
proto_item_append_text(proto_root, ", Src: %s", eui64_to_display(wmem_packet_scope(), packet->src64));
}
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
col_append_fstr(pinfo->cinfo, COL_INFO, ", Src: %s", eui64_to_display(wmem_packet_scope(), packet->src64));
offset += 8;
}
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
}
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
else {
/* Unsupported Frame Type. Abort Dissection. */
expert_add_info(pinfo, proto_root, &ei_ieee802154_frame_type);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
return;
}
/* Check, but don't display the FCS yet, otherwise the payload dissection
* may be out of place in the tree. But we want to know if the FCS is OK in
* case the CRC is bad (don't want to continue dissection to the NWK layer).
*/
if (tvb_bytes_exist(tvb, tvb_reported_length(tvb)-IEEE802154_FCS_LEN, IEEE802154_FCS_LEN)) {
/* The FCS is in the last two bytes of the packet. */
guint16 fcs = tvb_get_letohs(tvb, tvb_reported_length(tvb)-IEEE802154_FCS_LEN);
/* Check if we are expecting a CC2420-style FCS*/
if (options & DISSECT_IEEE802154_OPTION_CC24xx) {
fcs_ok = (fcs & IEEE802154_CC24xx_CRC_OK);
}
else {
Made FCS calculation and checking code work on GCC 4.3.1. Made FCS check actually mean something. svn path=/trunk/; revision=26125
2008-09-03 05:56:30 +00:00
guint16 fcs_calc = ieee802154_crc_tvb(tvb, tvb_reported_length(tvb)-IEEE802154_FCS_LEN);
fcs_ok = (fcs == fcs_calc);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
}
}
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/* Existance of the Auxiliary Security Header is controlled by the Security Enabled Field */
if (packet->security_enable) {
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
proto_tree *header_tree, *field_tree;
guint8 security_control;
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
guint aux_length = 5; /* Minimum length of the auxiliary header. */
Eliminate proto_tree_add_text from some dissectors. Other minor cleanup while in the neighborhood. Change-Id: Ib76f4a9f89b5933425760af0a980c6a549031b8f Reviewed-on: https://code.wireshark.org/review/3537 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-09 17:43:44 +00:00
static const int * security_fields[] = {
&hf_ieee802154_security_level,
&hf_ieee802154_key_id_mode,
&hf_ieee802154_aux_sec_reserved,
NULL
};
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Parse the security control field. */
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
security_control = tvb_get_guint8(tvb, offset);
From beroset: remove C++ incompatibilities https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 (catch the one that almost slipped away) svn path=/trunk/; revision=48404
2013-03-18 22:16:58 +00:00
packet->security_level = (ieee802154_security_level)(security_control & IEEE802154_AUX_SEC_LEVEL_MASK);
packet->key_id_mode = (ieee802154_key_id_mode)((security_control & IEEE802154_AUX_KEY_ID_MODE_MASK) >> IEEE802154_AUX_KEY_ID_MODE_SHIFT);
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
/* Compute the length of the auxiliary header and create a subtree. */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
if (packet->key_id_mode != KEY_ID_MODE_IMPLICIT) aux_length++;
if (packet->key_id_mode == KEY_ID_MODE_KEY_EXPLICIT_4) aux_length += 4;
if (packet->key_id_mode == KEY_ID_MODE_KEY_EXPLICIT_8) aux_length += 8;
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
header_tree = proto_tree_add_subtree(ieee802154_tree, tvb, offset, aux_length,
ett_ieee802154_auxiliary_security, NULL, "Auxiliary Security Header");
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
/* Security Control Field */
Eliminate proto_tree_add_text from some dissectors. Other minor cleanup while in the neighborhood. Change-Id: Ib76f4a9f89b5933425760af0a980c6a549031b8f Reviewed-on: https://code.wireshark.org/review/3537 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-09 17:43:44 +00:00
proto_tree_add_bitmask(header_tree, tvb, offset, hf_ieee802154_security_control_field, ett_ieee802154_aux_sec_control, security_fields, ENC_NA);
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
offset++;
/* Frame Counter Field */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
packet->frame_counter = tvb_get_letohl (tvb, offset);
proto_tree_add_uint(header_tree, hf_ieee802154_aux_sec_frame_counter, tvb, offset,4, packet->frame_counter);
offset +=4;
/* Key identifier field(s). */
if (packet->key_id_mode != KEY_ID_MODE_IMPLICIT) {
/* Create a subtree. */
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
field_tree = proto_tree_add_subtree(header_tree, tvb, offset, 1,
ett_ieee802154_aux_sec_key_id, &ti, "Key Identifier Field"); /* Will fix length later. */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Add key source, if it exists. */
if (packet->key_id_mode == KEY_ID_MODE_KEY_EXPLICIT_4) {
Squelch some compiler complaints. svn path=/trunk/; revision=32572
2010-04-27 07:41:28 +00:00
packet->key_source.addr32 = tvb_get_ntohl(tvb, offset);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
proto_tree_add_uint64(field_tree, hf_ieee802154_aux_sec_key_source, tvb, offset, 4, packet->key_source.addr32);
proto_item_set_len(ti, 1 + 4);
Fix a bunch of warnings. Cast away some implicit 64-bit-to-32-bit conversion errors due to use of sizeof. Cast away some implicit 64-bit-to-32-bit conversion errors due to use of strtol() and strtoul(). Change some data types to avoid those implicit conversion warnings. When assigning a constant to a float, make sure the constant isn't a double, by appending "f" to the constant. Constify a bunch of variables, parameters, and return values to eliminate warnings due to strings being given const qualifiers. Cast away those warnings in some cases where an API we don't control forces us to do so. Enable a bunch of additional warnings by default. Note why at least some of the other warnings aren't enabled. randpkt.c and text2pcap.c are used to build programs, so they don't need to be in EXTRA_DIST. If the user specifies --enable-warnings-as-errors, add -Werror *even if the user specified --enable-extra-gcc-flags; assume they know what they're doing and are willing to have the compile fail due to the extra GCC warnings being treated as errors. svn path=/trunk/; revision=46748
2012-12-26 05:57:06 +00:00
offset += (int)sizeof (guint32);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
}
if (packet->key_id_mode == KEY_ID_MODE_KEY_EXPLICIT_8) {
packet->key_source.addr64 = tvb_get_ntoh64(tvb, offset);
proto_tree_add_uint64(field_tree, hf_ieee802154_aux_sec_key_source, tvb, offset, 8, packet->key_source.addr64);
Add FT_EUI64 Field Type * Remove proto_tree_add_eui64 function from 802.15.4 Dissector * Replace print_eui64/print_eui64 by eui64_to_str/get_eui64_name * Update Documentation (README.dev) * Add new function in libwireshark.def * Support of encoding for tvb_eui64_to_str * Use FT_EUI64 for ICMPv6, CAPWAP, Zbee ... dissector svn path=/trunk/; revision=37015
2011-05-08 10:23:53 +00:00
proto_item_set_len(ti, 1 + 8);
From Rakesh Kumar: Error in AUXILIARY SECURITY HEADER Parsing for 802.15.4 in dissect_ieee802154_common function. Offset should be +8 not +4 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7864 svn path=/trunk/; revision=45559
2012-10-15 15:59:47 +00:00
offset += 8;
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
}
/* Add key identifier. */
packet->key_index = tvb_get_guint8(tvb, offset);
proto_tree_add_uint(field_tree, hf_ieee802154_aux_sec_key_index, tvb, offset,1, packet->key_index);
offset++;
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
}
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
}
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/*
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
* NONPAYLOAD FIELDS
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
*
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
*/
/* All of the beacon fields, except the beacon payload are considered nonpayload. */
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
if ((packet->version == IEEE802154_VERSION_2003) || (packet->version == IEEE802154_VERSION_2006)) {
if (packet->frame_type == IEEE802154_FCF_BEACON) { /* Regular Beacon. These are not present in Enhanced frame version 2 Beacons */
dissect_ieee802154_superframe(tvb, pinfo, ieee802154_tree, &offset); /* superframe spec */
dissect_ieee802154_gtsinfo(tvb, pinfo, ieee802154_tree, &offset); /* GTS information fields */
dissect_ieee802154_pendaddr(tvb, pinfo, ieee802154_tree, &offset); /* Pending address list */
}
ZigBee: fix for inabulity to parse ZigBee packets due to parsing _any_ IEEE 802.15.4 packet as a command. In dissect_ieee802154_common() any packet unconditionally parsed as a command, command it byte cut. As a result, all except MAC commands are garbaged. Added check for the frame type and parce/cut command id only for 802.15.4 commands. Bug: 11929 Change-Id: Iab17d28c19485063e3d802eec3dc03a9d9c33a7a Reviewed-on: https://code.wireshark.org/review/12860 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: Graham Bloice <graham.bloice@trihedral.com>
2015-12-25 11:04:08 +00:00
if (packet->frame_type == IEEE802154_FCF_CMD) {
/**
* In IEEE802.15.4-2003 and 2006 the command identifier is considered to be part of the header
* and is thus not encrypted. For IEEE802.15.4-2012e and later the command id is considered to be
* part of the payload, is encrypted, and follows the payload IEs. Thus we only parse the command id
* here for 2006 and earlier frames. */
packet->command_id = tvb_get_guint8(tvb, offset);
if (tree) {
proto_tree_add_uint(ieee802154_tree, hf_ieee802154_cmd_id, tvb, offset, 1, packet->command_id);
}
offset++;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
ZigBee: fix for inabulity to parse ZigBee packets due to parsing _any_ IEEE 802.15.4 packet as a command. In dissect_ieee802154_common() any packet unconditionally parsed as a command, command it byte cut. As a result, all except MAC commands are garbaged. Added check for the frame type and parce/cut command id only for 802.15.4 commands. Bug: 11929 Change-Id: Iab17d28c19485063e3d802eec3dc03a9d9c33a7a Reviewed-on: https://code.wireshark.org/review/12860 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: Graham Bloice <graham.bloice@trihedral.com>
2015-12-25 11:04:08 +00:00
/* Display the command identifier in the info column. */
col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(packet->command_id, ieee802154_cmd_names, "Unknown Command"));
}
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
}
else {
if (packet->ie_present) {
dissect_ieee802154_header_ie(tvb, pinfo, ieee802154_tree, &offset, packet);
}
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
}
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
/* IEEE 802.15.4-2003 may have security information pre-pended to payload */
if (packet->security_enable && (packet->version == IEEE802154_VERSION_2003)) {
/* Store security suite preference in the 2006 security level identifier to simplify 2003 integration! */
From beroset: remove C++ incompatibilities https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 (catch the one that almost slipped away) svn path=/trunk/; revision=48404
2013-03-18 22:16:58 +00:00
packet->security_level = (ieee802154_security_level)ieee802154_sec_suite;
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
/* Frame Counter and Key Sequence Counter prepended to the payload of an encrypted frame */
if (IEEE802154_IS_ENCRYPTED(packet->security_level)) {
packet->frame_counter = tvb_get_letohl (tvb, offset);
Fix a bunch of warnings. Cast away some implicit 64-bit-to-32-bit conversion errors due to use of sizeof. Cast away some implicit 64-bit-to-32-bit conversion errors due to use of strtol() and strtoul(). Change some data types to avoid those implicit conversion warnings. When assigning a constant to a float, make sure the constant isn't a double, by appending "f" to the constant. Constify a bunch of variables, parameters, and return values to eliminate warnings due to strings being given const qualifiers. Cast away those warnings in some cases where an API we don't control forces us to do so. Enable a bunch of additional warnings by default. Note why at least some of the other warnings aren't enabled. randpkt.c and text2pcap.c are used to build programs, so they don't need to be in EXTRA_DIST. If the user specifies --enable-warnings-as-errors, add -Werror *even if the user specified --enable-extra-gcc-flags; assume they know what they're doing and are willing to have the compile fail due to the extra GCC warnings being treated as errors. svn path=/trunk/; revision=46748
2012-12-26 05:57:06 +00:00
proto_tree_add_uint(ieee802154_tree, hf_ieee802154_sec_frame_counter, tvb, offset, (int)sizeof(guint32), packet->frame_counter);
offset += (int)sizeof(guint32);
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
packet->key_sequence_counter = tvb_get_guint8 (tvb, offset);
Fix a bunch of warnings. Cast away some implicit 64-bit-to-32-bit conversion errors due to use of sizeof. Cast away some implicit 64-bit-to-32-bit conversion errors due to use of strtol() and strtoul(). Change some data types to avoid those implicit conversion warnings. When assigning a constant to a float, make sure the constant isn't a double, by appending "f" to the constant. Constify a bunch of variables, parameters, and return values to eliminate warnings due to strings being given const qualifiers. Cast away those warnings in some cases where an API we don't control forces us to do so. Enable a bunch of additional warnings by default. Note why at least some of the other warnings aren't enabled. randpkt.c and text2pcap.c are used to build programs, so they don't need to be in EXTRA_DIST. If the user specifies --enable-warnings-as-errors, add -Werror *even if the user specified --enable-extra-gcc-flags; assume they know what they're doing and are willing to have the compile fail due to the extra GCC warnings being treated as errors. svn path=/trunk/; revision=46748
2012-12-26 05:57:06 +00:00
proto_tree_add_uint(ieee802154_tree, hf_ieee802154_sec_key_sequence_counter, tvb, offset, (int)sizeof(guint8), packet->key_sequence_counter);
offset += (int)sizeof(guint8);
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
}
}
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Encrypted Payload. */
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
if (packet->security_enable) {
Clean up decryption; have it return various indications for whether it was able to decrypt and, if it wasn't, why it wasn't, and put that information into an expert information indication. svn path=/trunk/; revision=31922
2010-02-19 10:24:13 +00:00
payload_tvb = dissect_ieee802154_decrypt(tvb, offset, pinfo, packet, &status);
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
/* Get the unencrypted data if decryption failed. */
if (!payload_tvb) {
/* Deal with possible truncation and the FCS field at the end. */
gint reported_len = tvb_reported_length(tvb)-offset-IEEE802154_FCS_LEN;
replace another bunch of deprecated tvb_length calls Change-Id: Ib7c50b55942220d48de025642154b4bf3f39c8a2 Reviewed-on: https://code.wireshark.org/review/9074 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-23 20:58:55 +00:00
gint captured_len = tvb_captured_length(tvb)-offset;
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
if (reported_len < captured_len) captured_len = reported_len;
payload_tvb = tvb_new_subset(tvb, offset, captured_len, reported_len);
}
Clean up decryption; have it return various indications for whether it was able to decrypt and, if it wasn't, why it wasn't, and put that information into an expert information indication. svn path=/trunk/; revision=31922
2010-02-19 10:24:13 +00:00
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
/* Display the reason for failure, and abort if the error was fatal. */
switch (status) {
case DECRYPT_PACKET_SUCCEEDED:
Clean up decryption; have it return various indications for whether it was able to decrypt and, if it wasn't, why it wasn't, and put that information into an expert information indication. svn path=/trunk/; revision=31922
2010-02-19 10:24:13 +00:00
case DECRYPT_NOT_ENCRYPTED:
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
/* No problem. */
Clean up decryption; have it return various indications for whether it was able to decrypt and, if it wasn't, why it wasn't, and put that information into an expert information indication. svn path=/trunk/; revision=31922
2010-02-19 10:24:13 +00:00
break;
case DECRYPT_VERSION_UNSUPPORTED:
/* We don't support decryption with that version of the protocol */
expert_add_info_format_text -> expert_add_info_format svn path=/trunk/; revision=51852
2013-09-09 00:44:09 +00:00
expert_add_info_format(pinfo, proto_root, &ei_ieee802154_decrypt_error, "We don't support decryption with protocol version %u", packet->version);
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
call_dissector(data_handle, payload_tvb, pinfo, tree);
goto dissect_ieee802154_fcs;
Clean up decryption; have it return various indications for whether it was able to decrypt and, if it wasn't, why it wasn't, and put that information into an expert information indication. svn path=/trunk/; revision=31922
2010-02-19 10:24:13 +00:00
case DECRYPT_PACKET_TOO_SMALL:
expert_add_info_format_text -> expert_add_info_format svn path=/trunk/; revision=51852
2013-09-09 00:44:09 +00:00
expert_add_info_format(pinfo, proto_root, &ei_ieee802154_decrypt_error, "Packet was too small to include the CRC and MIC");
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
call_dissector(data_handle, payload_tvb, pinfo, tree);
goto dissect_ieee802154_fcs;
Clean up decryption; have it return various indications for whether it was able to decrypt and, if it wasn't, why it wasn't, and put that information into an expert information indication. svn path=/trunk/; revision=31922
2010-02-19 10:24:13 +00:00
case DECRYPT_PACKET_NO_EXT_SRC_ADDR:
expert_add_info_format_text -> expert_add_info_format svn path=/trunk/; revision=51852
2013-09-09 00:44:09 +00:00
expert_add_info_format(pinfo, proto_root, &ei_ieee802154_decrypt_error, "No extended source address - can't decrypt");
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
call_dissector(data_handle, payload_tvb, pinfo, tree);
goto dissect_ieee802154_fcs;
Clean up decryption; have it return various indications for whether it was able to decrypt and, if it wasn't, why it wasn't, and put that information into an expert information indication. svn path=/trunk/; revision=31922
2010-02-19 10:24:13 +00:00
case DECRYPT_PACKET_NO_KEY:
expert_add_info_format_text -> expert_add_info_format svn path=/trunk/; revision=51852
2013-09-09 00:44:09 +00:00
expert_add_info_format(pinfo, proto_root, &ei_ieee802154_decrypt_error, "No encryption key set - can't decrypt");
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
call_dissector(data_handle, payload_tvb, pinfo, tree);
goto dissect_ieee802154_fcs;
Clean up decryption; have it return various indications for whether it was able to decrypt and, if it wasn't, why it wasn't, and put that information into an expert information indication. svn path=/trunk/; revision=31922
2010-02-19 10:24:13 +00:00
case DECRYPT_PACKET_DECRYPT_FAILED:
expert_add_info_format_text -> expert_add_info_format svn path=/trunk/; revision=51852
2013-09-09 00:44:09 +00:00
expert_add_info_format(pinfo, proto_root, &ei_ieee802154_decrypt_error, "Decrypt failed");
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
call_dissector(data_handle, payload_tvb, pinfo, tree);
goto dissect_ieee802154_fcs;
Clean up decryption; have it return various indications for whether it was able to decrypt and, if it wasn't, why it wasn't, and put that information into an expert information indication. svn path=/trunk/; revision=31922
2010-02-19 10:24:13 +00:00
case DECRYPT_PACKET_MIC_CHECK_FAILED:
expert_add_info_format_text -> expert_add_info_format svn path=/trunk/; revision=51852
2013-09-09 00:44:09 +00:00
expert_add_info_format(pinfo, proto_root, &ei_ieee802154_decrypt_error, "MIC check failed");
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
/*
* Abort only if the payload was encrypted, in which case we
* probably didn't decrypt the packet right (eg: wrong key).
*/
if (IEEE802154_IS_ENCRYPTED(packet->security_level)) {
call_dissector(data_handle, payload_tvb, pinfo, tree);
goto dissect_ieee802154_fcs;
}
Clean up decryption; have it return various indications for whether it was able to decrypt and, if it wasn't, why it wasn't, and put that information into an expert information indication. svn path=/trunk/; revision=31922
2010-02-19 10:24:13 +00:00
break;
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
}
}
/* Plaintext Payload. */
else {
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
/* Deal with possible truncation and the FCS field at the end. */
gint reported_len = tvb_reported_length(tvb)-offset-IEEE802154_FCS_LEN;
replace another bunch of deprecated tvb_length calls Change-Id: Ib7c50b55942220d48de025642154b4bf3f39c8a2 Reviewed-on: https://code.wireshark.org/review/9074 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-23 20:58:55 +00:00
gint captured_len = tvb_captured_length(tvb)-offset;
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
if (reported_len < captured_len) captured_len = reported_len;
payload_tvb = tvb_new_subset(tvb, offset, captured_len, reported_len);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
}
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/* presense of Payload IEs is defined by the termination of the Header IEs */
if (packet->payload_ie_present) {
dissect_ieee802154_payload_ie(tvb, pinfo, ieee802154_tree, &offset);
}
if ((packet->version == IEEE802154_VERSION_2012e) && (packet->frame_type == IEEE802154_FCF_CMD)) {
/* In 802.15.4e and later the Command Id follows the Payload IEs. */
packet->command_id = tvb_get_guint8(tvb, offset);
if (tree) {
proto_tree_add_uint(ieee802154_tree, hf_ieee802154_cmd_id, tvb, offset, 1, packet->command_id);
}
offset++;
/* Display the command identifier in the info column. */
col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(packet->command_id, ieee802154_cmd_names, "Unknown Command"));
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
}
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
if (tvb_captured_length_remaining(tvb, offset) > IEEE802154_FCS_LEN) {
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/*
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
* Wrap the sub-dissection in a try/catch block in case the payload is
* broken. First we store the current protocol so we can fix it if an
* exception is thrown by the subdissectors.
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
*/
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
saved_proto = pinfo->current_proto;
/* Try to dissect the payload. */
TRY {
switch (packet->frame_type) {
case IEEE802154_FCF_BEACON:
if (!dissector_try_heuristic(ieee802154_beacon_subdissector_list, payload_tvb, pinfo, tree, &hdtbl_entry, packet)) {
/* Could not subdissect, call the data dissector instead. */
call_dissector(data_handle, payload_tvb, pinfo, tree);
}
break;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
case IEEE802154_FCF_CMD:
dissect_ieee802154_command(payload_tvb, pinfo, ieee802154_tree, packet);
break;
case IEEE802154_FCF_DATA:
/* Sanity-check. */
if ((!fcs_ok && ieee802154_fcs_ok) || !tvb_reported_length(payload_tvb)) {
call_dissector(data_handle, payload_tvb, pinfo, tree);
break;
}
/* Try the PANID dissector table for stateful dissection. */
if (dissector_try_uint_new(panid_dissector_table, packet->src_pan, payload_tvb, pinfo, tree, TRUE, packet)) {
break;
}
/* Try again with the destination PANID (if different) */
if (((packet->dst_addr_mode == IEEE802154_FCF_ADDR_SHORT) ||
(packet->dst_addr_mode == IEEE802154_FCF_ADDR_EXT)) &&
(packet->dst_pan != packet->src_pan) &&
dissector_try_uint_new(panid_dissector_table, packet->src_pan, payload_tvb, pinfo, tree, TRUE, packet)) {
break;
}
/* Try heuristic dissection. */
if (dissector_try_heuristic(ieee802154_heur_subdissector_list, payload_tvb, pinfo, tree, &hdtbl_entry, packet)) break;
/* Fall-through to dump undissectable payloads. */
default:
/* Could not subdissect, call the data dissector instead. */
call_dissector(data_handle, payload_tvb, pinfo, tree);
} /* switch */
}
CATCH_ALL {
/*
* Someone encountered an error while dissecting the payload. But
* we haven't yet finished processing all of our layer. Catch and
* display the exception, then fall-through to finish displaying
* the FCS (which we display last so the frame is ordered correctly
* in the tree).
*/
show_exception(payload_tvb, pinfo, tree, EXCEPT_CODE, GET_MESSAGE);
pinfo->current_proto = saved_proto;
}
ENDTRY;
}
/*
* Frame Check Sequence (FCS)
*
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
*/
dissect_ieee802154_fcs:
/* The FCS should be the last bytes of the reported packet. */
offset = tvb_reported_length(tvb)-IEEE802154_FCS_LEN;
/* Dissect the FCS only if it exists (captures which don't or can't get the
* FCS will simply truncate the packet to omit it, but should still set the
* reported length to cover the original packet length), so if the snapshot
* is too short for an FCS don't make a fuss.
*/
if (tvb_bytes_exist(tvb, offset, IEEE802154_FCS_LEN) && (tree)) {
proto_tree *field_tree;
guint16 fcs = tvb_get_letohs(tvb, offset);
/* Display the FCS depending on expected FCS format */
if ((options & DISSECT_IEEE802154_OPTION_CC24xx)) {
/* Create a subtree for the FCS. */
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
field_tree = proto_tree_add_subtree_format(ieee802154_tree, tvb, offset, 2, ett_ieee802154_fcs, NULL,
"Frame Check Sequence (TI CC24xx format): FCS %s", (fcs_ok) ? "OK" : "Bad");
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Display FCS contents. */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
ti = proto_tree_add_int(field_tree, hf_ieee802154_rssi, tvb, offset++, 1, (gint8) (fcs & IEEE802154_CC24xx_RSSI));
Display RSSI in dB instead of dBm. Fixes the last remaining issue reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4507 #BACKPORT(1.10,1.8) svn path=/trunk/; revision=50125
2013-06-24 14:30:00 +00:00
proto_item_append_text(ti, " dB"); /* Displaying Units */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
proto_tree_add_boolean(field_tree, hf_ieee802154_fcs_ok, tvb, offset, 1, (gboolean) (fcs & IEEE802154_CC24xx_CRC_OK));
proto_tree_add_uint(field_tree, hf_ieee802154_correlation, tvb, offset, 1, (guint8) ((fcs & IEEE802154_CC24xx_CORRELATION) >> 8));
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
}
else {
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
ti = proto_tree_add_uint(ieee802154_tree, hf_ieee802154_fcs, tvb, offset, 2, fcs);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
if (fcs_ok) {
proto_item_append_text(ti, " (Correct)");
}
else {
proto_item_append_text(ti, " (Incorrect, expected FCS=0x%04x", ieee802154_crc_tvb(tvb, offset));
}
/* To Help with filtering, add the fcs_ok field to the tree. */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
ti = proto_tree_add_boolean(ieee802154_tree, hf_ieee802154_fcs_ok, tvb, offset, 2, fcs_ok);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
PROTO_ITEM_SET_HIDDEN(ti);
}
}
else if (tree) {
/* Even if the FCS isn't present, add the fcs_ok field to the tree to
* help with filter. Be sure not to make it visible though.
*/
If the FCS isn't present, don't indicate "FCS Valid: True". Instead, indicate "FCS Valid: Unknown". Note: Other changes should be made as well regarding the FCS as part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8859. svn path=/trunk/; revision=50546
2013-07-12 22:53:56 +00:00
ti = proto_tree_add_boolean_format_value(ieee802154_tree, hf_ieee802154_fcs_ok, tvb, offset, 2, fcs_ok, "Unknown");
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
PROTO_ITEM_SET_HIDDEN(ti);
}
/* If the CRC is invalid, make a note of it in the info column. */
if (!fcs_ok) {
* Prefer col_append_str instead of col_append_fstr for constant strings * Remove check_col guards svn path=/trunk/; revision=30127
2009-09-24 20:21:23 +00:00
col_append_str(pinfo->cinfo, COL_INFO, ", Bad FCS");
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
if (tree) proto_item_append_text(proto_root, ", Bad FCS");
/* Flag packet as having a bad crc. */
Batch of filterable expert info. svn path=/trunk/; revision=51688
2013-09-02 23:32:31 +00:00
expert_add_info(pinfo, proto_root, &ei_ieee802154_fcs);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
}
} /* dissect_ieee802154_common */
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
*Subdissector command for the Superframe specification sub-field within the beacon frame.
*
*@param tvb pointer to buffer containing raw packet.
*@param pinfo pointer to packet information fields (unused).
*@param tree pointer to command subtree.
*@param offset offset into the tvbuff to begin dissection.
*/
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static void
Try to pacify the buildbot. svn path=/trunk/; revision=31821
2010-02-07 20:08:00 +00:00
dissect_ieee802154_superframe(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint *offset)
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{
Use proto_tree_add_bitmask for groups of proto_tree_add_boolean. Part 2 of many Change-Id: I50815e7738b011382392f3078a7107d3d9eec4ec Reviewed-on: https://code.wireshark.org/review/5542 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-30 17:51:30 +00:00
static const int * superframe[] = {
&hf_ieee802154_beacon_order,
&hf_ieee802154_superframe_order,
&hf_ieee802154_cap,
&hf_ieee802154_superframe_battery_ext,
&hf_ieee802154_superframe_coord,
&hf_ieee802154_assoc_permit,
NULL
};
proto_tree_add_bitmask_text(tree, tvb, *offset, 2, "Superframe Specification", NULL , ett_ieee802154_superframe, superframe, ENC_LITTLE_ENDIAN, BMT_NO_INT|BMT_NO_TFS);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
(*offset) += 2;
} /* dissect_ieee802154_superframe */
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
*Subdissector command for the GTS information fields within the beacon frame.
*
*@param tvb - pointer to buffer containing raw packet.
*@param pinfo - pointer to packet information fields (unused).
*@param tree - pointer to command subtree.
*@param offset - offset into the tvbuff to begin dissection.
*/
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
static void
Try to pacify the buildbot. svn path=/trunk/; revision=31821
2010-02-07 20:08:00 +00:00
dissect_ieee802154_gtsinfo(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint *offset)
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{
Use tvb_new_subset_remaining() rather than tvb_new_subset(); #include <styring.h> not req'd (in a few cases); Minor reformating & whitespace cleanup. svn path=/trunk/; revision=41374
2012-03-06 16:58:09 +00:00
proto_tree *field_tree = NULL;
proto_tree *subtree = NULL;
proto_item *ti;
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
guint8 gts_spec;
guint8 gts_count;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Get and display the GTS specification field */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
gts_spec = tvb_get_guint8(tvb, *offset);
gts_count = gts_spec & IEEE802154_GTS_COUNT_MASK;
if (tree) {
/* Add Subtree for GTS information. */
if (gts_count) {
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
field_tree = proto_tree_add_subtree(tree, tvb, *offset, 2 + (gts_count * 3), ett_ieee802154_gts, NULL, "GTS");
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
}
else {
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
field_tree = proto_tree_add_subtree(tree, tvb, *offset, 1, ett_ieee802154_gts, NULL, "GTS");
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
}
proto_tree_add_uint(field_tree, hf_ieee802154_gts_count, tvb, *offset, 1, gts_count);
proto_tree_add_boolean(field_tree, hf_ieee802154_gts_permit, tvb, *offset, 1, gts_spec & IEEE802154_GTS_PERMIT_MASK);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
}
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
(*offset) += 1;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* If the GTS descriptor count is nonzero, then the GTS directions mask and descriptor list are present. */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
if (gts_count) {
guint8 gts_directions = tvb_get_guint8(tvb, *offset);
guint gts_rx = 0;
int i;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Display the directions mask. */
if (tree) {
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
proto_tree *dir_tree;
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Create a subtree. */
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
dir_tree = proto_tree_add_subtree(field_tree, tvb, *offset, 1, ett_ieee802154_gts_direction, &ti, "GTS Directions");
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Add the directions to the subtree. */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
for (i=0; i<gts_count; i++) {
gboolean dir = gts_directions & IEEE802154_GTS_DIRECTION_SLOT(i);
proto_tree_add_boolean_format(dir_tree, hf_ieee802154_gts_direction, tvb, *offset, 1, dir, "GTS Slot %i: %s", i+1, dir?"Receive Only":"Transmit Only");
if (dir) gts_rx++;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
} /* for */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
proto_item_append_text(ti, ": %i Receive & %i Transmit", gts_rx, gts_count - gts_rx);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
}
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
(*offset) += 1;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Create a subtree for the GTS descriptors. */
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
subtree = proto_tree_add_subtree(field_tree, tvb, *offset, gts_count * 3, ett_ieee802154_gts_descriptors, NULL, "GTS Descriptors");
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Get and display the GTS descriptors. */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
for (i=0; i<gts_count; i++) {
guint16 gts_addr = tvb_get_letohs(tvb, (*offset));
guint8 gts_slot = tvb_get_guint8(tvb, (*offset)+2);
guint8 gts_length = (gts_slot & IEEE802154_GTS_LENGTH_MASK) >> IEEE802154_GTS_LENGTH_SHIFT;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
From Selvamegala: GTS starting slot in the Beacon frame is not parsed correctly. As per the Spec, in the 3byte gts descriptor value bit 0- 15 refers Device Short address bit 16-19 – Starting slot bit 20-23 – GTS length. (I Dug out the onliner from the attached file) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8946 svn path=/trunk/; revision=51919
2013-09-10 06:32:41 +00:00
gts_slot = (gts_slot & IEEE802154_GTS_SLOT_MASK);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
if (tree) {
/* Add address, slot, and time length fields. */
Eliminate proto_tree_add_text from some dissectors. Other minor cleanup while in the neighborhood. Change-Id: Ib76f4a9f89b5933425760af0a980c6a549031b8f Reviewed-on: https://code.wireshark.org/review/3537 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-09 17:43:44 +00:00
ti = proto_tree_add_uint(subtree, hf_ieee802154_gts_address, tvb, (*offset), 3, gts_addr);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
proto_item_append_text(ti, ", Slot: %i", gts_slot);
Eliminate proto_tree_add_text from some dissectors. Other minor cleanup while in the neighborhood. Change-Id: Ib76f4a9f89b5933425760af0a980c6a549031b8f Reviewed-on: https://code.wireshark.org/review/3537 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-09 17:43:44 +00:00
proto_item_append_text(ti, ", Length: %i", gts_length);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
}
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
(*offset) += 3;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
} /* for */
}
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
} /* dissect_ieee802154_gtsinfo */
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
*Subdissector command for the pending address list fields within the beacon frame.
*
*@param tvb pointer to buffer containing raw packet.
*@param pinfo pointer to packet information fields (unused).
*@param tree pointer to command subtree.
*@offset offset into the tvbuff to begin dissection.
*/
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static void
Try to pacify the buildbot. svn path=/trunk/; revision=31821
2010-02-07 20:08:00 +00:00
dissect_ieee802154_pendaddr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint *offset)
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
proto_tree *subtree;
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
guint8 pend_spec;
guint8 pend_num16;
guint8 pend_num64;
int i;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Get the Pending Addresses specification fields */
pend_spec = tvb_get_guint8(tvb, *offset);
pend_num16 = pend_spec & IEEE802154_PENDADDR_SHORT_MASK;
pend_num64 = (pend_spec & IEEE802154_PENDADDR_LONG_MASK) >> IEEE802154_PENDADDR_LONG_SHIFT;
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
/* Add Subtree for the addresses */
subtree = proto_tree_add_subtree_format(tree, tvb, *offset, 1 + 2*pend_num16 + 8*pend_num64,
ett_ieee802154_pendaddr, NULL, "Pending Addresses: %i Short and %i Long", pend_num16, pend_num64);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
(*offset) += 1;
for (i=0; i<pend_num16; i++) {
guint16 addr = tvb_get_letohs(tvb, *offset);
proto_tree_add_uint(subtree, hf_ieee802154_pending16, tvb, *offset, 2, addr);
(*offset) += 2;
} /* for */
for (i=0; i<pend_num64; i++) {
Add FT_EUI64 Field Type * Remove proto_tree_add_eui64 function from 802.15.4 Dissector * Replace print_eui64/print_eui64 by eui64_to_str/get_eui64_name * Update Documentation (README.dev) * Add new function in libwireshark.def * Support of encoding for tvb_eui64_to_str * Use FT_EUI64 for ICMPv6, CAPWAP, Zbee ... dissector svn path=/trunk/; revision=37015
2011-05-08 10:23:53 +00:00
proto_tree_add_item(subtree, hf_ieee802154_pending64, tvb, *offset, 8, ENC_LITTLE_ENDIAN);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
(*offset) += 8;
} /* for */
} /* dissect_ieee802154_pendaddr */
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
*Subdissector for Header IEs (Information Elements)
*Since the header is never encrypted and the payload may be encrypted,
*we dissect header and payload IEs separately.
*The termination of the Header IE tells us whether there are any
*payload IEs to follow, so it is always set by the termination.
*
*@param tvb pointer to buffer containing raw packet.
*@param pinfo pointer to packet information fields (unused).
*@param tree pointer to command subtree.
*@param offset offset into the tvbuff to begin dissection.
*@param packet IEEE 802.15.4 packet information.
*/
static void
dissect_ieee802154_header_ie(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint *offset, ieee802154_packet *packet)
{
proto_tree *subtree;
guint16 header_ie;
guint16 id;
guint16 length;
GByteArray *gba = g_byte_array_new();
static const int * fields[] = {
&hf_ieee802154_header_ie_type,
&hf_ieee802154_header_ie_id,
&hf_ieee802154_header_ie_length,
NULL
};
do {
header_ie = tvb_get_letohs(tvb, *offset);
id = (header_ie & IEEE802154_HEADER_IE_ID_MASK) >> 7;
length = header_ie & IEEE802154_HEADER_IE_LENGTH_MASK;
/* Create a subtree for this command frame. */
subtree = proto_tree_add_subtree(tree, tvb, *offset, 1, ett_ieee802154_header, NULL, "Header IE");
proto_item_append_text(subtree, ", Element ID: %s, Length: %d", val_to_str_const(id, ieee802154_header_ie_names, "Unknown IE"), length);
proto_tree_add_bitmask(subtree, tvb, *offset, hf_ieee802154_header_ie,
ett_ieee802154_header_ie, fields, ENC_LITTLE_ENDIAN);
*offset += 2;
/* until the Header IEs are finalized, just use the data dissector */
if (length > 0) {
proto_tree_add_bytes_item(subtree, hf_ieee802154_header_ie_data, tvb, *offset, length, ENC_NA, gba, NULL, NULL);
*offset += length;
}
} while ((tvb_reported_length(tvb) > 1) &&
(id != IEEE802154_HEADER_IE_EID_TERM1) &&
(id != IEEE802154_HEADER_IE_EID_TERM2));
/* Presense of Payload IEs is determined by how the Header IEs are terminated */
if ((tvb_reported_length(tvb) > 1) && (id == IEEE802154_HEADER_IE_EID_TERM1)) {
packet->payload_ie_present = TRUE;
}
else {
packet->payload_ie_present = FALSE;
}
} /* dissect_ieee802154_header_ie */
/**
*Subdissector command for Header IEs (Information Elements)
*
*@param tvb pointer to buffer containing raw packet.
*@param pinfo pointer to packet information fields (unused).
*@param tree pointer to command subtree.
*@param offset offset into the tvbuff to begin dissection.
*/
static void
dissect_ieee802154_payload_ie(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint *offset)
{
proto_tree *subtree;
guint16 payload_ie;
guint16 id;
guint16 length;
GByteArray *gba = g_byte_array_new();
static const int * fields[] = {
&hf_ieee802154_payload_ie_type,
&hf_ieee802154_payload_ie_id,
&hf_ieee802154_payload_ie_length,
NULL
};
do {
payload_ie = tvb_get_letohs(tvb, *offset);
id = (payload_ie & IEEE802154_PAYLOAD_IE_ID_MASK) >> 11;
length = payload_ie & IEEE802154_PAYLOAD_IE_LENGTH_MASK;
/* Create a subtree for this command frame. */
subtree = proto_tree_add_subtree(tree, tvb, *offset, 1, ett_ieee802154_payload, NULL, "Payload IE");
proto_item_append_text(subtree, ", Group ID: %s, Length: %d", val_to_str_const(id, ieee802154_payload_ie_names, "Unknown IE"), length);
proto_tree_add_bitmask(subtree, tvb, *offset, hf_ieee802154_payload_ie,
ett_ieee802154_payload_ie, fields, ENC_LITTLE_ENDIAN);
*offset += 2;
/* until the Header IEs are finalized, just use the data dissector */
if (length > 0) {
proto_tree_add_bytes_item(subtree, hf_ieee802154_payload_ie_data, tvb, *offset, length, ENC_NA, gba, NULL, NULL);
*offset += length;
}
} while ((tvb_reported_length(tvb) > 1) && (id != IEEE802154_PAYLOAD_IE_GID_TERM));
}
ieee802154: fix parameter '...' not found in the function declaration / '...' command used in a comment that is not attached to a function declaration [-Wdocumentation] Change-Id: I797e68c409a10877315f2a13fa6f16f8d4a768e2 Reviewed-on: https://code.wireshark.org/review/12871 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-26 13:57:31 +00:00
static const true_false_string tfs_cinfo_device_type = { "FFD", "RFD" };
static const true_false_string tfs_cinfo_power_src = { "AC/Mains Power", "Battery" };
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
*Command subdissector routine for the Association request command.
*
*@param tvb pointer to buffer containing raw packet.
*@param pinfo pointer to packet information fields.
*@param tree pointer to protocol tree.
*@param packet IEEE 802.15.4 packet information.
*/
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static void
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
dissect_ieee802154_assoc_req(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ieee802154_packet *packet)
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
proto_tree *subtree;
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
static const int * capability[] = {
&hf_ieee802154_cinfo_alt_coord,
&hf_ieee802154_cinfo_device_type,
&hf_ieee802154_cinfo_power_src,
&hf_ieee802154_cinfo_idle_rx,
&hf_ieee802154_cinfo_sec_capable,
&hf_ieee802154_cinfo_alloc_addr,
NULL
};
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Create a subtree for this command frame. */
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
subtree = proto_tree_add_subtree(tree, tvb, 0, 1, ett_ieee802154_cmd, NULL,
val_to_str_const(packet->command_id, ieee802154_cmd_names, "Unknown Command"));
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Get and display capability info. */
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
proto_tree_add_bitmask_list(subtree, tvb, 0, 1, capability, ENC_NA);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Call the data dissector for any leftover bytes. */
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
if (tvb_reported_length(tvb) > 1) {
Use tvb_new_subset_remaining() rather than tvb_new_subset(); #include <styring.h> not req'd (in a few cases); Minor reformating & whitespace cleanup. svn path=/trunk/; revision=41374
2012-03-06 16:58:09 +00:00
call_dissector(data_handle, tvb_new_subset_remaining(tvb, 1), pinfo, tree);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
}
} /* dissect_ieee802154_assoc_req */
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
*Command subdissector routine for the Association response command.
*
*@param tvb pointer to buffer containing raw packet.
*@param pinfo pointer to packet information fields.
*@param tree pointer to protocol tree.
*@param packet IEEE 802.15.4 packet information.
*/
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static void
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
dissect_ieee802154_assoc_rsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ieee802154_packet *packet)
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
proto_tree *subtree;
Use tvb_new_subset_remaining() rather than tvb_new_subset(); #include <styring.h> not req'd (in a few cases); Minor reformating & whitespace cleanup. svn path=/trunk/; revision=41374
2012-03-06 16:58:09 +00:00
proto_item *ti;
guint16 short_addr;
guint8 status;
guint offset = 0;
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Create a subtree for this command frame. */
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
subtree = proto_tree_add_subtree(tree, tvb, offset, 3, ett_ieee802154_cmd, NULL,
val_to_str_const(packet->command_id, ieee802154_cmd_names, "Unknown Command"));
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Get and display the short address. */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
short_addr = tvb_get_letohs(tvb, offset);
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
proto_tree_add_uint(subtree, hf_ieee802154_assoc_addr, tvb, offset, 2, short_addr);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
offset += 2;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Get and display the status. */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
status = tvb_get_guint8(tvb, offset);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
if (tree) {
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
ti = proto_tree_add_uint(subtree, hf_ieee802154_assoc_status, tvb, offset, 1, status);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
if (status == IEEE802154_CMD_ASRSP_AS_SUCCESS) proto_item_append_text(ti, " (Association Successful)");
else if (status == IEEE802154_CMD_ASRSP_PAN_FULL) proto_item_append_text(ti, " (PAN Full)");
else if (status == IEEE802154_CMD_ASRSP_PAN_DENIED) proto_item_append_text(ti, " (Association Denied)");
else proto_item_append_text(ti, " (Reserved)");
}
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
offset += 1;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Update the info column. */
Remove check_col() and the occasional tree. svn path=/trunk/; revision=49920
2013-06-14 01:02:11 +00:00
if (status == IEEE802154_CMD_ASRSP_AS_SUCCESS) {
/* Association was successful. */
if (packet->src_addr_mode != IEEE802154_FCF_ADDR_SHORT) {
col_append_fstr(pinfo->cinfo, COL_INFO, ", PAN: 0x%04x", packet->dst_pan);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
}
Remove check_col() and the occasional tree. svn path=/trunk/; revision=49920
2013-06-14 01:02:11 +00:00
if (short_addr != IEEE802154_NO_ADDR16) {
col_append_fstr(pinfo->cinfo, COL_INFO, " Addr: 0x%04x", short_addr);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
}
}
Remove check_col() and the occasional tree. svn path=/trunk/; revision=49920
2013-06-14 01:02:11 +00:00
else {
/* Association was unsuccessful. */
From didier gautheron: remove redundant or use faster col_xxx functions - when the text parameter is constant col_add_str() and col_set_str() are equivalent but col_set_str() is faster. - same for replace col_append_fstr and col_append_str - remove col_clear() when it's redundant: + before a col_set/col_add if the dissector can't throw an exception. - replace col_append() after a col_clear() with faster col_add... or col_set https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9344 svn path=/trunk/; revision=52948
2013-10-29 14:09:20 +00:00
col_append_str(pinfo->cinfo, COL_INFO, ", Unsuccessful");
Remove check_col() and the occasional tree. svn path=/trunk/; revision=49920
2013-06-14 01:02:11 +00:00
}
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
/* Update the address table. */
if ((status == IEEE802154_CMD_ASRSP_AS_SUCCESS) && (short_addr != IEEE802154_NO_ADDR16)) {
From Fred Fierling via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5395 : The ZigBee security dissector was not recording the short to long address mappings in Security Headers, preventing the decryption of some payloads. This patch eliminates the Undecoded warnings in packets 1 and 19 in this test capture: https://bugs.wireshark.org/bugzilla/attachment.cgi?id=5457 The keys to decrypt these packets are listed in the bug. svn path=/trunk/; revision=34886
2010-11-15 20:52:41 +00:00
ieee802154_addr_update(&ieee802154_map, short_addr, packet->dst_pan, packet->dst64,
pinfo->current_proto, pinfo->fd->num);
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
}
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Call the data dissector for any leftover bytes. */
replace another bunch of deprecated tvb_length calls Change-Id: Ib7c50b55942220d48de025642154b4bf3f39c8a2 Reviewed-on: https://code.wireshark.org/review/9074 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-23 20:58:55 +00:00
if (tvb_captured_length(tvb) > offset) {
Use tvb_new_subset_remaining() rather than tvb_new_subset(); #include <styring.h> not req'd (in a few cases); Minor reformating & whitespace cleanup. svn path=/trunk/; revision=41374
2012-03-06 16:58:09 +00:00
call_dissector(data_handle, tvb_new_subset_remaining(tvb, offset), pinfo, tree);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
}
} /* dissect_ieee802154_assoc_rsp */
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
* Command subdissector routine for the Disassociate command.
*
*@param tvb pointer to buffer containing raw packet.
*@param pinfo pointer to packet information fields.
*@param tree pointer to protocol tree.
*@param packet IEEE 802.15.4 packet information.
*/
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static void
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
dissect_ieee802154_disassoc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ieee802154_packet *packet)
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
proto_tree *subtree;
Use tvb_new_subset_remaining() rather than tvb_new_subset(); #include <styring.h> not req'd (in a few cases); Minor reformating & whitespace cleanup. svn path=/trunk/; revision=41374
2012-03-06 16:58:09 +00:00
proto_item *ti;
guint8 reason;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Create a subtree for this command frame. */
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
subtree = proto_tree_add_subtree(tree, tvb, 0, 1, ett_ieee802154_cmd, NULL,
val_to_str_const(packet->command_id, ieee802154_cmd_names, "Unknown Command"));
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
/* Get and display the disassociation reason. */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
reason = tvb_get_guint8(tvb, 0);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
if (tree) {
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
ti = proto_tree_add_uint(subtree, hf_ieee802154_disassoc_reason, tvb, 0, 1, reason);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
switch(reason) {
case 0x01:
proto_item_append_text(ti, " (Coordinator requests device to leave)");
break;
case 0x02:
proto_item_append_text(ti, " (Device wishes to leave)");
break;
default:
proto_item_append_text(ti, " (Reserved)");
break;
} /* switch */
}
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
if (!pinfo->fd->flags.visited) {
/* Update the address tables */
if ( packet->dst_addr_mode == IEEE802154_FCF_ADDR_EXT ) {
ieee802154_long_addr_invalidate(packet->dst64, pinfo->fd->num);
} else if ( packet->dst_addr_mode == IEEE802154_FCF_ADDR_SHORT ) {
ieee802154_short_addr_invalidate(packet->dst16, packet->dst_pan, pinfo->fd->num);
}
}
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Call the data dissector for any leftover bytes. */
replace another bunch of deprecated tvb_length calls Change-Id: Ib7c50b55942220d48de025642154b4bf3f39c8a2 Reviewed-on: https://code.wireshark.org/review/9074 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-23 20:58:55 +00:00
if (tvb_captured_length(tvb) > 1) {
Use tvb_new_subset_remaining() rather than tvb_new_subset(); #include <styring.h> not req'd (in a few cases); Minor reformating & whitespace cleanup. svn path=/trunk/; revision=41374
2012-03-06 16:58:09 +00:00
call_dissector(data_handle, tvb_new_subset_remaining(tvb, 1), pinfo, tree);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
}
} /* dissect_ieee802154_disassoc */
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
* Command subdissector routine for the Coordinator Realignment command.
*
*@param tvb pointer to buffer containing raw packet.
*@param pinfo pointer to packet information fields.
*@param tree pointer to protocol tree.
*@param packet IEEE 802.15.4 packet information.
*/
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static void
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
dissect_ieee802154_realign(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ieee802154_packet *packet)
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
proto_tree *subtree;
ieee802154: (trivial) proto_item_set_len() takes a 'proto_item *' Change-Id: I83945ccf73e2c8f355a3ff843271d35143758b1d Reviewed-on: https://code.wireshark.org/review/6718 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-21 16:38:33 +00:00
proto_item *subitem;
Use tvb_new_subset_remaining() rather than tvb_new_subset(); #include <styring.h> not req'd (in a few cases); Minor reformating & whitespace cleanup. svn path=/trunk/; revision=41374
2012-03-06 16:58:09 +00:00
guint16 pan_id;
guint16 coord_addr;
guint8 channel;
guint16 short_addr;
guint offset = 0;
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Create a subtree for this command frame. */
ieee802154: (trivial) proto_item_set_len() takes a 'proto_item *' Change-Id: I83945ccf73e2c8f355a3ff843271d35143758b1d Reviewed-on: https://code.wireshark.org/review/6718 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-21 16:38:33 +00:00
subtree = proto_tree_add_subtree(tree, tvb, offset, 0, ett_ieee802154_cmd, &subitem,
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
val_to_str_const(packet->command_id, ieee802154_cmd_names, "Unknown Command"));
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Get and display the command PAN ID. */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
pan_id = tvb_get_letohs(tvb, offset);
Remove check_col() and the occasional tree. svn path=/trunk/; revision=49920
2013-06-14 01:02:11 +00:00
proto_tree_add_uint(subtree, hf_ieee802154_realign_pan, tvb, offset, 2, pan_id);
col_append_fstr(pinfo->cinfo, COL_INFO, ", PAN: 0x%04x", pan_id);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
offset += 2;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Get and display the coordinator address. */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
coord_addr = tvb_get_letohs(tvb, offset);
Remove check_col() and the occasional tree. svn path=/trunk/; revision=49920
2013-06-14 01:02:11 +00:00
proto_tree_add_uint(subtree, hf_ieee802154_realign_caddr, tvb, offset, 2, coord_addr);
col_append_fstr(pinfo->cinfo, COL_INFO, ", Coordinator: 0x%04x", coord_addr);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
offset += 2;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Get and display the channel. */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
channel = tvb_get_guint8(tvb, offset);
Remove check_col() and the occasional tree. svn path=/trunk/; revision=49920
2013-06-14 01:02:11 +00:00
proto_tree_add_uint(subtree, hf_ieee802154_realign_channel, tvb, offset, 1, channel);
col_append_fstr(pinfo->cinfo, COL_INFO, ", Channel: %u", channel);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
offset += 1;
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Get and display the short address. */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
short_addr = tvb_get_letohs(tvb, offset);
Back out 34627 and friends again. svn path=/trunk/; revision=34633
2010-10-24 15:22:44 +00:00
if (tree) proto_tree_add_uint(subtree, hf_ieee802154_realign_addr, tvb, offset, 2, short_addr);
Remove check_col() and the occasional tree. svn path=/trunk/; revision=49920
2013-06-14 01:02:11 +00:00
if ((packet->dst_addr_mode == IEEE802154_FCF_ADDR_EXT)
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
&& (short_addr != IEEE802154_NO_ADDR16)) {
col_append_fstr(pinfo->cinfo, COL_INFO, ", Addr: 0x%04x", short_addr);
}
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
offset += 2;
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
/* Update the address table. */
if ((short_addr != IEEE802154_NO_ADDR16) && (packet->dst_addr_mode == IEEE802154_FCF_ADDR_EXT)) {
From Fred Fierling via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5395 : The ZigBee security dissector was not recording the short to long address mappings in Security Headers, preventing the decryption of some payloads. This patch eliminates the Undecoded warnings in packets 1 and 19 in this test capture: https://bugs.wireshark.org/bugzilla/attachment.cgi?id=5457 The keys to decrypt these packets are listed in the bug. svn path=/trunk/; revision=34886
2010-11-15 20:52:41 +00:00
ieee802154_addr_update(&ieee802154_map, short_addr, packet->dst_pan, packet->dst64,
pinfo->current_proto, pinfo->fd->num);
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
}
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Get and display the channel page, if it exists. Added in IEEE802.15.4-2006 */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
if (tvb_bytes_exist(tvb, offset, 1)) {
guint8 channel_page = tvb_get_guint8(tvb, offset);
Back out 34627 and friends again. svn path=/trunk/; revision=34633
2010-10-24 15:22:44 +00:00
if (tree) proto_tree_add_uint(subtree, hf_ieee802154_realign_channel_page, tvb, offset, 1, channel_page);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
offset += 1;
}
/* Fix the length of the command subtree. */
if (tree) {
ieee802154: (trivial) proto_item_set_len() takes a 'proto_item *' Change-Id: I83945ccf73e2c8f355a3ff843271d35143758b1d Reviewed-on: https://code.wireshark.org/review/6718 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-21 16:38:33 +00:00
proto_item_set_len(subitem, offset);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
}
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Call the data dissector for any leftover bytes. */
replace another bunch of deprecated tvb_length calls Change-Id: Ib7c50b55942220d48de025642154b4bf3f39c8a2 Reviewed-on: https://code.wireshark.org/review/9074 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-23 20:58:55 +00:00
if (tvb_captured_length(tvb) > offset) {
Use tvb_new_subset_remaining() rather than tvb_new_subset(); #include <styring.h> not req'd (in a few cases); Minor reformating & whitespace cleanup. svn path=/trunk/; revision=41374
2012-03-06 16:58:09 +00:00
call_dissector(data_handle, tvb_new_subset_remaining(tvb, offset), pinfo, tree);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
}
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
} /* dissect_ieee802154_realign */
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
ieee802154: fix parameter '...' not found in the function declaration / '...' command used in a comment that is not attached to a function declaration [-Wdocumentation] Change-Id: I797e68c409a10877315f2a13fa6f16f8d4a768e2 Reviewed-on: https://code.wireshark.org/review/12871 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-26 13:57:31 +00:00
static const true_false_string tfs_gtsreq_dir = { "Receive", "Transmit" };
static const true_false_string tfs_gtsreq_type= { "Allocate GTS", "Deallocate GTS" };
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
*Command subdissector routine for the GTS request command.
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
*
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
*Assumes that COL_INFO will be set to the command name,
*command name will already be appended to the command subtree
*and protocol root. In addition, assumes that the command ID
*has already been parsed.
*
*@param tvb pointer to buffer containing raw packet.
*@param pinfo pointer to packet information fields (unused).
*@param tree pointer to protocol tree.
*@param packet IEEE 802.15.4 packet information (unused).
*/
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static void
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
dissect_ieee802154_gtsreq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ieee802154_packet *packet)
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
proto_tree *subtree;
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
static const int * characteristics[] = {
&hf_ieee802154_gtsreq_len,
&hf_ieee802154_gtsreq_dir,
&hf_ieee802154_gtsreq_type,
NULL
};
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Create a subtree for this command frame. */
proto_tree_add_subtree[_format] Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:13:51 +00:00
subtree = proto_tree_add_subtree(tree, tvb, 0, 1, ett_ieee802154_cmd, NULL,
val_to_str_const(packet->command_id, ieee802154_cmd_names, "Unknown Command"));
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
proto_tree_add_bitmask_list(subtree, tvb, 0, 1, characteristics, ENC_NA);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Call the data dissector for any leftover bytes. */
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
if (tvb_reported_length(tvb) > 1) {
Use tvb_new_subset_remaining() rather than tvb_new_subset(); #include <styring.h> not req'd (in a few cases); Minor reformating & whitespace cleanup. svn path=/trunk/; revision=41374
2012-03-06 16:58:09 +00:00
call_dissector(data_handle, tvb_new_subset_remaining(tvb, 1), pinfo, tree);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
}
} /* dissect_ieee802154_gtsreq */
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
* Subdissector routine all commands.
*
*@param tvb pointer to buffer containing raw packet.
*@param pinfo pointer to packet information fields (unused).
*@param tree pointer to protocol tree.
*@param packet IEEE 802.15.4 packet information (unused).
*/
Tighten heuristic checks for IEEE 802.15.4 protocols, and add Decode-As by PANID for when we still get it wrong. Change-Id: Icc2b274d2478a9426da881998bbbbfb3bf34ec4a Reviewed-on: https://code.wireshark.org/review/1167 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18 03:33:42 +00:00
static void
dissect_ieee802154_command(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ieee802154_packet *packet)
{
switch (packet->command_id) {
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
case IEEE802154_CMD_ASSOC_REQ:
Tighten heuristic checks for IEEE 802.15.4 protocols, and add Decode-As by PANID for when we still get it wrong. Change-Id: Icc2b274d2478a9426da881998bbbbfb3bf34ec4a Reviewed-on: https://code.wireshark.org/review/1167 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18 03:33:42 +00:00
IEEE802154_CMD_ADDR_CHECK(pinfo, tree, packet->command_id,
(packet->src_addr_mode == IEEE802154_FCF_ADDR_EXT) &&
(packet->dst_addr_mode != IEEE802154_FCF_ADDR_NONE));
dissect_ieee802154_assoc_req(tvb, pinfo, tree, packet);
break;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
case IEEE802154_CMD_ASSOC_RSP:
Tighten heuristic checks for IEEE 802.15.4 protocols, and add Decode-As by PANID for when we still get it wrong. Change-Id: Icc2b274d2478a9426da881998bbbbfb3bf34ec4a Reviewed-on: https://code.wireshark.org/review/1167 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18 03:33:42 +00:00
IEEE802154_CMD_ADDR_CHECK(pinfo, tree, packet->command_id,
(packet->src_addr_mode == IEEE802154_FCF_ADDR_EXT) &&
(packet->dst_addr_mode == IEEE802154_FCF_ADDR_EXT));
dissect_ieee802154_assoc_rsp(tvb, pinfo, tree, packet);
break;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
case IEEE802154_CMD_DISASSOC_NOTIFY:
Tighten heuristic checks for IEEE 802.15.4 protocols, and add Decode-As by PANID for when we still get it wrong. Change-Id: Icc2b274d2478a9426da881998bbbbfb3bf34ec4a Reviewed-on: https://code.wireshark.org/review/1167 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18 03:33:42 +00:00
IEEE802154_CMD_ADDR_CHECK(pinfo, tree, packet->command_id,
(packet->src_addr_mode == IEEE802154_FCF_ADDR_EXT) &&
(packet->dst_addr_mode == IEEE802154_FCF_ADDR_EXT));
dissect_ieee802154_disassoc(tvb, pinfo, tree, packet);
return;
case IEEE802154_CMD_DATA_RQ:
IEEE802154_CMD_ADDR_CHECK(pinfo, tree, packet->command_id, packet->src_addr_mode != IEEE802154_FCF_ADDR_NONE);
/* No payload expected. */
break;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
case IEEE802154_CMD_PANID_CONFLICT:
Tighten heuristic checks for IEEE 802.15.4 protocols, and add Decode-As by PANID for when we still get it wrong. Change-Id: Icc2b274d2478a9426da881998bbbbfb3bf34ec4a Reviewed-on: https://code.wireshark.org/review/1167 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18 03:33:42 +00:00
IEEE802154_CMD_ADDR_CHECK(pinfo, tree, packet->command_id,
(packet->src_addr_mode == IEEE802154_FCF_ADDR_EXT) &&
(packet->dst_addr_mode == IEEE802154_FCF_ADDR_EXT));
/* No payload expected. */
break;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
case IEEE802154_CMD_ORPHAN_NOTIFY:
Tighten heuristic checks for IEEE 802.15.4 protocols, and add Decode-As by PANID for when we still get it wrong. Change-Id: Icc2b274d2478a9426da881998bbbbfb3bf34ec4a Reviewed-on: https://code.wireshark.org/review/1167 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18 03:33:42 +00:00
IEEE802154_CMD_ADDR_CHECK(pinfo, tree, packet->command_id,
(packet->src_addr_mode == IEEE802154_FCF_ADDR_EXT) &&
(packet->dst_addr_mode == IEEE802154_FCF_ADDR_SHORT) &&
(packet->dst16 == IEEE802154_BCAST_ADDR) &&
(packet->src_pan == IEEE802154_BCAST_PAN) &&
(packet->dst_pan == IEEE802154_BCAST_PAN));
/* No payload expected. */
break;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
case IEEE802154_CMD_BEACON_REQ:
if ((packet->version == IEEE802154_VERSION_2003) || (packet->version == IEEE802154_VERSION_2006)) {
IEEE802154_CMD_ADDR_CHECK(pinfo, tree, packet->command_id,
(packet->dst_addr_mode == IEEE802154_FCF_ADDR_SHORT) &&
(packet->src_addr_mode == IEEE802154_FCF_ADDR_NONE) &&
(packet->dst16 == IEEE802154_BCAST_ADDR) &&
(packet->dst_pan == IEEE802154_BCAST_PAN));
}
Tighten heuristic checks for IEEE 802.15.4 protocols, and add Decode-As by PANID for when we still get it wrong. Change-Id: Icc2b274d2478a9426da881998bbbbfb3bf34ec4a Reviewed-on: https://code.wireshark.org/review/1167 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18 03:33:42 +00:00
/* No payload expected. */
break;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
case IEEE802154_CMD_COORD_REALIGN:
Tighten heuristic checks for IEEE 802.15.4 protocols, and add Decode-As by PANID for when we still get it wrong. Change-Id: Icc2b274d2478a9426da881998bbbbfb3bf34ec4a Reviewed-on: https://code.wireshark.org/review/1167 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18 03:33:42 +00:00
IEEE802154_CMD_ADDR_CHECK(pinfo, tree, packet->command_id,
(packet->src_addr_mode == IEEE802154_FCF_ADDR_EXT) &&
(packet->dst_pan == IEEE802154_BCAST_PAN) &&
(packet->dst_addr_mode != IEEE802154_FCF_ADDR_NONE));
if (packet->dst_addr_mode == IEEE802154_FCF_ADDR_SHORT) {
/* If directed to a 16-bit address, check that it is being broadcast. */
IEEE802154_CMD_ADDR_CHECK(pinfo, tree, packet->command_id, packet->dst16 == IEEE802154_BCAST_ADDR);
}
dissect_ieee802154_realign(tvb, pinfo, tree, packet);
return;
case IEEE802154_CMD_GTS_REQ:
/* Check that the addressing is correct for this command type. */
IEEE802154_CMD_ADDR_CHECK(pinfo, tree, packet->command_id,
(packet->src_addr_mode == IEEE802154_FCF_ADDR_SHORT) &&
(packet->dst_addr_mode == IEEE802154_FCF_ADDR_NONE) &&
(packet->src16 != IEEE802154_BCAST_ADDR) &&
(packet->src16 != IEEE802154_NO_ADDR16));
dissect_ieee802154_gtsreq(tvb, pinfo, tree, packet);
return;
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
case IEEE802154_CMD_TRLE_MGMT_REQ:
case IEEE802154_CMD_TRLE_MGMT_RSP:
case IEEE802154_CMD_DSME_ASSOC_REQ:
case IEEE802154_CMD_DSME_ASSOC_RSP:
case IEEE802154_CMD_DSME_GTS_REQ:
case IEEE802154_CMD_DSME_GTS_RSP:
case IEEE802154_CMD_DSME_GTS_NOTIFY:
case IEEE802154_CMD_DSME_INFO_REQ:
case IEEE802154_CMD_DSME_INFO_RSP:
case IEEE802154_CMD_DSME_BEACON_ALLOC_NOTIFY:
case IEEE802154_CMD_DSME_BEACON_COLL_NOTIFY:
case IEEE802154_CMD_DSME_LINK_REPORT:
case IEEE802154_CMD_RIT_DATA_REQ:
case IEEE802154_CMD_DBS_REQ:
case IEEE802154_CMD_DBS_RSP:
/* TODO add support for these commands, for now
* if anything remains other than the FCS, dump it */
if (tvb_captured_length_remaining(tvb, 0) > 2) {
call_dissector(data_handle, tvb, pinfo, tree);
}
return;
} /* switch */
Tighten heuristic checks for IEEE 802.15.4 protocols, and add Decode-As by PANID for when we still get it wrong. Change-Id: Icc2b274d2478a9426da881998bbbbfb3bf34ec4a Reviewed-on: https://code.wireshark.org/review/1167 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18 03:33:42 +00:00
} /* dissect_ieee802154_command */
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
*IEEE 802.15.4 decryption algorithm. Tries to find the
*appropriate key from the information in the IEEE 802.15.4
*packet structure and dissector config.
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
*
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
*This function implements the security proceedures for the
*2006 version of the spec only. IEEE 802.15.4-2003 is
*unsupported.
*@param tvb IEEE 802.15.4 packet.
*@param pinfo Packet info structure.
*@param offset Offset where the ciphertext 'c' starts.
*@param packet IEEE 802.15.4 packet information.
*@param status status of decryption returned through here on failure.
*@return decrypted payload.
*/
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
static tvbuff_t *
Add XXX comment as follows: /* XXX: GINT_MAX is not defined so #if ... will always be false */ #if (GINT_MAX >= (1LL << 32)) ... #endif Remove _U_ on several function parameters. Do some very minor whitespace changes; Add editor modelines. svn path=/trunk/; revision=54268
2013-12-19 20:34:13 +00:00
dissect_ieee802154_decrypt(tvbuff_t *tvb, guint offset, packet_info *pinfo, ieee802154_packet *packet, ws_decrypt_status *status)
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{
Add XXX comment as follows: /* XXX: GINT_MAX is not defined so #if ... will always be false */ #if (GINT_MAX >= (1LL << 32)) ... #endif Remove _U_ on several function parameters. Do some very minor whitespace changes; Add editor modelines. svn path=/trunk/; revision=54268
2013-12-19 20:34:13 +00:00
tvbuff_t *ptext_tvb;
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
gboolean have_mic = FALSE;
guint64 srcAddr;
unsigned char key[16];
unsigned char tmp[16];
unsigned char rx_mic[16];
Don't look at any of the fields that come from the Auxiliary Security Header unless there *is* an Auxiliary Security Header. svn path=/trunk/; revision=35878
2011-02-08 06:55:53 +00:00
guint M;
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
gint captured_len;
gint reported_len;
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
ieee802154_hints_t *ieee_hints;
Don't look at any of the fields that come from the Auxiliary Security Header unless there *is* an Auxiliary Security Header. svn path=/trunk/; revision=35878
2011-02-08 06:55:53 +00:00
/*
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
* Check the version; we only support IEEE 802.15.4-2003 and IEEE 802.15.4-2006.
* We must do this first, as, if this isn't IEEE 802.15.4-2003 or IEEE 802.15.4-2006,
Don't look at any of the fields that come from the Auxiliary Security Header unless there *is* an Auxiliary Security Header. svn path=/trunk/; revision=35878
2011-02-08 06:55:53 +00:00
* we don't have the Auxiliary Security Header, and haven't
* filled in the information for it, and none of the stuff
* we do afterwards, which uses that information, is doable.
*/
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
if ((packet->version != IEEE802154_VERSION_2006) && (packet->version != IEEE802154_VERSION_2003)) {
Don't look at any of the fields that come from the Auxiliary Security Header unless there *is* an Auxiliary Security Header. svn path=/trunk/; revision=35878
2011-02-08 06:55:53 +00:00
*status = DECRYPT_VERSION_UNSUPPORTED;
return NULL;
}
Create the ability to have packet scoped "proto" data. Bug 9470 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9470) I'm not sold on the name or module the proto_data functions live in, but I believe the function arguments are solid and gives us the most flexibility for the future. And search/replace of a function name is easy enough to do. The big driving force for getting this in sooner rather than later is the saved memory on ethernet packets (and IP packets soon), that used to have file_scope() proto data when all it needed was packet_scope() data (technically packet_info->pool scoped), strictly for Decode As. All dissectors that use p_add_proto_data() only for Decode As functionality have been converted to using packet_scope(). All other dissectors were converted to using file_scope() which was the original scope for "proto" data. svn path=/trunk/; revision=53520
2013-11-23 02:20:13 +00:00
ieee_hints = (ieee802154_hints_t *)p_get_proto_data(wmem_file_scope(), pinfo, proto_ieee802154, 0);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
Clean up decryption; have it return various indications for whether it was able to decrypt and, if it wasn't, why it wasn't, and put that information into an expert information indication. svn path=/trunk/; revision=31922
2010-02-19 10:24:13 +00:00
/* Get the captured and on-the-wire length of the payload. */
Don't look at any of the fields that come from the Auxiliary Security Header unless there *is* an Auxiliary Security Header. svn path=/trunk/; revision=35878
2011-02-08 06:55:53 +00:00
M = IEEE802154_MIC_LENGTH(packet->security_level);
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
reported_len = tvb_reported_length_remaining(tvb, offset) - IEEE802154_FCS_LEN - M;
if (reported_len < 0) {
*status = DECRYPT_PACKET_TOO_SMALL;
return NULL;
}
/* Check of the payload is truncated. */
if (tvb_bytes_exist(tvb, offset, reported_len)) {
captured_len = reported_len;
}
else {
replace another bunch of deprecated tvb_length calls Change-Id: Ib7c50b55942220d48de025642154b4bf3f39c8a2 Reviewed-on: https://code.wireshark.org/review/9074 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-23 20:58:55 +00:00
captured_len = tvb_captured_length_remaining(tvb, offset);
Clean up decryption; have it return various indications for whether it was able to decrypt and, if it wasn't, why it wasn't, and put that information into an expert information indication. svn path=/trunk/; revision=31922
2010-02-19 10:24:13 +00:00
}
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
/* Check if the MIC is present in the captured data. */
have_mic = tvb_bytes_exist(tvb, offset + reported_len, M);
if (have_mic) {
tvb_memcpy(tvb, rx_mic, offset + reported_len, M);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
}
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/*
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
* Key Lookup - Need to find the appropriate key.
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
*
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
*/
/*
* Oh God! The specification is so bad. This is the worst
* case of design-by-committee I've ever seen in my life.
Fix a lot of typos and misspellings 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>
2016-01-06 00:58:42 +00:00
* The IEEE has created an unintelligible mess in order
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
* to decipher which key is used for which message.
*
* Let's hope it's simpler to implement for dissecting only.
*
* Also need to find the extended address of the sender.
*/
if (packet->src_addr_mode == IEEE802154_FCF_ADDR_EXT) {
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
/* The source EUI-64 is included in the headers. */
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
srcAddr = packet->src64;
}
else if (ieee_hints && ieee_hints->map_rec && ieee_hints->map_rec->addr64) {
/* Use the hint */
srcAddr = ieee_hints->map_rec->addr64;
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
}
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
else {
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
/* Lookup failed. */
Clean up decryption; have it return various indications for whether it was able to decrypt and, if it wasn't, why it wasn't, and put that information into an expert information indication. svn path=/trunk/; revision=31922
2010-02-19 10:24:13 +00:00
*status = DECRYPT_PACKET_NO_EXT_SRC_ADDR;
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
return NULL;
}
/* Lookup the key. */
/*
* TODO: What this dissector really needs is a UAT to store multiple keys
* and a variety of key configuration data. However, a single shared key
* should be sufficient to get packet encryption off to a start.
*/
Clean up decryption; have it return various indications for whether it was able to decrypt and, if it wasn't, why it wasn't, and put that information into an expert information indication. svn path=/trunk/; revision=31922
2010-02-19 10:24:13 +00:00
if (!ieee802154_key_valid) {
*status = DECRYPT_PACKET_NO_KEY;
return NULL;
}
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
memcpy(key, ieee802154_key, IEEE802154_CIPHER_SIZE);
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/*
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
* CCM* - CTR mode payload encryption
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
*
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
*/
/* Create the CCM* initial block for decryption (Adata=0, M=0, counter=0). */
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
ccm_init_block(tmp, FALSE, 0, srcAddr, packet, 0);
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
/* Decrypt the ciphertext, and place the plaintext in a new tvb. */
if (IEEE802154_IS_ENCRYPTED(packet->security_level) && captured_len) {
Add XXX comment as follows: /* XXX: GINT_MAX is not defined so #if ... will always be false */ #if (GINT_MAX >= (1LL << 32)) ... #endif Remove _U_ on several function parameters. Do some very minor whitespace changes; Add editor modelines. svn path=/trunk/; revision=54268
2013-12-19 20:34:13 +00:00
guint8 *text;
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
/*
* Make a copy of the ciphertext in heap memory.
*
* We will decrypt the message in-place and then use the buffer as the
* real data for the new tvb.
*/
emem -> wmem conversion: - ep_tvb_get_bits() -> wmem_packet_tvb_get_bits() - tvb_g_memdup()/ep_tvb_memdup() -> tvb_memdup() - tvb_fake_unicode()/tvb_get_ephemeral_faked_unicode() -> tvb_get_faked_unicode() - tvb_get_g_string()/tvb_get_ephemeral_string()/tvb_get_seasonal_string() -> tvb_get_string() - tvb_get_g_unicode_string()/tvb_get_ephemeral_unicode_string() -> tvb_get_unicode_string() - tvb_get_ephemeral_string_enc() -> tvb_get_string_enc() - update docs accordingly svn path=/trunk/; revision=52172
2013-09-22 15:50:55 +00:00
text = (guint8 *)tvb_memdup(NULL, tvb, offset, captured_len);
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
/* Perform CTR-mode transformation. */
if (!ccm_ctr_encrypt(key, tmp, rx_mic, text, captured_len)) {
g_free(text);
*status = DECRYPT_PACKET_DECRYPT_FAILED;
return NULL;
}
/* Create a tvbuff for the plaintext. */
Use tvb_new_child_real_data() instead of tvb_new_real_data() + tvb_set_child_real_data_tvbuff(). svn path=/trunk/; revision=40173
2011-12-13 04:01:33 +00:00
ptext_tvb = tvb_new_child_real_data(tvb, text, captured_len, reported_len);
Fix memory leak. svn path=/trunk/; revision=40190
2011-12-13 23:16:13 +00:00
tvb_set_free_cb(ptext_tvb, g_free);
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
add_new_data_source(pinfo, ptext_tvb, "Decrypted IEEE 802.15.4 payload");
*status = DECRYPT_PACKET_SUCCEEDED;
}
/* There is no ciphertext. Wrap the plaintext in a new tvb. */
else {
/* Decrypt the MIC (if present). */
if ((have_mic) && (!ccm_ctr_encrypt(key, tmp, rx_mic, NULL, 0))) {
*status = DECRYPT_PACKET_DECRYPT_FAILED;
return NULL;
}
/* Create a tvbuff for the plaintext. This might result in a zero-length tvbuff. */
ptext_tvb = tvb_new_subset(tvb, offset, captured_len, reported_len);
*status = DECRYPT_PACKET_SUCCEEDED;
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
}
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/*
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
* CCM* - CBC-mode message authentication
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
*
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
*/
/* We can only verify the message if the MIC wasn't truncated. */
if (have_mic) {
unsigned char dec_mic[16];
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
guint l_m = captured_len;
guint l_a = offset;
Fix a lot of typos and misspellings 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>
2016-01-06 00:58:42 +00:00
/* Adjust the lengths of the plaintext and additional data if unencrypted. */
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
if (!IEEE802154_IS_ENCRYPTED(packet->security_level)) {
l_a += l_m;
l_m = 0;
}
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
else if ((packet->version == IEEE802154_VERSION_2003) && !ieee802154_extend_auth)
Add missing '*/' to the end of a comment: Fixes gcc compile error. svn path=/trunk/; revision=40005
2011-11-25 22:08:25 +00:00
l_a -= 5; /* Exclude Frame Counter (4 bytes) and Key Sequence Counter (1 byte) from authentication data */
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Create the CCM* initial block for authentication (Adata!=0, M!=0, counter=l(m)). */
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
ccm_init_block(tmp, TRUE, M, srcAddr, packet, l_m);
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Compute CBC-MAC authentication tag. */
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
/*
* And yes, despite the warning in tvbuff.h, I think tvb_get_ptr is the
* right function here since either A) the payload wasn't encrypted, in
* which case l_m is zero, or B) the payload was encrypted, and the tvb
* already points to contiguous memory, since we just allocated it in
* decryption phase.
*/
emem -> wmem conversion: - ep_tvb_get_bits() -> wmem_packet_tvb_get_bits() - tvb_g_memdup()/ep_tvb_memdup() -> tvb_memdup() - tvb_fake_unicode()/tvb_get_ephemeral_faked_unicode() -> tvb_get_faked_unicode() - tvb_get_g_string()/tvb_get_ephemeral_string()/tvb_get_seasonal_string() -> tvb_get_string() - tvb_get_g_unicode_string()/tvb_get_ephemeral_unicode_string() -> tvb_get_unicode_string() - tvb_get_ephemeral_string_enc() -> tvb_get_string_enc() - update docs accordingly svn path=/trunk/; revision=52172
2013-09-22 15:50:55 +00:00
if (!ccm_cbc_mac(key, tmp, (const gchar *)tvb_memdup(wmem_packet_scope(), tvb, 0, l_a), l_a, tvb_get_ptr(ptext_tvb, 0, l_m), l_m, dec_mic)) {
Clean up decryption; have it return various indications for whether it was able to decrypt and, if it wasn't, why it wasn't, and put that information into an expert information indication. svn path=/trunk/; revision=31922
2010-02-19 10:24:13 +00:00
*status = DECRYPT_PACKET_MIC_CHECK_FAILED;
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
}
/* Compare the received MIC with the one we generated. */
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
else if (memcmp(rx_mic, dec_mic, M) != 0) {
Clean up decryption; have it return various indications for whether it was able to decrypt and, if it wasn't, why it wasn't, and put that information into an expert information indication. svn path=/trunk/; revision=31922
2010-02-19 10:24:13 +00:00
*status = DECRYPT_PACKET_MIC_CHECK_FAILED;
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
}
}
From Owen Kirby: Fix for malformed IEEE 802.15.4 decryption. svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
/* Done! */
return ptext_tvb;
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
} /* dissect_ieee802154_decrypt */
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
*Creates the CCM* initial block value for IEEE 802.15.4.
*
*@param block Output pointer for the initial block.
*@param adata TRUE if additional auth data is present
*@param M CCM* parameter M.
*@param addr Source extended address.
*@param packet IEEE 802.15.4 packet information.
*@param ctr_val Value in the last L bytes of the block.
*/
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
static void
Add XXX comment as follows: /* XXX: GINT_MAX is not defined so #if ... will always be false */ #if (GINT_MAX >= (1LL << 32)) ... #endif Remove _U_ on several function parameters. Do some very minor whitespace changes; Add editor modelines. svn path=/trunk/; revision=54268
2013-12-19 20:34:13 +00:00
ccm_init_block(gchar *block, gboolean adata, gint M, guint64 addr, ieee802154_packet *packet, gint ctr_val)
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{
gint i = 0;
/* Flags: Reserved(0) || Adata || (M-2)/2 || (L-1) */
block[i] = (0x2 - 1); /* (L-1) */
if (M > 0) block[i] |= (((M-2)/2) << 3); /* (M-2)/2 */
if (adata) block[i] |= (1 << 6); /* Adata */
i++;
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
/* 2003 CCM Nonce: Source Address || Frame Counter || Key Sequence Counter */
/* 2006 CCM* Nonce: Source Address || Frame Counter || Security Level */
Squelch some compiler complaints. svn path=/trunk/; revision=32572
2010-04-27 07:41:28 +00:00
block[i++] = (guint8)((addr >> 56) & 0xff);
block[i++] = (guint8)((addr >> 48) & 0xff);
block[i++] = (guint8)((addr >> 40) & 0xff);
block[i++] = (guint8)((addr >> 32) & 0xff);
block[i++] = (guint8)((addr >> 24) & 0xff);
block[i++] = (guint8)((addr >> 16) & 0xff);
block[i++] = (guint8)((addr >> 8) & 0xff);
block[i++] = (guint8)((addr >> 0) & 0xff);
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
block[i++] = (guint8)((packet->frame_counter >> 24) & 0xff);
block[i++] = (guint8)((packet->frame_counter >> 16) & 0xff);
block[i++] = (guint8)((packet->frame_counter >> 8) & 0xff);
block[i++] = (guint8)((packet->frame_counter >> 0) & 0xff);
if (packet->version == IEEE802154_VERSION_2003)
block[i++] = packet->key_sequence_counter;
else
block[i++] = packet->security_level;
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Plaintext length. */
Squelch some compiler complaints. svn path=/trunk/; revision=32572
2010-04-27 07:41:28 +00:00
block[i++] = (guint8)((ctr_val >> 8) & 0xff);
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang svn path=/trunk/; revision=40994
2012-02-12 18:05:02 +00:00
block[i] = (guint8)((ctr_val >> 0) & 0xff);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
} /* ccm_init_block */
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/*
* Perform an in-place CTR-mode encryption/decryption.
*
*@param key Encryption Key.
*@param iv Counter initial value.
*@param mic MIC to encrypt/decrypt.
*@param data Buffer to encrypt/decrypt.
*@param length Length of the buffer.
*@return TRUE on SUCCESS, FALSE on error.
*/
fix compilation without libgcrypt svn path=/trunk/; revision=54283
2013-12-20 07:56:38 +00:00
#ifdef HAVE_LIBGCRYPT
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
static gboolean
Add XXX comment as follows: /* XXX: GINT_MAX is not defined so #if ... will always be false */ #if (GINT_MAX >= (1LL << 32)) ... #endif Remove _U_ on several function parameters. Do some very minor whitespace changes; Add editor modelines. svn path=/trunk/; revision=54268
2013-12-19 20:34:13 +00:00
ccm_ctr_encrypt(const gchar *key, const gchar *iv, gchar *mic, gchar *data, gint length)
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{
gcry_cipher_hd_t cipher_hd;
/* Open the cipher. */
if (gcry_cipher_open(&cipher_hd, GCRY_CIPHER_AES128, GCRY_CIPHER_MODE_CTR, 0)) {
return FALSE;
}
/* Set the key and initial value. */
if (gcry_cipher_setkey(cipher_hd, key, 16)) {
gcry_cipher_close(cipher_hd);
return FALSE;
}
if (gcry_cipher_setctr(cipher_hd, iv, 16)) {
gcry_cipher_close(cipher_hd);
return FALSE;
}
/* Decrypt the MIC. */
if (gcry_cipher_encrypt(cipher_hd, mic, 16, NULL, 0)) {
gcry_cipher_close(cipher_hd);
return FALSE;
}
/* Decrypt the payload. */
if (gcry_cipher_encrypt(cipher_hd, data, length, NULL, 0)) {
gcry_cipher_close(cipher_hd);
return FALSE;
}
/* Done with the cipher. */
gcry_cipher_close(cipher_hd);
return TRUE;
fix compilation without libgcrypt svn path=/trunk/; revision=54283
2013-12-20 07:56:38 +00:00
} /* ccm_ctr_encrypt */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
#else
fix compilation without libgcrypt svn path=/trunk/; revision=54283
2013-12-20 07:56:38 +00:00
static gboolean
ccm_ctr_encrypt(const gchar *key _U_, const gchar *iv _U_, gchar *mic _U_, gchar *data _U_, gint length _U_)
{
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
return FALSE;
fix compilation without libgcrypt svn path=/trunk/; revision=54283
2013-12-20 07:56:38 +00:00
}
#endif /* HAVE_LIBGCRYPT */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
*Generate a CBC-MAC of the decrypted payload and additional authentication headers.
*@param key Encryption Key.
*@param iv Counter initial value.
*@param a Additional auth headers.
*@param a_len Length of the additional headers.
*@param m Plaintext message.
*@param m_len Length of plaintext message.
*@param mic Output for CBC-MAC.
*@return TRUE on SUCCESS, FALSE on error.
*/
fix compilation without libgcrypt svn path=/trunk/; revision=54283
2013-12-20 07:56:38 +00:00
#ifdef HAVE_LIBGCRYPT
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
static gboolean
Add XXX comment as follows: /* XXX: GINT_MAX is not defined so #if ... will always be false */ #if (GINT_MAX >= (1LL << 32)) ... #endif Remove _U_ on several function parameters. Do some very minor whitespace changes; Add editor modelines. svn path=/trunk/; revision=54268
2013-12-19 20:34:13 +00:00
ccm_cbc_mac(const gchar *key, const gchar *iv, const gchar *a, gint a_len, const gchar *m, gint m_len, gchar *mic)
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{
Use tvb_new_subset_remaining() rather than tvb_new_subset(); #include <styring.h> not req'd (in a few cases); Minor reformating & whitespace cleanup. svn path=/trunk/; revision=41374
2012-03-06 16:58:09 +00:00
gcry_cipher_hd_t cipher_hd;
guint i = 0;
unsigned char block[16];
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Open the cipher. */
if (gcry_cipher_open(&cipher_hd, GCRY_CIPHER_AES128, GCRY_CIPHER_MODE_CBC, GCRY_CIPHER_CBC_MAC)) return FALSE;
/* Set the key. */
if (gcry_cipher_setkey(cipher_hd, key, 16)) {
gcry_cipher_close(cipher_hd);
return FALSE;
}
/* Process the initial value. */
if (gcry_cipher_encrypt(cipher_hd, mic, 16, iv, 16)) {
gcry_cipher_close(cipher_hd);
return FALSE;
}
/* Encode L(a) */
i = 0;
Add XXX comment as follows: /* XXX: GINT_MAX is not defined so #if ... will always be false */ #if (GINT_MAX >= (1LL << 32)) ... #endif Remove _U_ on several function parameters. Do some very minor whitespace changes; Add editor modelines. svn path=/trunk/; revision=54268
2013-12-19 20:34:13 +00:00
/* XXX: GINT_MAX is not defined so #if ... will always be false */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
#if (GINT_MAX >= (1LL << 32))
if (a_len >= (1LL << 32)) {
block[i++] = 0xff;
block[i++] = 0xff;
block[i++] = (a_len >> 56) & 0xff;
block[i++] = (a_len >> 48) & 0xff;
block[i++] = (a_len >> 40) & 0xff;
block[i++] = (a_len >> 32) & 0xff;
block[i++] = (a_len >> 24) & 0xff;
block[i++] = (a_len >> 16) & 0xff;
block[i++] = (a_len >> 8) & 0xff;
block[i++] = (a_len >> 0) & 0xff;
}
else
#endif
if (a_len >= ((1 << 16) - (1 << 8))) {
block[i++] = 0xff;
block[i++] = 0xfe;
block[i++] = (a_len >> 24) & 0xff;
block[i++] = (a_len >> 16) & 0xff;
block[i++] = (a_len >> 8) & 0xff;
block[i++] = (a_len >> 0) & 0xff;
}
else {
block[i++] = (a_len >> 8) & 0xff;
block[i++] = (a_len >> 0) & 0xff;
}
/* Append a to get the first block of input (pad if we encounter the end of a). */
while ((i < sizeof(block)) && (a_len-- > 0)) block[i++] = *a++;
while (i < sizeof(block)) block[i++] = 0;
/* Process the first block of AuthData. */
if (gcry_cipher_encrypt(cipher_hd, mic, 16, block, 16)) {
gcry_cipher_close(cipher_hd);
return FALSE;
}
/* Transform and process the remainder of a. */
while (a_len > 0) {
/* Copy and pad. */
Try to pacify the buildbot. svn path=/trunk/; revision=31821
2010-02-07 20:08:00 +00:00
if ((guint)a_len >= sizeof(block)) memcpy(block, a, sizeof(block));
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
else {memcpy(block, a, a_len); memset(block+a_len, 0, sizeof(block)-a_len);}
/* Adjust pointers. */
a += sizeof(block);
Fix a bunch of warnings. Cast away some implicit 64-bit-to-32-bit conversion errors due to use of sizeof. Cast away some implicit 64-bit-to-32-bit conversion errors due to use of strtol() and strtoul(). Change some data types to avoid those implicit conversion warnings. When assigning a constant to a float, make sure the constant isn't a double, by appending "f" to the constant. Constify a bunch of variables, parameters, and return values to eliminate warnings due to strings being given const qualifiers. Cast away those warnings in some cases where an API we don't control forces us to do so. Enable a bunch of additional warnings by default. Note why at least some of the other warnings aren't enabled. randpkt.c and text2pcap.c are used to build programs, so they don't need to be in EXTRA_DIST. If the user specifies --enable-warnings-as-errors, add -Werror *even if the user specified --enable-extra-gcc-flags; assume they know what they're doing and are willing to have the compile fail due to the extra GCC warnings being treated as errors. svn path=/trunk/; revision=46748
2012-12-26 05:57:06 +00:00
a_len -= (int)sizeof(block);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Execute the CBC-MAC algorithm. */
if (gcry_cipher_encrypt(cipher_hd, mic, 16, block, sizeof(block))) {
gcry_cipher_close(cipher_hd);
return FALSE;
}
} /* while */
/* Process the message, m. */
while (m_len > 0) {
/* Copy and pad. */
Try to pacify the buildbot. svn path=/trunk/; revision=31821
2010-02-07 20:08:00 +00:00
if ((guint)m_len >= sizeof(block)) memcpy(block, m, sizeof(block));
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
else {memcpy(block, m, m_len); memset(block+m_len, 0, sizeof(block)-m_len);}
/* Adjust pointers. */
m += sizeof(block);
Fix a bunch of warnings. Cast away some implicit 64-bit-to-32-bit conversion errors due to use of sizeof. Cast away some implicit 64-bit-to-32-bit conversion errors due to use of strtol() and strtoul(). Change some data types to avoid those implicit conversion warnings. When assigning a constant to a float, make sure the constant isn't a double, by appending "f" to the constant. Constify a bunch of variables, parameters, and return values to eliminate warnings due to strings being given const qualifiers. Cast away those warnings in some cases where an API we don't control forces us to do so. Enable a bunch of additional warnings by default. Note why at least some of the other warnings aren't enabled. randpkt.c and text2pcap.c are used to build programs, so they don't need to be in EXTRA_DIST. If the user specifies --enable-warnings-as-errors, add -Werror *even if the user specified --enable-extra-gcc-flags; assume they know what they're doing and are willing to have the compile fail due to the extra GCC warnings being treated as errors. svn path=/trunk/; revision=46748
2012-12-26 05:57:06 +00:00
m_len -= (int)sizeof(block);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Execute the CBC-MAC algorithm. */
if (gcry_cipher_encrypt(cipher_hd, mic, 16, block, sizeof(block))) {
gcry_cipher_close(cipher_hd);
return FALSE;
}
}
/* Done with the cipher. */
gcry_cipher_close(cipher_hd);
return TRUE;
fix compilation without libgcrypt svn path=/trunk/; revision=54283
2013-12-20 07:56:38 +00:00
} /* ccm_cbc_mac */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
#else
fix compilation without libgcrypt svn path=/trunk/; revision=54283
2013-12-20 07:56:38 +00:00
static gboolean
ccm_cbc_mac(const gchar *key _U_, const gchar *iv _U_,
const gchar *a _U_, gint a_len _U_, const gchar *m _U_, gint m_len _U_, gchar *mic _U_)
{
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
return FALSE;
fix compilation without libgcrypt svn path=/trunk/; revision=54283
2013-12-20 07:56:38 +00:00
}
#endif /* HAVE_LIBGCRYPT */
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
/* Key hash function. */
guint ieee802154_short_addr_hash(gconstpointer key)
{
Fix some warnings svn path=/trunk/; revision=54109
2013-12-14 22:07:26 +00:00
return (((const ieee802154_short_addr *)key)->addr) | (((const ieee802154_short_addr *)key)->pan << 16);
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
}
/* Key equal function. */
gboolean ieee802154_short_addr_equal(gconstpointer a, gconstpointer b)
{
Fix some warnings svn path=/trunk/; revision=54109
2013-12-14 22:07:26 +00:00
return (((const ieee802154_short_addr *)a)->pan == ((const ieee802154_short_addr *)b)->pan) &&
(((const ieee802154_short_addr *)a)->addr == ((const ieee802154_short_addr *)b)->addr);
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
}
You may not use g_int64_hash() or g_int64_equal(), as they are not present in the minimum version of GLib that we support. Create a ieee802154_long_addr structure for long addresses, create hash routines for those addresses, and use them. svn path=/trunk/; revision=34651
2010-10-26 08:31:16 +00:00
/* Key hash function. */
guint ieee802154_long_addr_hash(gconstpointer key)
{
Fix some warnings svn path=/trunk/; revision=54109
2013-12-14 22:07:26 +00:00
return (guint)(((const ieee802154_long_addr *)key)->addr) & 0xFFFFFFFF;
You may not use g_int64_hash() or g_int64_equal(), as they are not present in the minimum version of GLib that we support. Create a ieee802154_long_addr structure for long addresses, create hash routines for those addresses, and use them. svn path=/trunk/; revision=34651
2010-10-26 08:31:16 +00:00
}
/* Key equal function. */
gboolean ieee802154_long_addr_equal(gconstpointer a, gconstpointer b)
{
Fix some warnings svn path=/trunk/; revision=54109
2013-12-14 22:07:26 +00:00
return (((const ieee802154_long_addr *)a)->addr == ((const ieee802154_long_addr *)b)->addr);
You may not use g_int64_hash() or g_int64_equal(), as they are not present in the minimum version of GLib that we support. Create a ieee802154_long_addr structure for long addresses, create hash routines for those addresses, and use them. svn path=/trunk/; revision=34651
2010-10-26 08:31:16 +00:00
}
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
*Creates a record that maps the given short address and pan to a long (extended) address.
*@param short_addr 16-bit short address
*@param pan 16-bit PAN id
*@param long_addr 64-bit long (extended) address
Fix a lot of typos and misspellings 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>
2016-01-06 00:58:42 +00:00
*@param proto pointer to name of current protocol
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
*@param fnum Frame number this mapping became valid
*@return TRUE Record was updated, FALSE Couldn't find it
*/
Fix Visual C++ code analysis warnings. svn path=/trunk/; revision=36007
2011-02-19 00:05:12 +00:00
ieee802154_map_rec *ieee802154_addr_update(ieee802154_map_tab_t *au_ieee802154_map,
From Fred Fierling via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5395 : The ZigBee security dissector was not recording the short to long address mappings in Security Headers, preventing the decryption of some payloads. This patch eliminates the Undecoded warnings in packets 1 and 19 in this test capture: https://bugs.wireshark.org/bugzilla/attachment.cgi?id=5457 The keys to decrypt these packets are listed in the bug. svn path=/trunk/; revision=34886
2010-11-15 20:52:41 +00:00
guint16 short_addr, guint16 pan, guint64 long_addr, const char *proto, guint fnum)
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
{
Use tvb_new_subset_remaining() rather than tvb_new_subset(); #include <styring.h> not req'd (in a few cases); Minor reformating & whitespace cleanup. svn path=/trunk/; revision=41374
2012-03-06 16:58:09 +00:00
ieee802154_short_addr addr16;
ieee802154_map_rec *p_map_rec;
gpointer old_key;
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
/* Look up short address hash */
addr16.pan = pan;
addr16.addr = short_addr;
From beroset: remove C++ incompatibilities https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 (catch the one that almost slipped away) svn path=/trunk/; revision=48404
2013-03-18 22:16:58 +00:00
p_map_rec = (ieee802154_map_rec *)g_hash_table_lookup(au_ieee802154_map->short_table, &addr16);
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
/* Update mapping record */
if (p_map_rec) {
/* record already exists */
if ( p_map_rec->addr64 == long_addr ) {
/* no change */
return p_map_rec;
}
else {
/* mark current mapping record invalid */
p_map_rec->end_fnum = fnum;
}
}
/* create a new mapping record */
More wmem conversion (leaving uat related functions aside) svn path=/trunk/; revision=52055
2013-09-15 13:46:13 +00:00
p_map_rec = wmem_new(wmem_file_scope(), ieee802154_map_rec);
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
p_map_rec->proto = proto;
p_map_rec->start_fnum = fnum;
p_map_rec->end_fnum = 0;
p_map_rec->addr64 = long_addr;
/* link new mapping record to addr hash tables */
Fix Visual C++ code analysis warnings. svn path=/trunk/; revision=36007
2011-02-19 00:05:12 +00:00
if ( g_hash_table_lookup_extended(au_ieee802154_map->short_table, &addr16, &old_key, NULL) ) {
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
/* update short addr hash table, reusing pointer to old key */
_lookup_extended takes a pointer to the key-pointer since it has to set the old key pointer value. _insert just takes the key-pointer, not a pointer to it. Passing a pointer-to-a-pointer causes the outer pointer to be dereferenced as a struct (when it in fact points to a pointer to struct) and leads to incorrect behaviour and uninitialized/out-of-bounds memory accesses. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9139 svn path=/trunk/; revision=52036
2013-09-14 13:15:31 +00:00
g_hash_table_insert(au_ieee802154_map->short_table, old_key, p_map_rec);
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
} else {
/* create new hash entry */
More wmem conversion (leaving uat related functions aside) svn path=/trunk/; revision=52055
2013-09-15 13:46:13 +00:00
g_hash_table_insert(au_ieee802154_map->short_table, wmem_memdup(wmem_file_scope(), &addr16, sizeof(addr16)), p_map_rec);
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
}
Fix Visual C++ code analysis warnings. svn path=/trunk/; revision=36007
2011-02-19 00:05:12 +00:00
if ( g_hash_table_lookup_extended(au_ieee802154_map->long_table, &long_addr, &old_key, NULL) ) {
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
/* update long addr hash table, reusing pointer to old key */
_lookup_extended takes a pointer to the key-pointer since it has to set the old key pointer value. _insert just takes the key-pointer, not a pointer to it. Passing a pointer-to-a-pointer causes the outer pointer to be dereferenced as a struct (when it in fact points to a pointer to struct) and leads to incorrect behaviour and uninitialized/out-of-bounds memory accesses. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9139 svn path=/trunk/; revision=52036
2013-09-14 13:15:31 +00:00
g_hash_table_insert(au_ieee802154_map->long_table, old_key, p_map_rec);
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
} else {
/* create new hash entry */
More wmem conversion (leaving uat related functions aside) svn path=/trunk/; revision=52055
2013-09-15 13:46:13 +00:00
g_hash_table_insert(au_ieee802154_map->long_table, wmem_memdup(wmem_file_scope(), &long_addr, sizeof(long_addr)), p_map_rec);
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
}
return p_map_rec;
} /* ieee802154_addr_update */
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
*Marks a mapping record associated with device with short_addr
*as invalid at a certain frame number, typically when a
Fix a lot of typos and misspellings 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>
2016-01-06 00:58:42 +00:00
*disassociation occurs.
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
*
*@param short_addr 16-bit short address
*@param pan 16-bit PAN id
*@param fnum Frame number when mapping became invalid
*@return TRUE Record was updated, FALSE Couldn't find it
*/
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
gboolean ieee802154_short_addr_invalidate(guint16 short_addr, guint16 pan, guint fnum)
{
Use tvb_new_subset_remaining() rather than tvb_new_subset(); #include <styring.h> not req'd (in a few cases); Minor reformating & whitespace cleanup. svn path=/trunk/; revision=41374
2012-03-06 16:58:09 +00:00
ieee802154_short_addr addr16;
ieee802154_map_rec *map_rec;
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
addr16.pan = pan;
addr16.addr = short_addr;
From Fred Fierling via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5395 : The ZigBee security dissector was not recording the short to long address mappings in Security Headers, preventing the decryption of some payloads. This patch eliminates the Undecoded warnings in packets 1 and 19 in this test capture: https://bugs.wireshark.org/bugzilla/attachment.cgi?id=5457 The keys to decrypt these packets are listed in the bug. svn path=/trunk/; revision=34886
2010-11-15 20:52:41 +00:00
From beroset: remove C++ incompatibilities https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 (catch the one that almost slipped away) svn path=/trunk/; revision=48404
2013-03-18 22:16:58 +00:00
map_rec = (ieee802154_map_rec *)g_hash_table_lookup(ieee802154_map.short_table, &addr16);
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
if ( map_rec ) {
/* indicates this mapping is invalid at frame fnum */
map_rec->end_fnum = fnum;
return TRUE;
}
return FALSE;
} /* ieee802154_short_addr_invalidate */
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
* Mark a mapping record associated with device with long_addr
* as invalid at a certain frame number, typically when a
Fix a lot of typos and misspellings 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>
2016-01-06 00:58:42 +00:00
* disassociation occurs.
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
*
*@param long_addr 16-bit short address
ieee802154: fix parameter '...' not found in the function declaration / '...' command used in a comment that is not attached to a function declaration [-Wdocumentation] Change-Id: I797e68c409a10877315f2a13fa6f16f8d4a768e2 Reviewed-on: https://code.wireshark.org/review/12871 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-26 13:57:31 +00:00
*@param fnum Frame number when mapping became invalid
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
*@return TRUE If record was updated, FALSE otherwise
*/
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
gboolean ieee802154_long_addr_invalidate(guint64 long_addr, guint fnum)
{
ieee802154_map_rec *map_rec;
From beroset: remove C++ incompatibilities https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 (catch the one that almost slipped away) svn path=/trunk/; revision=48404
2013-03-18 22:16:58 +00:00
map_rec = (ieee802154_map_rec *)g_hash_table_lookup(ieee802154_map.long_table, &long_addr);
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
if ( map_rec ) {
/* indicates this mapping is invalid at frame fnum */
map_rec->end_fnum = fnum;
return TRUE;
}
return FALSE;
} /* ieee802154_long_addr_invalidate */
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
* Init routine for the IEEE 802.15.4 dissector. Creates hash
* tables for mapping between 16-bit to 64-bit addresses and
* populates them with static address pairs from a UAT
* preference table.
*/
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
static void
proto_init_ieee802154(void)
{
guint i;
ieee802154_map.short_table = g_hash_table_new(ieee802154_short_addr_hash, ieee802154_short_addr_equal);
ieee802154_map.long_table = g_hash_table_new(ieee802154_long_addr_hash, ieee802154_long_addr_equal);
Split more init routines into init/cleanup functions This patch is partially automatically generated, but are modified manually. In particular, assignments and function calls have been audited. Some debugging comments and ifdef'd prints have been removed. The lookup tables of the dcm and sip dissectors are now cleared. It is only called on reopening files anyway. The isakmp dissector is modified to use g_hash_table_new_full for destruction of its keys and values. Fix a memleak in ipsec dissector when libgcrypt is not enabled. Generated using https://git.lekensteyn.nl/peter/wireshark-notes/diff/one-off/cleanup-rewrite.py?id=3c6128ee266024d164650955f93c7740484abd68 (with AUDIT = True). Change-Id: I3fd910bdee663842ac0196334fe0189b67e251b0 Reviewed-on: https://code.wireshark.org/review/9225 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-28 13:15:07 +00:00
/* Reload the hash table from the static address UAT. */
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
for (i=0; (i<num_static_addrs) && (static_addrs); i++) {
ieee802154_addr_update(&ieee802154_map,(guint16)static_addrs[i].addr16, (guint16)static_addrs[i].pan,
pntoh64(static_addrs[i].eui64), ieee802154_user, IEEE802154_USER_MAPPING);
} /* for */
} /* proto_init_ieee802154 */
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
* Cleanup for the IEEE 802.15.4 dissector.
*/
Split more init routines into init/cleanup functions This patch is partially automatically generated, but are modified manually. In particular, assignments and function calls have been audited. Some debugging comments and ifdef'd prints have been removed. The lookup tables of the dcm and sip dissectors are now cleared. It is only called on reopening files anyway. The isakmp dissector is modified to use g_hash_table_new_full for destruction of its keys and values. Fix a memleak in ipsec dissector when libgcrypt is not enabled. Generated using https://git.lekensteyn.nl/peter/wireshark-notes/diff/one-off/cleanup-rewrite.py?id=3c6128ee266024d164650955f93c7740484abd68 (with AUDIT = True). Change-Id: I3fd910bdee663842ac0196334fe0189b67e251b0 Reviewed-on: https://code.wireshark.org/review/9225 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-28 13:15:07 +00:00
static void
proto_cleanup_ieee802154(void)
{
g_hash_table_destroy(ieee802154_map.short_table);
g_hash_table_destroy(ieee802154_map.long_table);
}
Tighten heuristic checks for IEEE 802.15.4 protocols, and add Decode-As by PANID for when we still get it wrong. Change-Id: Icc2b274d2478a9426da881998bbbbfb3bf34ec4a Reviewed-on: https://code.wireshark.org/review/1167 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18 03:33:42 +00:00
/* Returns the prompt string for the Decode-As dialog. */
static void ieee802154_da_prompt(packet_info *pinfo _U_, gchar* result)
{
ieee802154_hints_t *hints;
hints = (ieee802154_hints_t *)p_get_proto_data(wmem_file_scope(), pinfo,
proto_get_id_by_filter_name(IEEE802154_PROTOABBREV_WPAN), 0);
Qt: Fix DecodeAs Previously DecodeAs neither save its changes nor changes dissector tables. Do that and redissect packets to refresh view. Bug: 10553 Change-Id: Icd8453c9650f0265852f6b6b58bc483b35570a15 Reviewed-on: https://code.wireshark.org/review/7676 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>
2015-03-08 13:59:32 +00:00
if (hints)
g_snprintf(result, MAX_DECODE_AS_PROMPT_LEN, "IEEE 802.15.4 PAN 0x%04x as", hints->src_pan);
else
g_snprintf(result, MAX_DECODE_AS_PROMPT_LEN, "IEEE 802.15.4 PAN Unknown");
Tighten heuristic checks for IEEE 802.15.4 protocols, and add Decode-As by PANID for when we still get it wrong. Change-Id: Icc2b274d2478a9426da881998bbbbfb3bf34ec4a Reviewed-on: https://code.wireshark.org/review/1167 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18 03:33:42 +00:00
} /* iee802154_da_prompt */
/* Returns the value to index the panid decode table with (source PAN)*/
static gpointer ieee802154_da_value(packet_info *pinfo _U_)
{
ieee802154_hints_t *hints;
hints = (ieee802154_hints_t *)p_get_proto_data(wmem_file_scope(), pinfo,
proto_get_id_by_filter_name(IEEE802154_PROTOABBREV_WPAN), 0);
Qt: Fix DecodeAs Previously DecodeAs neither save its changes nor changes dissector tables. Do that and redissect packets to refresh view. Bug: 10553 Change-Id: Icd8453c9650f0265852f6b6b58bc483b35570a15 Reviewed-on: https://code.wireshark.org/review/7676 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>
2015-03-08 13:59:32 +00:00
if (hints)
return GUINT_TO_POINTER((guint)(hints->src_pan));
else
return NULL;
Tighten heuristic checks for IEEE 802.15.4 protocols, and add Decode-As by PANID for when we still get it wrong. Change-Id: Icc2b274d2478a9426da881998bbbbfb3bf34ec4a Reviewed-on: https://code.wireshark.org/review/1167 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18 03:33:42 +00:00
} /* iee802154_da_value */
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
* IEEE 802.15.4 protocol registration routine.
*/
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
void proto_register_ieee802154(void)
{
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
/* Protocol fields */
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
static hf_register_info hf_phy[] = {
/* PHY level */
{ &hf_ieee802154_nonask_phy_preamble,
{ "Preamble", "wpan-nonask-phy.preamble", FT_UINT32, BASE_HEX, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
{ &hf_ieee802154_nonask_phy_sfd,
{ "Start of Frame Delimiter", "wpan-nonask-phy.sfd", FT_UINT8, BASE_HEX, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
{ &hf_ieee802154_nonask_phy_length,
From Fred Fierling via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5395 : The ZigBee security dissector was not recording the short to long address mappings in Security Headers, preventing the decryption of some payloads. This patch eliminates the Undecoded warnings in packets 1 and 19 in this test capture: https://bugs.wireshark.org/bugzilla/attachment.cgi?id=5457 The keys to decrypt these packets are listed in the bug. svn path=/trunk/; revision=34886
2010-11-15 20:52:41 +00:00
{ "Frame Length", "wpan-nonask-phy.frame_length", FT_UINT8, BASE_HEX, NULL,
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
IEEE802154_PHY_LENGTH_MASK, NULL, HFILL }},
Eliminate proto_tree_add_text from some dissectors. Other minor cleanup while in the neighborhood. Change-Id: Ib76f4a9f89b5933425760af0a980c6a549031b8f Reviewed-on: https://code.wireshark.org/review/3537 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-09 17:43:44 +00:00
{ &hf_ieee802154_nonask_phr,
{ "PHR", "wpan-nonask-phy.phr", FT_UINT8, BASE_HEX, NULL,
0x0, NULL, HFILL }},
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
};
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static hf_register_info hf[] = {
From Colin O'Flynn: Fix name of wpan (IEEE 802.15.4) fields to be more consistent, add in generic wpan.length field. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5952 svn path=/trunk/; revision=40838
2012-02-04 13:43:58 +00:00
{ &hf_ieee802154_frame_length,
{ "Frame Length", "wpan.frame_length", FT_UINT8, BASE_DEC, NULL, 0x0,
"Frame Length as reported from lower layer", HFILL }},
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
{ &hf_ieee802154_fcf,
{ "Frame Control Field", "wpan.fcf", FT_UINT16, BASE_HEX, NULL,
0x0, NULL, HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{ &hf_ieee802154_frame_type,
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
{ "Frame Type", "wpan.frame_type", FT_UINT16, BASE_HEX, VALS(ieee802154_frame_types),
IEEE802154_FCF_TYPE_MASK, NULL, HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{ &hf_ieee802154_security,
{ "Security Enabled", "wpan.security", FT_BOOLEAN, 16, NULL, IEEE802154_FCF_SEC_EN,
"Whether security operations are performed at the MAC layer or not.", HFILL }},
{ &hf_ieee802154_pending,
{ "Frame Pending", "wpan.pending", FT_BOOLEAN, 16, NULL, IEEE802154_FCF_FRAME_PND,
"Indication of additional packets waiting to be transferred from the source device.", HFILL }},
{ &hf_ieee802154_ack_request,
{ "Acknowledge Request", "wpan.ack_request", FT_BOOLEAN, 16, NULL, IEEE802154_FCF_ACK_REQ,
Changed references for IntraPAN to PAN ID Compression as per all versions 802.15.4-2006 and laterChange-Id: I99e66919c86712533cd37fef9d4c464b75444d93 Change-Id: I9ec2b1a6d457d887a7202f7fe0894c3894cb1ecb Reviewed-on: https://code.wireshark.org/review/12514 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-11 01:06:04 +00:00
"Whether the sender of this packet requests acknowledgment or not.", HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
Changed references for IntraPAN to PAN ID Compression as per all versions 802.15.4-2006 and laterChange-Id: I99e66919c86712533cd37fef9d4c464b75444d93 Change-Id: I9ec2b1a6d457d887a7202f7fe0894c3894cb1ecb Reviewed-on: https://code.wireshark.org/review/12514 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-11 01:06:04 +00:00
{ &hf_ieee802154_pan_id_compression,
{ "PAN ID Compression", "wpan.pan_id_compression", FT_BOOLEAN, 16, NULL, IEEE802154_FCF_PAN_ID_COMPRESSION,
"Whether this packet contains the PAN ID or not.", HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
{ &hf_ieee802154_seqno_suppression,
{ "Sequence Number Suppression", "wpan.seqno_suppression", FT_BOOLEAN, 16, NULL, IEEE802154_FCF_SEQNO_SUPPRESSION,
"Whether this packet contains the Sequence Number or not.", HFILL }},
{ &hf_ieee802154_ie_present,
{ "Information Elements Present", "wpan.ie_present", FT_BOOLEAN, 16, NULL, IEEE802154_FCF_IE_PRESENT,
"Whether this packet contains the Information Elements or not.", HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{ &hf_ieee802154_seqno,
{ "Sequence Number", "wpan.seq_no", FT_UINT8, BASE_DEC, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{ &hf_ieee802154_dst_addr_mode,
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
{ "Destination Addressing Mode", "wpan.dst_addr_mode", FT_UINT16, BASE_HEX, VALS(ieee802154_addr_modes),
IEEE802154_FCF_DADDR_MASK, NULL, HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{ &hf_ieee802154_src_addr_mode,
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
{ "Source Addressing Mode", "wpan.src_addr_mode", FT_UINT16, BASE_HEX, VALS(ieee802154_addr_modes),
IEEE802154_FCF_SADDR_MASK, NULL, HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{ &hf_ieee802154_version,
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
{ "Frame Version", "wpan.version", FT_UINT16, BASE_DEC, VALS(ieee802154_frame_versions),
IEEE802154_FCF_VERSION, NULL, HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
From Colin O'Flynn: Fix name of wpan (IEEE 802.15.4) fields to be more consistent, add in generic wpan.length field. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5952 svn path=/trunk/; revision=40838
2012-02-04 13:43:58 +00:00
{ &hf_ieee802154_dst_panID,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{ "Destination PAN", "wpan.dst_pan", FT_UINT16, BASE_HEX, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
From Colin O'Flynn: Fix name of wpan (IEEE 802.15.4) fields to be more consistent, add in generic wpan.length field. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5952 svn path=/trunk/; revision=40838
2012-02-04 13:43:58 +00:00
{ &hf_ieee802154_dst16,
{ "Destination", "wpan.dst16", FT_UINT16, BASE_HEX, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
From Colin O'Flynn: Fix name of wpan (IEEE 802.15.4) fields to be more consistent, add in generic wpan.length field. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5952 svn path=/trunk/; revision=40838
2012-02-04 13:43:58 +00:00
{ &hf_ieee802154_dst64,
{ "Destination", "wpan.dst64", FT_EUI64, BASE_NONE, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{ &hf_ieee802154_src_panID,
{ "Source PAN", "wpan.src_pan", FT_UINT16, BASE_HEX, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
{ &hf_ieee802154_src16,
{ "Source", "wpan.src16", FT_UINT16, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
{ &hf_ieee802154_src64,
Add FT_EUI64 Field Type * Remove proto_tree_add_eui64 function from 802.15.4 Dissector * Replace print_eui64/print_eui64 by eui64_to_str/get_eui64_name * Update Documentation (README.dev) * Add new function in libwireshark.def * Support of encoding for tvb_eui64_to_str * Use FT_EUI64 for ICMPv6, CAPWAP, Zbee ... dissector svn path=/trunk/; revision=37015
2011-05-08 10:23:53 +00:00
{ "Extended Source", "wpan.src64", FT_EUI64, BASE_NONE, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
{ &hf_ieee802154_src64_origin,
{ "Origin", "wpan.src64.origin", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{ &hf_ieee802154_fcs,
{ "FCS", "wpan.fcs", FT_UINT16, BASE_HEX, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{ &hf_ieee802154_rssi,
{ "RSSI", "wpan.rssi", FT_INT8, BASE_DEC, NULL, 0x0,
"Received Signal Strength", HFILL }},
{ &hf_ieee802154_fcs_ok,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
{ "FCS Valid", "wpan.fcs_ok", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{ &hf_ieee802154_correlation,
{ "LQI Correlation Value", "wpan.correlation", FT_UINT8, BASE_DEC, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/* Header IE */
{ &hf_ieee802154_header_ie,
{ "Header IE", "wpan.header_ie", FT_UINT16, BASE_HEX, NULL,
0x0, NULL, HFILL }},
{ &hf_ieee802154_header_ie_type,
{ "Type", "wpan.header_ie.type", FT_UINT16, BASE_DEC, VALS(ieee802154_ie_types),
IEEE802154_HEADER_IE_TYPE_MASK, NULL, HFILL }},
{ &hf_ieee802154_header_ie_id,
{ "Id", "wpan.header_ie.id", FT_UINT16, BASE_HEX, VALS(ieee802154_header_ie_names),
IEEE802154_HEADER_IE_ID_MASK, NULL, HFILL }},
{ &hf_ieee802154_header_ie_length,
{ "Length", "wpan.header_ie.length", FT_UINT16, BASE_DEC, NULL,
IEEE802154_HEADER_IE_LENGTH_MASK, NULL, HFILL }},
{ &hf_ieee802154_header_ie_data,
{ "Data", "wpan.header_ie.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
/* Payload IEs */
{ &hf_ieee802154_payload_ie,
{ "Payload IE", "wpan.payload_ie", FT_UINT16, BASE_HEX, NULL,
0x0, NULL, HFILL }},
{ &hf_ieee802154_payload_ie_type,
{ "Type", "wpan.payload_ie.type", FT_UINT16, BASE_DEC, VALS(ieee802154_ie_types),
IEEE802154_PAYLOAD_IE_TYPE_MASK, NULL, HFILL }},
{ &hf_ieee802154_payload_ie_id,
{ "Id", "wpan.payload_ie.id", FT_UINT16, BASE_HEX, VALS(ieee802154_payload_ie_names),
IEEE802154_PAYLOAD_IE_ID_MASK, NULL, HFILL }},
{ &hf_ieee802154_payload_ie_length,
{ "Length", "wpan.payload_ie.length", FT_UINT16, BASE_DEC, NULL,
IEEE802154_PAYLOAD_IE_LENGTH_MASK, NULL, HFILL }},
{ &hf_ieee802154_payload_ie_data,
{ "Data", "wpan.payload_ie.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
/*
* Command Frame Specific Fields
*/
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
{ &hf_ieee802154_cmd_id,
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ "Command Identifier", "wpan.cmd", FT_UINT8, BASE_HEX, VALS(ieee802154_cmd_names), 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/* Capability Information Fields */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_cinfo_alt_coord,
{ "Alternate PAN Coordinator", "wpan.cinfo.alt_coord", FT_BOOLEAN, 8, NULL, IEEE802154_CMD_CINFO_ALT_PAN_COORD,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"Whether this device can act as a PAN coordinator or not.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_cinfo_device_type,
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
{ "Device Type", "wpan.cinfo.device_type", FT_BOOLEAN, 8, TFS(&tfs_cinfo_device_type), IEEE802154_CMD_CINFO_DEVICE_TYPE,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"Whether this device is RFD (reduced-function device) or FFD (full-function device).", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_cinfo_power_src,
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
{ "Power Source", "wpan.cinfo.power_src", FT_BOOLEAN, 8, TFS(&tfs_cinfo_power_src), IEEE802154_CMD_CINFO_POWER_SRC,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"Whether this device is operating on AC/mains or battery power.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_cinfo_idle_rx,
{ "Receive On When Idle", "wpan.cinfo.idle_rx", FT_BOOLEAN, 8, NULL, IEEE802154_CMD_CINFO_IDLE_RX,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"Whether this device can receive packets while idle or not.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_cinfo_sec_capable,
{ "Security Capability", "wpan.cinfo.sec_capable", FT_BOOLEAN, 8, NULL, IEEE802154_CMD_CINFO_SEC_CAPABLE,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"Whether this device is capable of receiving encrypted packets.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_cinfo_alloc_addr,
{ "Allocate Address", "wpan.cinfo.alloc_addr", FT_BOOLEAN, 8, NULL, IEEE802154_CMD_CINFO_ALLOC_ADDR,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"Whether this device wishes to use a 16-bit short address instead of its IEEE 802.15.4 64-bit long address.", HFILL }},
/* Association response fields */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_assoc_addr,
{ "Short Address", "wpan.asoc.addr", FT_UINT16, BASE_HEX, NULL, 0x0,
Remove a linefeed from a field description. svn path=/trunk/; revision=24756
2008-03-29 20:47:12 +00:00
"The short address that the device should assume. An address of 0xfffe indicates that the device should use its IEEE 64-bit long address.", HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_assoc_status,
{ "Association Status", "wpan.assoc.status", FT_UINT8, BASE_HEX, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_disassoc_reason,
{ "Disassociation Reason", "wpan.disassoc.reason", FT_UINT8, BASE_HEX, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Coordinator Realignment fields */
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_realign_pan,
{ "PAN ID", "wpan.realign.pan", FT_UINT16, BASE_HEX, NULL, 0x0,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"The PAN identifier the coordinator wishes to use for future communication.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_realign_caddr,
{ "Coordinator Short Address", "wpan.realign.addr", FT_UINT16, BASE_HEX, NULL, 0x0,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"The 16-bit address the coordinator wishes to use for future communication.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_realign_channel,
{ "Logical Channel", "wpan.realign.channel", FT_UINT8, BASE_DEC, NULL, 0x0,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"The logical channel the coordinator wishes to use for future communication.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_realign_addr,
{ "Short Address", "wpan.realign.addr", FT_UINT16, BASE_HEX, NULL, 0x0,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"A short-address that the orphaned device shall assume if applicable.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_realign_channel_page,
{ "Channel Page", "wpan.realign.channel_page", FT_UINT8, BASE_DEC, NULL, 0x0,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"The logical channel page the coordinator wishes to use for future communication.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_gtsreq_len,
{ "GTS Length", "wpan.gtsreq.length", FT_UINT8, BASE_DEC, NULL, IEEE802154_CMD_GTS_REQ_LEN,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"Number of superframe slots the device is requesting.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_gtsreq_dir,
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
{ "GTS Direction", "wpan.gtsreq.direction", FT_BOOLEAN, 8, TFS(&tfs_gtsreq_dir), IEEE802154_CMD_GTS_REQ_DIR,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"The direction of traffic in the guaranteed timeslot.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_gtsreq_type,
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22 11:57:37 +00:00
{ "Characteristic Type", "wpan.gtsreq.type", FT_BOOLEAN, 8, TFS(&tfs_gtsreq_type), IEEE802154_CMD_GTS_REQ_TYPE,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"Whether this request is to allocate or deallocate a timeslot.", HFILL }},
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/*
* Beacon Frame Specific Fields
*/
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_beacon_order,
{ "Beacon Interval", "wpan.beacon_order", FT_UINT16, BASE_DEC, NULL, IEEE802154_BEACON_ORDER_MASK,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"Specifies the transmission interval of the beacons.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_superframe_order,
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
{ "Superframe Interval", "wpan.superframe_order", FT_UINT16, BASE_DEC, NULL,
IEEE802154_SUPERFRAME_ORDER_MASK,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"Specifies the length of time the coordinator will interact with the PAN.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_cap,
{ "Final CAP Slot", "wpan.cap", FT_UINT16, BASE_DEC, NULL, IEEE802154_SUPERFRAME_CAP_MASK,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"Specifies the final superframe slot used by the CAP.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_superframe_battery_ext,
{ "Battery Extension", "wpan.battery_ext", FT_BOOLEAN, 16, NULL, IEEE802154_BATT_EXTENSION_MASK,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"Whether transmissions may not extend past the length of the beacon frame.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_superframe_coord,
{ "PAN Coordinator", "wpan.bcn_coord", FT_BOOLEAN, 16, NULL, IEEE802154_SUPERFRAME_COORD_MASK,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"Whether this beacon frame is being transmitted by the PAN coordinator or not.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_assoc_permit,
{ "Association Permit", "wpan.assoc_permit", FT_BOOLEAN, 16, NULL, IEEE802154_ASSOC_PERMIT_MASK,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"Whether this PAN is accepting association requests or not.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_gts_count,
{ "GTS Descriptor Count", "wpan.gts.count", FT_UINT8, BASE_DEC, NULL, 0x0,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"The number of GTS descriptors present in this beacon frame.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_gts_permit,
{ "GTS Permit", "wpan.gts.permit", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"Whether the PAN coordinator is accepting GTS requests or not.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_gts_direction,
FT_BOOLEAN hf[] entries with a 0 'bitmask' should have 'display' = BASE_NONE; In some cases: Use val_to_str_const() instead of val_to_str(); Reformat long lines; Do some general whitespace changes. svn path=/trunk/; revision=41587
2012-03-16 02:00:29 +00:00
{ "Direction", "wpan.gts.direction", FT_BOOLEAN, BASE_NONE, TFS(&ieee802154_gts_direction_tfs), 0x0,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"A flag defining the direction of the GTS Slot.", HFILL }},
Eliminate proto_tree_add_text from some dissectors. Other minor cleanup while in the neighborhood. Change-Id: Ib76f4a9f89b5933425760af0a980c6a549031b8f Reviewed-on: https://code.wireshark.org/review/3537 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-09 17:43:44 +00:00
{ &hf_ieee802154_gts_address,
{ "Address", "wpan.gts.address", FT_UINT16, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_pending16,
{ "Address", "wpan.pending16", FT_UINT16, BASE_HEX, NULL, 0x0,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
"Device with pending data to receive.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
{ &hf_ieee802154_pending64,
Add FT_EUI64 Field Type * Remove proto_tree_add_eui64 function from 802.15.4 Dissector * Replace print_eui64/print_eui64 by eui64_to_str/get_eui64_name * Update Documentation (README.dev) * Add new function in libwireshark.def * Support of encoding for tvb_eui64_to_str * Use FT_EUI64 for ICMPv6, CAPWAP, Zbee ... dissector svn path=/trunk/; revision=37015
2011-05-08 10:23:53 +00:00
{ "Address", "wpan.pending64", FT_EUI64, BASE_NONE, NULL, 0x0,
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
"Device with pending data to receive.", HFILL }},
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/*
* Auxiliary Security Header Fields
*/
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
{ &hf_ieee802154_security_level,
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
{ "Security Level", "wpan.aux_sec.sec_level", FT_UINT8, BASE_HEX, VALS(ieee802154_sec_level_names),
IEEE802154_AUX_SEC_LEVEL_MASK, "The Security Level of the frame", HFILL }},
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
Eliminate proto_tree_add_text from some dissectors. Other minor cleanup while in the neighborhood. Change-Id: Ib76f4a9f89b5933425760af0a980c6a549031b8f Reviewed-on: https://code.wireshark.org/review/3537 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-09 17:43:44 +00:00
{ &hf_ieee802154_security_control_field,
{ "Security Control Field", "wpan.aux_sec.security_control_field", FT_UINT8, BASE_HEX, NULL,
0x0, NULL, HFILL }},
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
{ &hf_ieee802154_key_id_mode,
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
{ "Key Identifier Mode", "wpan.aux_sec.key_id_mode", FT_UINT8, BASE_HEX, VALS(ieee802154_key_id_mode_names),
IEEE802154_AUX_KEY_ID_MODE_MASK,
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
"The scheme to use by the recipient to lookup the key in its key table", HFILL }},
{ &hf_ieee802154_aux_sec_reserved,
{ "Reserved", "wpan.aux_sec.reserved", FT_UINT8, BASE_HEX, NULL, IEEE802154_AUX_KEY_RESERVED_MASK,
(Refining the regexp...) Replace blurbs that match the name (case insensitive) with NULL. svn path=/trunk/; revision=34230
2010-09-24 02:51:40 +00:00
NULL, HFILL }},
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
{ &hf_ieee802154_aux_sec_frame_counter,
{ "Frame Counter", "wpan.aux_sec.frame_counter", FT_UINT32, BASE_DEC, NULL, 0x0,
"Frame counter of the originator of the protected frame", HFILL }},
{ &hf_ieee802154_aux_sec_key_source,
{ "Key Source", "wpan.aux_sec.key_source", FT_UINT64, BASE_HEX, NULL, 0x0,
"Key Source for processing of the protected frame", HFILL }},
{ &hf_ieee802154_aux_sec_key_index,
{ "Key Index", "wpan.aux_sec.key_index", FT_UINT8, BASE_HEX, NULL, 0x0,
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
"Key Index for processing of the protected frame", HFILL }},
/* IEEE 802.15.4-2003 Security Header Fields */
{ &hf_ieee802154_sec_frame_counter,
{ "Frame Counter", "wpan.sec_frame_counter", FT_UINT32, BASE_HEX, NULL, 0x0,
"Frame counter of the originator of the protected frame (802.15.4-2003)", HFILL }},
{ &hf_ieee802154_sec_key_sequence_counter,
{ "Key Sequence Counter", "wpan.sec_key_sequence_counter", FT_UINT8, BASE_HEX, NULL, 0x0,
"Key Sequence counter of the originator of the protected frame (802.15.4-2003)", HFILL }}
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
};
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
/* Subtrees */
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
static gint *ett[] = {
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
&ett_ieee802154_nonask_phy,
&ett_ieee802154_nonask_phy_phr,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
&ett_ieee802154,
&ett_ieee802154_fcf,
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
&ett_ieee802154_auxiliary_security,
&ett_ieee802154_aux_sec_control,
&ett_ieee802154_aux_sec_key_id,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
&ett_ieee802154_fcs,
&ett_ieee802154_cmd,
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
&ett_ieee802154_superframe,
&ett_ieee802154_gts,
&ett_ieee802154_gts_direction,
&ett_ieee802154_gts_descriptors,
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
&ett_ieee802154_pendaddr,
&ett_ieee802154_header,
&ett_ieee802154_header_ie,
&ett_ieee802154_payload,
&ett_ieee802154_payload_ie,
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
};
Batch of filterable expert info. svn path=/trunk/; revision=51688
2013-09-02 23:32:31 +00:00
static ei_register_info ei[] = {
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
{ &ei_ieee802154_invalid_addressing, { "wpan.invalid_addressing", PI_MALFORMED, PI_WARN,
"Invalid Addressing", EXPFILL }},
{ &ei_ieee802154_invalid_panid_compression, { "wpan.invalid_panid_compression", PI_MALFORMED, PI_ERROR,
"Invalid Setting for PAN Id Compression", EXPFILL }},
{ &ei_ieee802154_dst, { "wpan.dst_invalid", PI_MALFORMED, PI_ERROR,
"Invalid Destination Address Mode", EXPFILL }},
{ &ei_ieee802154_src, { "wpan.src_invalid", PI_MALFORMED, PI_ERROR,
"Invalid Source Address Mode", EXPFILL }},
{ &ei_ieee802154_frame_ver, { "wpan.frame_version_unknown", PI_MALFORMED, PI_ERROR,
"Frame Version Unknown Cannot Dissect", EXPFILL }},
{ &ei_ieee802154_frame_type, { "wpan.frame_type_unknown", PI_MALFORMED, PI_ERROR,
"Frame Type Unknown Cannot Dissect", EXPFILL }},
{ &ei_ieee802154_decrypt_error, { "wpan.decrypt_error", PI_UNDECODED, PI_WARN,
"Decryption error", EXPFILL }},
{ &ei_ieee802154_fcs, { "wpan.fcs.bad", PI_CHECKSUM, PI_WARN,
"Bad FCS", EXPFILL }},
{ &ei_ieee802154_seqno_suppression, { "wpan.seqno_supression_invalid", PI_MALFORMED, PI_WARN,
"Sequence Number Suppression invalid for 802.15.4-2003 and 2006", EXPFILL }},
Batch of filterable expert info. svn path=/trunk/; revision=51688
2013-09-02 23:32:31 +00:00
};
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
/* Preferences. */
From Colin O'Flynn: The idea is that there is now some hardware that can put 802.15.4 frames over Ethernet. To do so, the 802.15.4 frames are wrapped in an Ethernet frame, with the Ethertype set to a value indicating the payload is 802.15.4. Since there is no official ETHTYPE designated by the IEEE, the number 0x809A is used in this code. However a preference is added to the "IEEE 802.15.4" type in the preference dialog allowing you to change this ethtype to something else. The hardware for those interested is the Atmel Raven USB Stick. svn path=/trunk/; revision=26352
2008-10-05 08:11:35 +00:00
module_t *ieee802154_module;
Batch of filterable expert info. svn path=/trunk/; revision=51688
2013-09-02 23:32:31 +00:00
expert_module_t* expert_ieee802154;
From Colin O'Flynn: The idea is that there is now some hardware that can put 802.15.4 frames over Ethernet. To do so, the 802.15.4 frames are wrapped in an Ethernet frame, with the Ethertype set to a value indicating the payload is 802.15.4. Since there is no official ETHTYPE designated by the IEEE, the number 0x809A is used in this code. However a preference is added to the "IEEE 802.15.4" type in the preference dialog allowing you to change this ethtype to something else. The hardware for those interested is the Atmel Raven USB Stick. svn path=/trunk/; revision=26352
2008-10-05 08:11:35 +00:00
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
static uat_field_t addr_uat_flds[] = {
UAT_FLD_HEX(addr_uat,addr16,"Short Address",
"16-bit short address in hexadecimal."),
UAT_FLD_HEX(addr_uat,pan,"PAN Identifier",
"16-bit PAN identifier in hexadecimal."),
UAT_FLD_BUFFER(addr_uat,eui64,"EUI-64",
"64-bit extended unique identifier."),
UAT_END_FIELDS
};
Tighten heuristic checks for IEEE 802.15.4 protocols, and add Decode-As by PANID for when we still get it wrong. Change-Id: Icc2b274d2478a9426da881998bbbbfb3bf34ec4a Reviewed-on: https://code.wireshark.org/review/1167 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18 03:33:42 +00:00
static build_valid_func ieee802154_da_build_value[1] = {ieee802154_da_value};
static decode_as_value_t ieee802154_da_values = {ieee802154_da_prompt, 1, ieee802154_da_build_value};
static decode_as_t ieee802154_da = {
IEEE802154_PROTOABBREV_WPAN, "PAN", IEEE802154_PROTOABBREV_WPAN_PANID,
1, 0, &ieee802154_da_values, NULL, NULL,
decode_as_default_populate_list, decode_as_default_reset, decode_as_default_change, NULL
};
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
/* Register the init routine. */
register_init_routine(proto_init_ieee802154);
Split more init routines into init/cleanup functions This patch is partially automatically generated, but are modified manually. In particular, assignments and function calls have been audited. Some debugging comments and ifdef'd prints have been removed. The lookup tables of the dcm and sip dissectors are now cleared. It is only called on reopening files anyway. The isakmp dissector is modified to use g_hash_table_new_full for destruction of its keys and values. Fix a memleak in ipsec dissector when libgcrypt is not enabled. Generated using https://git.lekensteyn.nl/peter/wireshark-notes/diff/one-off/cleanup-rewrite.py?id=3c6128ee266024d164650955f93c7740484abd68 (with AUDIT = True). Change-Id: I3fd910bdee663842ac0196334fe0189b67e251b0 Reviewed-on: https://code.wireshark.org/review/9225 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-28 13:15:07 +00:00
register_cleanup_routine(proto_cleanup_ieee802154);
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Register Protocol name and description. */
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
proto_ieee802154 = proto_register_protocol("IEEE 802.15.4 Low-Rate Wireless PAN", "IEEE 802.15.4",
IEEE802154_PROTOABBREV_WPAN);
proto_ieee802154_nonask_phy = proto_register_protocol("IEEE 802.15.4 Low-Rate Wireless PAN non-ASK PHY",
"IEEE 802.15.4 non-ASK PHY", "wpan-nonask-phy");
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Register header fields and subtrees. */
proto_register_field_array(proto_ieee802154, hf, array_length(hf));
From Max Filippov: patch to support IEE802.15.4 non-ASK PHY. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906 svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
proto_register_field_array(proto_ieee802154, hf_phy, array_length(hf_phy));
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
proto_register_subtree_array(ett, array_length(ett));
Batch of filterable expert info. svn path=/trunk/; revision=51688
2013-09-02 23:32:31 +00:00
expert_ieee802154 = expert_register_protocol(proto_ieee802154);
expert_register_field_array(expert_ieee802154, ei, array_length(ei));
Add "column filter string" support to address types. Information about dissector (filter) fields should be kept in a dissector as much as possible. Supporting "column filter string" also allows other dissectors to create their own "address types" with different column filters (because AT_ETHER isn't always an "Ethernet" address). This feature also allowed a few "dissector specific" address types to be moved to their own dissector. Change-Id: Ie9024af4db62bc2ee4f8c9d28a1d807f706f45bf Ping-Bug:7728 Reviewed-on: https://code.wireshark.org/review/7029 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-08 18:49:57 +00:00
ieee802_15_4_short_address_type = address_type_dissector_register("AT_IEEE_802_15_4_SHORT", "IEEE 802.15.4 16-bit short address",
Add name resolution support to address type. Add address_with_resolution_to_str API that returns address string + name resolution in the format %s (%s), first string is resolved name (if available) and second string is raw address string. Convert AT_FCWWN to using proper name resolution format First use of address_with_resolution_to_str with field types in proto.c Change-Id: I2ae77c29a4ffc30bb919fbec00f06629830898c2 Reviewed-on: https://code.wireshark.org/review/7196 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-12 17:03:49 +00:00
ieee802_15_4_short_address_to_str, ieee802_15_4_short_address_str_len, NULL, ieee802_15_4_short_address_len, NULL, NULL);
Add address type registration. Now address types are setup just like field types and must be registered with a structure that provides its string representation (and more things in the future). Address types that are limited to a single dissector are registered by the dissector. More "common" ones are globally registered. There are still a few that really belong in a dissector, but have other dependencies currently not accounted for in the address type support. Many of the "address to string" conversions that involved g_sprintf have be changed to use more "performance friendly" methods (some at the cost of needing to_str-int.h) Leaving all comments regarding this "solution" in address_to_str.c in until all have been implemented Change-Id: I494f413e016b22859c44675def11135f228796e0 Reviewed-on: https://code.wireshark.org/review/7019 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-08 03:15:55 +00:00
From Colin O'Flynn: The idea is that there is now some hardware that can put 802.15.4 frames over Ethernet. To do so, the 802.15.4 frames are wrapped in an Ethernet frame, with the Ethertype set to a value indicating the payload is 802.15.4. Since there is no official ETHTYPE designated by the IEEE, the number 0x809A is used in this code. However a preference is added to the "IEEE 802.15.4" type in the preference dialog allowing you to change this ethtype to something else. The hardware for those interested is the Atmel Raven USB Stick. svn path=/trunk/; revision=26352
2008-10-05 08:11:35 +00:00
/* add a user preference to set the 802.15.4 ethertype */
Rename address_to_str() to ep_address_to_str() because: 1) This indicates that the string has ephemeral lifetime 2) More consistent with its existing seasonal counterpart, se_address_to_str(). svn path=/trunk/; revision=29747
2009-09-06 14:25:47 +00:00
ieee802154_module = prefs_register_protocol(proto_ieee802154,
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
proto_reg_handoff_ieee802154);
From Colin O'Flynn: The idea is that there is now some hardware that can put 802.15.4 frames over Ethernet. To do so, the 802.15.4 frames are wrapped in an Ethernet frame, with the Ethertype set to a value indicating the payload is 802.15.4. Since there is no official ETHTYPE designated by the IEEE, the number 0x809A is used in this code. However a preference is added to the "IEEE 802.15.4" type in the preference dialog allowing you to change this ethtype to something else. The hardware for those interested is the Atmel Raven USB Stick. svn path=/trunk/; revision=26352
2008-10-05 08:11:35 +00:00
prefs_register_uint_preference(ieee802154_module, "802154_ethertype",
From Jean-François Wauthy: Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security Header of the MHR (see IEEE 802.15.4-2006 specs p.138). The attached patch, add two things : 1) Support for dissecting the Auxiliary Security Header 2) Add a preference option to force the dissection of the FCS field as being in the TI CC24xx format svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
"802.15.4 Ethertype (in hex)",
"(Hexadecimal) Ethertype used to indicate IEEE 802.15.4 frame.",
16, &ieee802154_ethertype);
prefs_register_bool_preference(ieee802154_module, "802154_cc24xx",
"TI CC24xx FCS format",
"Set if the FCS field is in TI CC24xx format.",
&ieee802154_cc24xx);
Fix for bug 4076: Have the option to continue dissection of data even with failed FCS check. svn path=/trunk/; revision=30786
2009-10-31 20:55:33 +00:00
prefs_register_bool_preference(ieee802154_module, "802154_fcs_ok",
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
"Dissect only good FCS",
"Dissect payload only if FCS is valid.",
Fix for bug 4076: Have the option to continue dissection of data even with failed FCS check. svn path=/trunk/; revision=30786
2009-10-31 20:55:33 +00:00
&ieee802154_fcs_ok);
From Colin O'Flynn: The idea is that there is now some hardware that can put 802.15.4 frames over Ethernet. To do so, the 802.15.4 frames are wrapped in an Ethernet frame, with the Ethertype set to a value indicating the payload is 802.15.4. Since there is no official ETHTYPE designated by the IEEE, the number 0x809A is used in this code. However a preference is added to the "IEEE 802.15.4" type in the preference dialog allowing you to change this ethtype to something else. The hardware for those interested is the Atmel Raven USB Stick. svn path=/trunk/; revision=26352
2008-10-05 08:11:35 +00:00
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
/* Create a UAT for static address mappings. */
static_addr_uat = uat_new("Static Addresses",
sizeof(static_addr_t), /* record size */
"802154_addresses", /* filename */
TRUE, /* from_profile */
Fix all -fstrict-alias warnings found by gcc 4.1.2 The majority of the fixes are for calls to uat_new(). Instead of having each caller cast its private data to (void**), we use void* in the uat_new() API itself. Inside uat_new(), we cast the void* to void**. Some dissectors use val64_string arrays, so a VALS64() macro was added for those, to avoid using VALS(), which is useful only for value_string arrays. packet-mq.c was changed because dissect_nt_sid() requires a char**, not a guint**. All other callers of dissect_nt_sid() use char*'s (and take the address of it) for their local storage. So, this was changed to follow the other practices. A confusion between gint and absolute_time_display_e in packet-time.c was cleared up. The ugliest fix is the addition of ip6_guint8_to_str(), for exactly one caller. The caller uses one type of ip6 address byte array, while ip6_to_str() expects another. This new function is in place until the various address implementations can be consolidated. Add VALS64() to the developer documentation. Change-Id: If93ff5c6c8c7cc3c9510d7fb78fa9108e4552805 Reviewed-on: https://code.wireshark.org/review/48 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-01-30 17:43:52 +00:00
&static_addrs, /* data_ptr */
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
&num_static_addrs, /* numitems_ptr */
UATs could be put into "categories". The categories were defined only implicitly by the #define name and string they were defined to; not all UATs neatly fit into any of the categories, so some of them were put into categories that weren't obviously correct for them, and one - the display filter macro UAT - wasn't put into any category at all (which caused crashes when editing them, as the GUI code that handled UAT changes from a dialog assumed the category field was non-null). The category was, in practice, used only to decide, in the aforementioned GUI code, whether the packet summary pane needed to be updated or not. It also offered no option of "don't update the packet summary pane *and* don't redissect anything", which is what would be appropriate for the display filter macro UAT. Replace the category with a set of fields indicating what the UAT affects; we currently offer "dissection", which applies to most UATs (any UAT in libwireshark presumably affects dissection at a minimum) and "the set of named fields that exist". Changing any UAT that affects dissection requires a redissection; changing any UAT that affects the set of named fields that exist requires a redissection *and* rebuilding the packet summary pane. Perhaps we also need "filtering", so that if you change a display filter macro, we re-filter, in case the display is currently filtered with a display filter that uses a macro that changed. svn path=/trunk/; revision=43603
2012-07-08 01:00:46 +00:00
UAT_AFFECTS_DISSECTION, /* affects dissection of packets, but not set of named fields */
From Owen Kirby: This patch adds a hash table that stores any short-to-extended address mappings that the dissector finds for later use during packet decryption. I've also added a UAT so the user can manually add address pairs if needed. svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
NULL, /* help */
NULL, /* copy callback */
addr_uat_update_cb, /* update callback */
NULL, /* free callback */
NULL, /* post update callback */
addr_uat_flds); /* UAT field definitions */
prefs_register_uat_preference(ieee802154_module, "static_addr",
"Static Addresses",
"A table of static address mappings between 16-bit short addressing and EUI-64 addresses",
static_addr_uat);
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Register preferences for a decryption key */
/* TODO: Implement a UAT for multiple keys, and with more advanced key management. */
prefs_register_string_preference(ieee802154_module, "802154_key", "Decryption key",
"128-bit decryption key in hexadecimal format", (const char **)&ieee802154_key_str);
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
prefs_register_enum_preference(ieee802154_module, "802154_sec_suite",
"Security Suite (802.15.4-2003)",
"Specifies the security suite to use for 802.15.4-2003 secured frames"
" (only supported suites are listed). Option ignored for 802.15.4-2006"
" and unsecured frames.",
&ieee802154_sec_suite, ieee802154_2003_sec_suite_enums, FALSE);
prefs_register_bool_preference(ieee802154_module, "802154_extend_auth",
"Extend authentication data (802.15.4-2003)",
"Set if the manufacturer extends the authentication data with the"
" security header. Option ignored for 802.15.4-2006 and unsecured frames.",
&ieee802154_extend_auth);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Register the subdissector list */
Don't allow multiple registrations of a protocol in dissector tables. 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-10-29 13:23:55 +00:00
panid_dissector_table = register_dissector_table(IEEE802154_PROTOABBREV_WPAN_PANID, "IEEE 802.15.4 PANID", FT_UINT16, BASE_HEX, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
Have a heur_dissector_list_t be an opaque handle. This allows dissector lists to be looked up by name, so they can be shared by multiple dissectors. (This means that there's no "udplite" heuristic dissector list, but there shouldn't be one - protocols can run atop UDP or UDPLite equally well, and they share a port namespace and uint dissector table, so they should share a heuristic dissector table as well.) Change-Id: Ifb2d2c294938c06d348a159adea7a57db8d770a7 Reviewed-on: https://code.wireshark.org/review/5936 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-21 04:13:28 +00:00
ieee802154_heur_subdissector_list = register_heur_dissector_list(IEEE802154_PROTOABBREV_WPAN);
ieee802154_beacon_subdissector_list = register_heur_dissector_list(IEEE802154_PROTOABBREV_WPAN_BEACON);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
More ethereal --> wireshark svn path=/trunk/; revision=27994
2009-04-08 13:07:21 +00:00
/* Register dissectors with Wireshark. */
new_register_dissector -> register_dissector for dissector directory. 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-09 04:04:01 +00:00
register_dissector(IEEE802154_PROTOABBREV_WPAN, dissect_ieee802154, proto_ieee802154);
register_dissector("wpan_nofcs", dissect_ieee802154_nofcs, proto_ieee802154);
register_dissector("wpan_cc24xx", dissect_ieee802154_cc24xx, proto_ieee802154);
register_dissector("wpan-nonask-phy", dissect_ieee802154_nonask_phy, proto_ieee802154_nonask_phy);
Tighten heuristic checks for IEEE 802.15.4 protocols, and add Decode-As by PANID for when we still get it wrong. Change-Id: Icc2b274d2478a9426da881998bbbbfb3bf34ec4a Reviewed-on: https://code.wireshark.org/review/1167 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18 03:33:42 +00:00
/* Register a Decode-As handler. */
register_decode_as(&ieee802154_da);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
} /* proto_register_ieee802154 */
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912 svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
added support for IEEE 802.15.4 2012e Information Elements, IEs Change-Id: Id3cf113a8ef9b756cb9241b81f12e28dd3b8d232 Reviewed-on: https://code.wireshark.org/review/12815 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 00:13:34 +00:00
/**
* Registers the IEEE 802.15.4 dissector with Wireshark.
* Will be called every time 'apply' is pressed in the preferences menu.
* as well as during Wireshark initialization
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
*/
void proto_reg_handoff_ieee802154(void)
{
Use tvb_new_subset_remaining() rather than tvb_new_subset(); #include <styring.h> not req'd (in a few cases); Minor reformating & whitespace cleanup. svn path=/trunk/; revision=41374
2012-03-06 16:58:09 +00:00
static gboolean prefs_initialized = FALSE;
From Colin O'Flynn: The idea is that there is now some hardware that can put 802.15.4 frames over Ethernet. To do so, the 802.15.4 frames are wrapped in an Ethernet frame, with the Ethertype set to a value indicating the payload is 802.15.4. Since there is no official ETHTYPE designated by the IEEE, the number 0x809A is used in this code. However a preference is added to the "IEEE 802.15.4" type in the preference dialog allowing you to change this ethtype to something else. The hardware for those interested is the Atmel Raven USB Stick. svn path=/trunk/; revision=26352
2008-10-05 08:11:35 +00:00
static dissector_handle_t ieee802154_handle;
Fix some indentation svn path=/trunk/; revision=27219
2009-01-13 18:08:20 +00:00
static dissector_handle_t ieee802154_nonask_phy_handle;
Define WTAP_ENCAP_IEEE802_15_4_NOFCS, for use in file formats that don't include the FCS, and use it for the Daintree SNA file format. While we're at it, explicitly check to make sure the purported packet length gives it at least one byte of packet data, and fix some print formats to use %u for unsigned values. svn path=/trunk/; revision=33678
2010-07-30 02:30:50 +00:00
static dissector_handle_t ieee802154_nofcs_handle;
Use tvb_new_subset_remaining() rather than tvb_new_subset(); #include <styring.h> not req'd (in a few cases); Minor reformating & whitespace cleanup. svn path=/trunk/; revision=41374
2012-03-06 16:58:09 +00:00
static unsigned int old_ieee802154_ethertype;
GByteArray *bytes;
gboolean res;
From Colin O'Flynn: The idea is that there is now some hardware that can put 802.15.4 frames over Ethernet. To do so, the 802.15.4 frames are wrapped in an Ethernet frame, with the Ethertype set to a value indicating the payload is 802.15.4. Since there is no official ETHTYPE designated by the IEEE, the number 0x809A is used in this code. However a preference is added to the "IEEE 802.15.4" type in the preference dialog allowing you to change this ethtype to something else. The hardware for those interested is the Atmel Raven USB Stick. svn path=/trunk/; revision=26352
2008-10-05 08:11:35 +00:00
if (!prefs_initialized){
/* Get the dissector handles. */
From Fred Fierling: Multi-key Support and Extended Address Mapping for ZigBee Dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331 svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
ieee802154_handle = find_dissector(IEEE802154_PROTOABBREV_WPAN);
Fix some indentation svn path=/trunk/; revision=27219
2009-01-13 18:08:20 +00:00
ieee802154_nonask_phy_handle = find_dissector("wpan-nonask-phy");
Define WTAP_ENCAP_IEEE802_15_4_NOFCS, for use in file formats that don't include the FCS, and use it for the Daintree SNA file format. While we're at it, explicitly check to make sure the purported packet length gives it at least one byte of packet data, and fix some print formats to use %u for unsigned values. svn path=/trunk/; revision=33678
2010-07-30 02:30:50 +00:00
ieee802154_nofcs_handle = find_dissector("wpan_nofcs");
From Colin O'Flynn: The idea is that there is now some hardware that can put 802.15.4 frames over Ethernet. To do so, the 802.15.4 frames are wrapped in an Ethernet frame, with the Ethertype set to a value indicating the payload is 802.15.4. Since there is no official ETHTYPE designated by the IEEE, the number 0x809A is used in this code. However a preference is added to the "IEEE 802.15.4" type in the preference dialog allowing you to change this ethtype to something else. The hardware for those interested is the Atmel Raven USB Stick. svn path=/trunk/; revision=26352
2008-10-05 08:11:35 +00:00
data_handle = find_dissector("data");
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
Rename the routines that handle dissector tables with unsigned integer keys to have _uint in their names, to match the routines that handle dissector tables with string keys. (Using _port can confuse people into thinking they're intended solely for use with TCP/UDP/etc. ports when, in fact, they work better for things such as Ethernet types, where the binding of particular values to particular protocols are a lot stronger.) svn path=/trunk/; revision=35224
2010-12-20 05:35:29 +00:00
dissector_add_uint("wtap_encap", WTAP_ENCAP_IEEE802_15_4, ieee802154_handle);
dissector_add_uint("wtap_encap", WTAP_ENCAP_IEEE802_15_4_NONASK_PHY, ieee802154_nonask_phy_handle);
dissector_add_uint("wtap_encap", WTAP_ENCAP_IEEE802_15_4_NOFCS, ieee802154_nofcs_handle);
From Sascha Herrmann: Patch registering ieee802154 dissector to Linux SLL frames. svn path=/trunk/; revision=47649
2013-02-13 07:16:14 +00:00
dissector_add_uint("sll.ltype", LINUX_SLL_P_IEEE802154, ieee802154_handle);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
From Colin O'Flynn: The idea is that there is now some hardware that can put 802.15.4 frames over Ethernet. To do so, the 802.15.4 frames are wrapped in an Ethernet frame, with the Ethertype set to a value indicating the payload is 802.15.4. Since there is no official ETHTYPE designated by the IEEE, the number 0x809A is used in this code. However a preference is added to the "IEEE 802.15.4" type in the preference dialog allowing you to change this ethtype to something else. The hardware for those interested is the Atmel Raven USB Stick. svn path=/trunk/; revision=26352
2008-10-05 08:11:35 +00:00
prefs_initialized = TRUE;
} else {
Rename the routines that handle dissector tables with unsigned integer keys to have _uint in their names, to match the routines that handle dissector tables with string keys. (Using _port can confuse people into thinking they're intended solely for use with TCP/UDP/etc. ports when, in fact, they work better for things such as Ethernet types, where the binding of particular values to particular protocols are a lot stronger.) svn path=/trunk/; revision=35224
2010-12-20 05:35:29 +00:00
dissector_delete_uint("ethertype", old_ieee802154_ethertype, ieee802154_handle);
From Colin O'Flynn: The idea is that there is now some hardware that can put 802.15.4 frames over Ethernet. To do so, the 802.15.4 frames are wrapped in an Ethernet frame, with the Ethertype set to a value indicating the payload is 802.15.4. Since there is no official ETHTYPE designated by the IEEE, the number 0x809A is used in this code. However a preference is added to the "IEEE 802.15.4" type in the preference dialog allowing you to change this ethtype to something else. The hardware for those interested is the Atmel Raven USB Stick. svn path=/trunk/; revision=26352
2008-10-05 08:11:35 +00:00
}
old_ieee802154_ethertype = ieee802154_ethertype;
Rename address_to_str() to ep_address_to_str() because: 1) This indicates that the string has ephemeral lifetime 2) More consistent with its existing seasonal counterpart, se_address_to_str(). svn path=/trunk/; revision=29747
2009-09-06 14:25:47 +00:00
From Owen Kirby: Packet decryption for IEEE 802.15.4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457 svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
/* Get the IEEE 802.15.4 decryption key. */
bytes = g_byte_array_new();
res = hex_str_to_bytes(ieee802154_key_str, bytes, FALSE);
ieee802154_key_valid = (res && bytes->len >= IEEE802154_CIPHER_SIZE);
if (ieee802154_key_valid) {
memcpy(ieee802154_key, bytes->data, IEEE802154_CIPHER_SIZE);
}
g_byte_array_free(bytes, TRUE);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
/* Register dissector handles. */
Rename the routines that handle dissector tables with unsigned integer keys to have _uint in their names, to match the routines that handle dissector tables with string keys. (Using _port can confuse people into thinking they're intended solely for use with TCP/UDP/etc. ports when, in fact, they work better for things such as Ethernet types, where the binding of particular values to particular protocols are a lot stronger.) svn path=/trunk/; revision=35224
2010-12-20 05:35:29 +00:00
dissector_add_uint("ethertype", ieee802154_ethertype, ieee802154_handle);
From Owen Kirby : IEEE 802.15.4 dissector and DLT_ type. svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
} /* proto_reg_handoff_ieee802154 */