From Fabio Tarabelloni via

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8718

Move zbee-on-off to zbee-general in preparation to avoid an enormous number of
small files when adding dissection for more zbee cluster types.

svn path=/trunk/; revision=50078

4 files changed, 36 insertions, 14 deletions

diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index 39b38c7c72..7bd0cc2a8e 100644
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -1297,9 +1297,9 @@ set(DISSECTOR_SRC
 	dissectors/packet-zbee-nwk.c
 	dissectors/packet-zbee-security.c
 	dissectors/packet-zbee-zcl.c
-	dissectors/packet-zbee-zcl-on-off.c
 	dissectors/packet-zbee-zdp-binding.c
 	dissectors/packet-zbee-zdp-discovery.c
+	dissectors/packet-zbee-zcl-general.c
 	dissectors/packet-zbee-zdp-management.c
 	dissectors/packet-zbee-zdp.c
 	dissectors/packet-zebra.c
diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common
index 1e74187058..b61864befa 100644
--- a/epan/dissectors/Makefile.common
+++ b/epan/dissectors/Makefile.common
@@ -1219,9 +1219,9 @@ DISSECTOR_SRC = \
 	packet-zbee-nwk.c	\
 	packet-zbee-security.c	\
 	packet-zbee-zcl.c	\
-	packet-zbee-zcl-on-off.c	\
 	packet-zbee-zdp-binding.c	\
 	packet-zbee-zdp-discovery.c	\
+	packet-zbee-zcl-general.c	\
 	packet-zbee-zdp-management.c	\
 	packet-zbee-zdp.c	\
 	packet-zebra.c		\
diff --git a/epan/dissectors/packet-zbee-zcl-on-off.c b/epan/dissectors/packet-zbee-zcl-general.c
index 67bb8b8183..3a5334155c 100644
--- a/epan/dissectors/packet-zbee-zcl-on-off.c
+++ b/epan/dissectors/packet-zbee-zcl-general.c
@@ -1,7 +1,8 @@
-/* packet-zbee-zcl-on-off.c
- * Dissector routines for the ZigBee ZCL On Off cluster
+/* packet-zbee-zcl-general.c
+ * Dissector routines for the ZigBee ZCL General clusters like
+ * Basic, Identify, OnOff ...
  * By Fabio Tarabelloni <fabio.tarabelloni@reloc.it>
- * Copyright 2012 RELOC s.r.l.
+ * Copyright 2013 RELOC s.r.l.
  *
  * $Id$
  *
@@ -24,7 +25,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-
 /*  Include Files */
 #include "config.h"
 
@@ -36,6 +36,10 @@
 #include "packet-zbee-aps.h"
 #include "packet-zbee-zcl.h"
 
+/* ########################################################################## */
+/* #### (0x0006) ON/OFF CLUSTER ############################################# */
+/* ########################################################################## */
+
 /*************************/
 /* Defines               */
 /*************************/
@@ -60,9 +64,9 @@ void proto_reg_handoff_zbee_zcl_on_off(void);
 static void dissect_zcl_on_off_attr_id       (proto_tree *tree, tvbuff_t *tvb, guint *offset, guint16 attr_id);
 static void dissect_zcl_on_off_attr_data     (proto_tree *tree, tvbuff_t *tvb, guint *offset, guint16 attr_id, guint data_type);
 
-/********************
- * Global Variables *
- ********************/
+/*************************/
+/* Global Variables      */
+/*************************/
 
 /* Initialize the protocol and registered fields */
 static int proto_zbee_zcl_on_off = -1;
@@ -95,6 +99,10 @@ static const value_string zbee_zcl_on_off_onoff_names[] = {
     { 0, NULL }
 };
 
+/*************************/
+/* Function Bodies       */
+/*************************/
+
 /*FUNCTION:------------------------------------------------------
  *  NAME
  *      dissect_zbee_zcl_onoff
@@ -121,7 +129,7 @@ dissect_zbee_zcl_on_off(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
             /* Add the command ID. */
             proto_tree_add_item(tree, hf_zbee_zcl_on_off_srv_rx_cmd_id, tvb, offset, sizeof(guint8), cmd_id);
         }
