Change signal / method name

 - nwk_disc_req -> mgnt_nwk_disc_req
 - nwk_disc_rsp -> mgmt_nwk_disc_rsp
 - mgmt_left_rsp -> mgmt_leave_rsp
 - nwk_update_req -> mgmt_nwk_update_req

Change-Id: I838e4f70d2bbc1a5eb1c61a0156dd1161bcba788
Signed-off-by: saerome.kim <saerome.kim@samsung.com>

diff --git a/common/include/zigbee_zdo_dev_control_type.h b/common/include/zigbee_zdo_dev_control_type.h
index 5fee273..be1e931 100644 (file)
--- a/common/include/zigbee_zdo_dev_control_type.h
+++ b/common/include/zigbee_zdo_dev_control_type.h
@@ -173,7 +173,7 @@ typedef struct {
        unsigned char scan_duration; /**< Scan duration */
        unsigned char scan_count; /**< Scan count */
        unsigned char network_update_id; /**< Network update ID */
-} ZigbeeZdoDevControlNwkUpdateReq_t;
+} ZigbeeZdoDevControlMgmtNwkUpdateReq_t;
 
 /**
  * @brief Definition for ZDO Dev control network discovery request structure.
@@ -185,7 +185,7 @@ typedef struct {
        unsigned char scan_duration; /**< Scan duration */
        unsigned short scan_count; /**< Scan count */
        unsigned char start_index; /**< Start index */
-} ZigbeeZdoDevControlNwkDiscoveryReq_t;
+} ZigbeeZdoDevControlMgmtNwkDiscoveryReq_t;
 
 /* -----------------------------------------------------------------------------
  * For Notifications
@@ -321,7 +321,7 @@ typedef struct {
        unsigned char beacon_order; /**< Beacon order */
        unsigned char superframe_order; /**< Superframe order */
        unsigned char permit_joining; /**< Permit joining flag */
-} ZigbeeZdoDevControlNwkDiscoveryEntry_t;
+} ZigbeeZdoDevControlMgmtNwkDiscoveryEntry_t;
 
 /**
  * @brief Definition for ZDO Dev control Network discovery response structure.
@@ -332,8 +332,8 @@ typedef struct {
        unsigned char network_count; /**< Total number of network */
        unsigned char start_index; /**< Start index */
        unsigned char table_list_count; /**< The number of network table entry */
