From Owen Kirby via bug 3431:

The attached patch file adds dissectors for the ZigBee protocol stack, 
which runs atop the IEEE 802.15.4 dissector. Also included is the
dissector for the ZigBee Encapsulation Protocol (packet-zep.c), used by
the Exegin Q51 protocol analyzer.

From me:

Fix a bunch of gcc (the compiler, not me) warnings.

svn path=/trunk/; revision=28429

1 files changed, 82 insertions, 0 deletions

diff --git a/epan/dissectors/packet-zbee-security.h b/epan/dissectors/packet-zbee-security.h
new file mode 100644
index 0000000000..eb4e7b3b27
--- /dev/null
+++ b/epan/dissectors/packet-zbee-security.h
@@ -0,0 +1,82 @@
+/* packet-zbee-security.h
+ * Dissector helper routines for encrypted ZigBee frames.
+ * By Owen Kirby <osk@exegin.com>
+ * Copyright 2009 Exegin Technologies Limited
+ *
+ * $Id$
+ *
+ * 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
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifndef PACKET_ZBEE_SECURITY_H
+#define PACKET_ZBEE_SECURITY_H
+
+/*  Structure containing the fields stored in the Aux Header */
+typedef struct{
+    /*  The fields of the Aux Header */
+    guint8      control;
+    guint32     counter;
+    guint64     src;
+    guint8      key_seqno;
+
+    guint8      level;
+    guint8      key;
+    gboolean    nonce;
+} zbee_security_packet;
+
+/* Bit masks for the Security Control Field. */
+#define ZBEE_SEC_CONTROL_LEVEL  0x07
+#define ZBEE_SEC_CONTROL_KEY    0x18
+#define ZBEE_SEC_CONTROL_NONCE  0x20
+
+/* ZigBee security levels. */
+#define ZBEE_SEC_NONE           0x00
+#define ZBEE_SEC_MIC32          0x01
+#define ZBEE_SEC_MIC64          0x02
+#define ZBEE_SEC_MIC128         0x03
+#define ZBEE_SEC_ENC            0x04
+#define ZBEE_SEC_ENC_MIC32      0x05
+#define ZBEE_SEC_ENC_MIC64      0x06
+#define ZBEE_SEC_ENC_MIC128     0x07
+
+/* ZigBee Key Types */
+#define ZBEE_SEC_KEY_LINK       0x00
+#define ZBEE_SEC_KEY_NWK        0x01
+#define ZBEE_SEC_KEY_TRANSPORT  0x02
+#define ZBEE_SEC_KEY_LOAD       0x03
+
+/* ZigBee Security Constants. */
+#define ZBEE_SEC_CONST_L            2
+#define ZBEE_SEC_CONST_NONCE_LEN    (ZBEE_SEC_CONST_BLOCKSIZE-ZBEE_SEC_CONST_L-1)
+#define ZBEE_SEC_CONST_KEYSIZE      16
+#define ZBEE_SEC_CONST_BLOCKSIZE    16
+
+/* CCM* Flags */
+#define ZBEE_SEC_CCM_FLAG_L             0x01    /* 3-bit encoding of (L-1). */
+#define ZBEE_SEC_CCM_FLAG_M(m)          ((((m-2)/2) & 0x7)<<3)  /* 3-bit encoding of (M-2)/2 shifted 3 bits. */
+#define ZBEE_SEC_CCM_FLAG_ADATA(l_a)    ((l_a>0)?0x40:0x00)     /* Adata flag. */
+
+/* Init routine for the Security dissectors. */
+extern void     zbee_security_register  (module_t *module, int proto);
+extern void     zbee_security_handoff   ();
+
+/* Security Dissector Routine. */
+extern tvbuff_t *dissect_zbee_secure(tvbuff_t *, packet_info *, proto_tree *, guint, guint64);
+
+#endif /* PACKET_ZBEE_SECURITY_H */