-        /*offset += (int)sizeof(guint8);*/
+        offset += (int)sizeof(guint8);
 
         /* Append the command name to the info column. */
         col_append_fstr(pinfo->cinfo, COL_INFO, "%s, Seq: %u",
@@ -134,7 +142,14 @@ dissect_zbee_zcl_on_off(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
  *  NAME
  *      dissect_zcl_on_off_attr_id
  *  DESCRIPTION
+ *      this function is called by ZCL foundation dissector in order to decode
+ *      specific cluster attributes identifier.
  *  PARAMETERS
+ *      proto_tree *tree    - pointer to data tree Wireshark uses to display packet.
+ *      tvbuff_t *tvb       - pointer to buffer containing raw packet.
+ *      guint *offset       - pointer to buffer offset
+ *      guint16 attr_id     - attribute identifier
+ *
  *  RETURNS
  *      none
  *---------------------------------------------------------------
@@ -150,7 +165,14 @@ dissect_zcl_on_off_attr_id(proto_tree *tree, tvbuff_t *tvb, guint *offset, guint
  *  NAME
  *      dissect_zcl_on_off_attr_data
  *  DESCRIPTION
+ *      this function is called by ZCL foundation dissector in order to decode
+ *      specific cluster attributes data.
  *  PARAMETERS
+ *      proto_tree *tree    - pointer to data tree Wireshark uses to display packet.
+ *      tvbuff_t *tvb       - pointer to buffer containing raw packet.
+ *      guint *offset       - pointer to buffer offset
+ *      guint16 attr_id     - attribute identifier
+ *      guint data_type     - attribute data type
  *  RETURNS
  *      none
  *---------------------------------------------------------------
@@ -191,15 +213,15 @@ proto_register_zbee_zcl_on_off(void)
     static hf_register_info hf[] = {
 
         { &hf_zbee_zcl_on_off_attr_id,
-            { "Attribute", "zbee.zcl.on_off.attr.id", FT_UINT16, BASE_HEX, VALS(zbee_zcl_on_off_attr_names),
+            { "Attribute", "zbee_zcl_general.onoff.attr_id", FT_UINT16, BASE_HEX, VALS(zbee_zcl_on_off_attr_names),
             0x00, NULL, HFILL } },
 
         { &hf_zbee_zcl_on_off_attr_onoff,
-            { "Data Value", "zbee.zcl.on_off.attr.onoff", FT_UINT8, BASE_HEX, VALS(zbee_zcl_on_off_onoff_names),
+            { "Data Value", "zbee_zcl_general.onoff.attr.onoff", FT_UINT8, BASE_HEX, VALS(zbee_zcl_on_off_onoff_names),
             0x00, NULL, HFILL } },
 
         { &hf_zbee_zcl_on_off_srv_rx_cmd_id,
-            { "Command", "zbee.zcl.on_off.srv_rx.cmd.id", FT_UINT8, BASE_HEX, VALS(zbee_zcl_on_off_srv_rx_cmd_names),
+            { "Command", "zbee_zcl_general.onoff.cmd.srv_rx.id", FT_UINT8, BASE_HEX, VALS(zbee_zcl_on_off_srv_rx_cmd_names),
             0x00, NULL, HFILL } }
 
     };
diff --git a/epan/dissectors/packet-zbee.h b/epan/dissectors/packet-zbee.h
index e8e7c15c72..59a75c9917 100644
--- a/epan/dissectors/packet-zbee.h
+++ b/epan/dissectors/packet-zbee.h
@@ -787,7 +787,7 @@
 #define ZBEE_PROTOABBREV_APS                "zbee_aps"
 #define ZBEE_PROTOABBREV_APF                "zbee_apf"
 #define ZBEE_PROTOABBREV_ZCL                "zbee_zcl"
-#define ZBEE_PROTOABBREV_ZCL_ONOFF          "zbee_zcl_onoff"
+#define ZBEE_PROTOABBREV_ZCL_ONOFF          "zbee_zcl_general.onoff"
 
 /* Helper Functions */
 extern guint zbee_get_bit_field(guint input, guint mask);