-       ZigbeeZdoDevControlNwkDiscoveryEntry_t *table_list; /**< Network table list */
-} ZigbeeZdoDevControlNwkDiscoveryResp_t;
+       ZigbeeZdoDevControlMgmtNwkDiscoveryEntry_t *table_list; /**< Network table list */
+} ZigbeeZdoDevControlMgmtNwkDiscoveryResp_t;
 
 /**
  * @brief Definition for ZDO Dev control Management routing entry structure.

diff --git a/zigbee-daemon/zigbee-interface/introspection/zdo-dev-control.xml b/zigbee-daemon/zigbee-interface/introspection/zdo-dev-control.xml
index 00c0dd6..934c8cf 100644 (file)
--- a/zigbee-daemon/zigbee-interface/introspection/zdo-dev-control.xml
+++ b/zigbee-daemon/zigbee-interface/introspection/zdo-dev-control.xml
@@ -77,7 +77,7 @@
                        <arg type='y' name='tc_significance' direction='in'/>
                        <arg type='i' name='result' direction='out'/>
                </method>
-               <method name='nwk_update_req'>
+               <method name='mgmt_nwk_update_req'>
                        <arg type='q' name='nodeId' direction='in'/>
                        <arg type='u' name='scan_channel' direction='in'/>
                        <arg type='y' name='scan_duration' direction='in'/>
@@ -85,7 +85,7 @@
                        <arg type='y' name='nwkUpdateId' direction='in'/>
                        <arg type='i' name='result' direction='out'/>
                </method>
-               <method name='nwk_disc_req'>
+               <method name='mgmt_nwk_disc_req'>
                        <arg type='q' name='nwkaddr' direction='in'/>
                        <arg type='u' name='scan_channel' direction='in'/>
                        <arg type='y' name='scan_duration' direction='in'/>
@@ -147,7 +147,7 @@
                        <arg type='y' name='inc'/>
                        <arg type='a(ayayyqyyyyy)' name='response'/>
                </signal>
-               <signal name='nwk_disc_rsp'>
+               <signal name='mgmt_nwk_disc_rsp'>
                        <arg type='y' name='status'/>
                        <arg type='y' name='nwkCount'/>
                        <arg type='y' name='startIndex'/>
@@ -164,7 +164,7 @@
                <signal name='mgmt_permit_join_rsp'>
                        <arg type='y' name='status'/>
                </signal>
-               <signal name='mgmt_left_rsp'>
+               <signal name='mgmt_leave_rsp'>
                        <arg type='y' name='status'/>
                </signal>
                <signal name='node_desc_rsp'>

diff --git a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zdo_dev_control.c b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zdo_dev_control.c
index d3ebcd2..a18b6a9 100644 (file)
--- a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zdo_dev_control.c
+++ b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zdo_dev_control.c
@@ -1361,7 +1361,7 @@ static gboolean on_zdodev_control_mgmt_permit_join_req(ZigbeeZdo_dev_control *zd
        return TRUE;
 }
 
-static void on_zdodev_control_nwk_update_req_resp(ZigBeeServiceInterface *service_interface,
+static void on_zdodev_control_mgmt_nwk_update_req_resp(ZigBeeServiceInterface *service_interface,
        guint request_id, gpointer resp_data, guint resp_data_len, gpointer resp_cb_data)
 {
        ZigbeeServiceInterfaceRespCbData_t *cb_data =
@@ -1387,13 +1387,13 @@ static void on_zdodev_control_nwk_update_req_resp(ZigBeeServiceInterface *servic
        invocation = zigbee_service_dbus_interface_ref_invocation(cb_data);
        zblib_check_null_free_and_ret("invocation", invocation, cb_data);
 
-       zigbee_zdo_dev_control_complete_nwk_update_req(dev_control_object,
+       zigbee_zdo_dev_control_complete_mgmt_nwk_update_req(dev_control_object,
                invocation, payload->result);
 
        g_free(cb_data);
 }
 
-static gboolean on_zdodev_control_nwk_update_req(ZigbeeZdo_dev_control *zdodev_control_object,
+static gboolean on_zdodev_control_mgmt_nwk_update_req(ZigbeeZdo_dev_control *zdodev_control_object,
        GDBusMethodInvocation *invocation,
        gshort node_id,
        guint scan_channel,
@@ -1403,12 +1403,12 @@ static gboolean on_zdodev_control_nwk_update_req(ZigbeeZdo_dev_control *zdodev_c
        gpointer user_data)
 {
        ZigBeeServiceInterface *service_interface = (ZigBeeServiceInterface *)user_data;
-       ZigbeeZdoDevControlNwkUpdateReq_t req;
+       ZigbeeZdoDevControlMgmtNwkUpdateReq_t req;
        ZigbeeServiceInterfaceRespCbData_t *resp_cb_data = NULL;
 
        gboolean ret;
 
-       memset(&req, 0x0, sizeof(ZigbeeZdoDevControlNwkUpdateReq_t));
+       memset(&req, 0x0, sizeof(ZigbeeZdoDevControlMgmtNwkUpdateReq_t));
 
        /* Update request structure */
        req.node_id = node_id;
@@ -1433,9 +1433,9 @@ static gboolean on_zdodev_control_nwk_update_req(ZigbeeZdo_dev_control *zdodev_c
        /* Dispatch request */
        ret = zigbee_service_dbus_interface_dispatch_request(service_interface,
                ZBLIB_DRIVER_TYPE_ZDO_DEV_CONTROL,
-               ZBLIB_ZDO_DEV_CONTROL_OPS_NWK_UPDATE_REQ,
+               ZBLIB_ZDO_DEV_CONTROL_OPS_MGMT_NWK_UPDATE_REQ,
                &req, sizeof(req),
-               on_zdodev_control_nwk_update_req_resp, resp_cb_data);
+               on_zdodev_control_mgmt_nwk_update_req_resp, resp_cb_data);
        if (FALSE == ret) {
                Z_LOGE("zigbee_service_dbus_interface_dispatch_request failed!");
 
@@ -1451,7 +1451,7 @@ static gboolean on_zdodev_control_nwk_update_req(ZigbeeZdo_dev_control *zdodev_c
        return TRUE;
 }
 
-static void on_zdodev_control_nwk_disc_req_resp(ZigBeeServiceInterface *service_interface,
+static void on_zdodev_control_mgmt_nwk_disc_req_resp(ZigBeeServiceInterface *service_interface,
        guint request_id, gpointer resp_data, guint resp_data_len, gpointer resp_cb_data)
 {
        ZigbeeServiceInterfaceRespCbData_t *cb_data =
@@ -1477,13 +1477,13 @@ static void on_zdodev_control_nwk_disc_req_resp(ZigBeeServiceInterface *service_
        invocation = zigbee_service_dbus_interface_ref_invocation(cb_data);
        zblib_check_null_free_and_ret("invocation", invocation, cb_data);
 
-       zigbee_zdo_dev_control_complete_nwk_disc_req(dev_control_object,
+       zigbee_zdo_dev_control_complete_mgmt_nwk_disc_req(dev_control_object,
                invocation, payload->result);
 
        g_free(cb_data);
 }
 
-static gboolean on_zdodev_control_nwk_disc_req(ZigbeeZdo_dev_control *zdodev_control_object,
+static gboolean on_zdodev_control_mgmt_nwk_disc_req(ZigbeeZdo_dev_control *zdodev_control_object,
        GDBusMethodInvocation *invocation,
        gshort node_id,
        guint scan_channel,
@@ -1493,12 +1493,12 @@ static gboolean on_zdodev_control_nwk_disc_req(ZigbeeZdo_dev_control *zdodev_con
        gpointer user_data)
 {
        ZigBeeServiceInterface *service_interface = (ZigBeeServiceInterface *)user_data;
-       ZigbeeZdoDevControlNwkDiscoveryReq_t req;
+       ZigbeeZdoDevControlMgmtNwkDiscoveryReq_t req;
        ZigbeeServiceInterfaceRespCbData_t *resp_cb_data = NULL;
 
        gboolean ret;
 
-       memset(&req, 0x0, sizeof(ZigbeeZdoDevControlNwkDiscoveryReq_t));
+       memset(&req, 0x0, sizeof(ZigbeeZdoDevControlMgmtNwkDiscoveryReq_t));
 
        /* Update request structure */
        req.node_id = node_id;
@@ -1523,9 +1523,9 @@ static gboolean on_zdodev_control_nwk_disc_req(ZigbeeZdo_dev_control *zdodev_con
        /* Dispatch request */
        ret = zigbee_service_dbus_interface_dispatch_request(service_interface,
                ZBLIB_DRIVER_TYPE_ZDO_DEV_CONTROL,
-               ZBLIB_ZDO_DEV_CONTROL_OPS_NWK_DISC_REQ,
+               ZBLIB_ZDO_DEV_CONTROL_OPS_MGMT_NWK_DISC_REQ,
                &req, sizeof(req),
-               on_zdodev_control_nwk_disc_req_resp, resp_cb_data);
+               on_zdodev_control_mgmt_nwk_disc_req_resp, resp_cb_data);
        if (FALSE == ret) {
                Z_LOGE("zigbee_service_dbus_interface_dispatch_request failed!");
 
@@ -1817,17 +1817,17 @@ void zigbee_service_dbus_interface_zdo_dev_control_notification(ZigBeeServiceInt
                        resp_t->status);
        break;
        }
-       case ZBLIB_ZDO_DEV_CONTROL_NOTI_MGMT_LEFT_RSP: {
+       case ZBLIB_ZDO_DEV_CONTROL_NOTI_MGMT_LEAVE_RSP: {
                ZigbeeZdoDevControlMgmtLeftResp_t *resp_t =
                        (ZigbeeZdoDevControlMgmtLeftResp_t *)noti_data;
 
-               zigbee_zdo_dev_control_emit_mgmt_left_rsp(dev_control_object,
+               zigbee_zdo_dev_control_emit_mgmt_leave_rsp(dev_control_object,
                        resp_t->status);
        break;
        }
-       case ZBLIB_ZDO_DEV_CONTROL_NOTI_NWK_DISC_RSP: {
-               ZigbeeZdoDevControlNwkDiscoveryResp_t *nwk_disc_t =
-                       (ZigbeeZdoDevControlNwkDiscoveryResp_t *)noti_data;
+       case ZBLIB_ZDO_DEV_CONTROL_NOTI_MGMT_NWK_DISC_RSP: {
+               ZigbeeZdoDevControlMgmtNwkDiscoveryResp_t *nwk_disc_t =
+                       (ZigbeeZdoDevControlMgmtNwkDiscoveryResp_t *)noti_data;
                int i = 0;
                int v = 0;
 
@@ -1867,7 +1867,7 @@ void zigbee_service_dbus_interface_zdo_dev_control_notification(ZigBeeServiceInt
                v_entries = g_variant_builder_end(entry_builder);
 
                Z_LOGD("Network discovery rsp : [0x%X]", nwk_disc_t->status);
-               zigbee_zdo_dev_control_emit_nwk_disc_rsp(dev_control_object,
+               zigbee_zdo_dev_control_emit_mgmt_nwk_disc_rsp(dev_control_object,
                        nwk_disc_t->status, nwk_disc_t->network_count,
                        nwk_disc_t->start_index, nwk_disc_t->table_list_count,
                        v_entries);
@@ -2029,12 +2029,12 @@ gboolean zigbee_service_dbus_interface_zdo_dev_control_init(ZigBeeServiceInterfa
                G_CALLBACK(on_zdodev_control_mgmt_permit_join_req), service_interface);
 
        g_signal_connect(zdodev_control_object,
-               "handle-nwk-update-req",
-               G_CALLBACK(on_zdodev_control_nwk_update_req), service_interface);
+               "handle-mgmt-nwk-update-req",
+               G_CALLBACK(on_zdodev_control_mgmt_nwk_update_req), service_interface);
 
        g_signal_connect(zdodev_control_object,
-               "handle-nwk-disc-req",
-               G_CALLBACK(on_zdodev_control_nwk_disc_req), service_interface);
+               "handle-mgmt-nwk-disc-req",
+               G_CALLBACK(on_zdodev_control_mgmt_nwk_disc_req), service_interface);
 
        return TRUE;
 }

diff --git a/zigbee-daemon/zigbee-lib/include/zblib_driver_zdo_dev_control.h b/zigbee-daemon/zigbee-lib/include/zblib_driver_zdo_dev_control.h
index c26eaff..ddd656b 100644 (file)
--- a/zigbee-daemon/zigbee-lib/include/zblib_driver_zdo_dev_control.h
+++ b/zigbee-daemon/zigbee-lib/include/zblib_driver_zdo_dev_control.h
@@ -36,8 +36,8 @@ typedef struct {
        gboolean (*mgmt_rtg_req)(ZigBeeDriver *driver, guint request_id);
        gboolean (*mgmt_bind_req)(ZigBeeDriver *driver, guint request_id);
        gboolean (*mgmt_permit_join_req)(ZigBeeDriver *driver, guint request_id);
-       gboolean (*nwk_update_req)(ZigBeeDriver *driver, guint request_id);
-       gboolean (*nwk_disc_req)(ZigBeeDriver *driver, guint request_id);
+       gboolean (*mgmt_nwk_update_req)(ZigBeeDriver *driver, guint request_id);
+       gboolean (*mgmt_nwk_disc_req)(ZigBeeDriver *driver, guint request_id);
 } ZblibDriverZdoDevControlOps_t;
 
 /**< ZigBee 'ZDO Dev control' ops IDs */
@@ -55,10 +55,10 @@ typedef enum {
        ZBLIB_ZDO_DEV_CONTROL_OPS_SIMPLE_DESC_REQ, /**< Simple desc req */
        ZBLIB_ZDO_DEV_CONTROL_OPS_MGMT_LQI_REQ, /**< Mgmt lqi req */
        ZBLIB_ZDO_DEV_CONTROL_OPS_MGMT_RTG_REQ, /**< Mgmt rtg req */
-       ZBLIB_ZDO_DEV_CONTROL_OPS_MGMT_BIND_REQ, /**< mgmt bind req */
-       ZBLIB_ZDO_DEV_CONTROL_OPS_MGMT_PERMIT_JOIN_REQ, /**< mgmt permit join req */
-       ZBLIB_ZDO_DEV_CONTROL_OPS_NWK_UPDATE_REQ, /**< Nwk update req */
-       ZBLIB_ZDO_DEV_CONTROL_OPS_NWK_DISC_REQ, /**< Nwk disc req */
+       ZBLIB_ZDO_DEV_CONTROL_OPS_MGMT_BIND_REQ, /**< Mgmt bind req */
+       ZBLIB_ZDO_DEV_CONTROL_OPS_MGMT_PERMIT_JOIN_REQ, /**< Mgmt permit join req */
+       ZBLIB_ZDO_DEV_CONTROL_OPS_MGMT_NWK_UPDATE_REQ, /**< Mgmth nwk update req */
+       ZBLIB_ZDO_DEV_CONTROL_OPS_MGMT_NWK_DISC_REQ, /**< Mgmt nwk disc req */
 } ZblibZdoDevControlOps_e;
 
 /**< ZigBee 'ZDO Dev control' notification IDs */
@@ -72,8 +72,8 @@ typedef enum {
        ZBLIB_ZDO_DEV_CONTROL_NOTI_MGMT_LQI_RSP, /**< Management LQI response */
        ZBLIB_ZDO_DEV_CONTROL_NOTI_MGMT_RTG_RSP, /**< Management rtg response */
        ZBLIB_ZDO_DEV_CONTROL_NOTI_MGMT_PERMIT_JOIN_RSP, /**< Management permit joining response */
-       ZBLIB_ZDO_DEV_CONTROL_NOTI_MGMT_LEFT_RSP, /**< Management left response */
-       ZBLIB_ZDO_DEV_CONTROL_NOTI_NWK_DISC_RSP, /**< Network discovery response */
+       ZBLIB_ZDO_DEV_CONTROL_NOTI_MGMT_LEAVE_RSP, /**< Management leave response */
+       ZBLIB_ZDO_DEV_CONTROL_NOTI_MGMT_NWK_DISC_RSP, /**< Network discovery response */
        ZBLIB_ZDO_DEV_CONTROL_NOTI_NODE_DESC_RSP, /**< Node descriptor response */
        ZBLIB_ZDO_DEV_CONTROL_NOTI_POWER_DESC_RSP, /**< Power descriptor response */
        ZBLIB_ZDO_DEV_CONTROL_NOTI_COMPLEX_DESC_RSP, /**< Complex descriptor response */

diff --git a/zigbee-daemon/zigbee-lib/src/drivers/zblib_driver_zdo_dev_control.c b/zigbee-daemon/zigbee-lib/src/drivers/zblib_driver_zdo_dev_control.c
index a38eba3..93e56c9 100644 (file)
--- a/zigbee-daemon/zigbee-lib/src/drivers/zblib_driver_zdo_dev_control.c
+++ b/zigbee-daemon/zigbee-lib/src/drivers/zblib_driver_zdo_dev_control.c
@@ -175,19 +175,19 @@ static gboolean __zblib_driver_zdo_dev_control_dispatcher(ZigBeeDriver *driver,
        }
        break;
 
-       case ZBLIB_ZDO_DEV_CONTROL_OPS_NWK_UPDATE_REQ: {
-               zblib_check_null_ret_error("ops->nwk_update_req",
-                       ops->nwk_update_req, FALSE);
+       case ZBLIB_ZDO_DEV_CONTROL_OPS_MGMT_NWK_UPDATE_REQ: {
+               zblib_check_null_ret_error("ops->mgmt_nwk_update_req",
+                       ops->mgmt_nwk_update_req, FALSE);
 
-               ret = ops->nwk_update_req(driver, request_id);
+               ret = ops->mgmt_nwk_update_req(driver, request_id);
        }
        break;
 
-       case ZBLIB_ZDO_DEV_CONTROL_OPS_NWK_DISC_REQ: {
-               zblib_check_null_ret_error("ops->nwk_disc_req",
-                       ops->nwk_disc_req, FALSE);
+       case ZBLIB_ZDO_DEV_CONTROL_OPS_MGMT_NWK_DISC_REQ: {
+               zblib_check_null_ret_error("ops->mgmt_nwk_disc_req",
+                       ops->mgmt_nwk_disc_req, FALSE);
 
-               ret = ops->nwk_disc_req(driver, request_id);
+               ret = ops->mgmt_nwk_disc_req(driver, request_id);
        }
        break;
 

diff --git a/zigbee-daemon/zigbee-lib/src/zblib_request.c b/zigbee-daemon/zigbee-lib/src/zblib_request.c
index 3bf18fc..a43f636 100644 (file)
--- a/zigbee-daemon/zigbee-lib/src/zblib_request.c
+++ b/zigbee-daemon/zigbee-lib/src/zblib_request.c
@@ -2838,15 +2838,15 @@ static gpointer __zblib_request_create_zdo_dev_control_request_data(guint reques
        }
        break;
 
-       case ZBLIB_ZDO_DEV_CONTROL_OPS_NWK_UPDATE_REQ: {
-               ZigbeeZdoDevControlNwkUpdateReq_t *in_req;
-               ZigbeeZdoDevControlNwkUpdateReq_t *req = NULL;
+       case ZBLIB_ZDO_DEV_CONTROL_OPS_MGMT_NWK_UPDATE_REQ: {
+               ZigbeeZdoDevControlMgmtNwkUpdateReq_t *in_req;
+               ZigbeeZdoDevControlMgmtNwkUpdateReq_t *req = NULL;
 
-               in_req = (ZigbeeZdoDevControlNwkUpdateReq_t *)request_data;
+               in_req = (ZigbeeZdoDevControlMgmtNwkUpdateReq_t *)request_data;
                if (NULL != in_req) {
                        /* Allocate memory */
-                       req = (ZigbeeZdoDevControlNwkUpdateReq_t *)
-                               g_malloc0(sizeof(ZigbeeZdoDevControlNwkUpdateReq_t));
+                       req = (ZigbeeZdoDevControlMgmtNwkUpdateReq_t *)
+                               g_malloc0(sizeof(ZigbeeZdoDevControlMgmtNwkUpdateReq_t));
 
                        /* Copy data */
                        req->node_id = in_req->node_id;
@@ -2860,15 +2860,15 @@ static gpointer __zblib_request_create_zdo_dev_control_request_data(guint reques
        }
        break;
 
-       case ZBLIB_ZDO_DEV_CONTROL_OPS_NWK_DISC_REQ: {
-               ZigbeeZdoDevControlNwkDiscoveryReq_t *in_req;
-               ZigbeeZdoDevControlNwkDiscoveryReq_t *req = NULL;
+       case ZBLIB_ZDO_DEV_CONTROL_OPS_MGMT_NWK_DISC_REQ: {
+               ZigbeeZdoDevControlMgmtNwkDiscoveryReq_t *in_req;
+               ZigbeeZdoDevControlMgmtNwkDiscoveryReq_t *req = NULL;
 
-               in_req = (ZigbeeZdoDevControlNwkDiscoveryReq_t *)request_data;
+               in_req = (ZigbeeZdoDevControlMgmtNwkDiscoveryReq_t *)request_data;
                if (NULL != in_req) {
                        /* Allocate memory */
-                       req = (ZigbeeZdoDevControlNwkDiscoveryReq_t *)
-                               g_malloc0(sizeof(ZigbeeZdoDevControlNwkDiscoveryReq_t));
+                       req = (ZigbeeZdoDevControlMgmtNwkDiscoveryReq_t *)
+                               g_malloc0(sizeof(ZigbeeZdoDevControlMgmtNwkDiscoveryReq_t));
 
                        /* Copy data */
                        req->node_id = in_req->node_id;
@@ -4496,20 +4496,20 @@ static void __zblib_request_free_zdo_dev_control_request_data(ZigBeeRequest *req
        }
        break;
 
-       case ZBLIB_ZDO_DEV_CONTROL_OPS_NWK_UPDATE_REQ: {
-               ZigbeeZdoDevControlNwkUpdateReq_t *req = NULL;
+       case ZBLIB_ZDO_DEV_CONTROL_OPS_MGMT_NWK_UPDATE_REQ: {
+               ZigbeeZdoDevControlMgmtNwkUpdateReq_t *req = NULL;
 
-               req = (ZigbeeZdoDevControlNwkUpdateReq_t *)request->request_data;
+               req = (ZigbeeZdoDevControlMgmtNwkUpdateReq_t *)request->request_data;
                if (NULL != req) {
                        g_free(req);
                }
        }
        break;
 
-       case ZBLIB_ZDO_DEV_CONTROL_OPS_NWK_DISC_REQ: {
-               ZigbeeZdoDevControlNwkDiscoveryReq_t *req = NULL;
+       case ZBLIB_ZDO_DEV_CONTROL_OPS_MGMT_NWK_DISC_REQ: {
+               ZigbeeZdoDevControlMgmtNwkDiscoveryReq_t *req = NULL;
 
-               req = (ZigbeeZdoDevControlNwkDiscoveryReq_t *)request->request_data;
+               req = (ZigbeeZdoDevControlMgmtNwkDiscoveryReq_t *)request->request_data;
                if (NULL != req) {
                        g_free(req);
                }