Adding service interface layer logic for request processing

[platform/core/connectivity/zigbee-manager.git] / zigbee-daemon / zigbee-lib / src / zblib_request.c

diff --git a/zigbee-daemon/zigbee-lib/src/zblib_request.c b/zigbee-daemon/zigbee-lib/src/zblib_request.c
index 06e6592..5da7d22 100644 (file)
--- a/zigbee-daemon/zigbee-lib/src/zblib_request.c
+++ b/zigbee-daemon/zigbee-lib/src/zblib_request.c
@@ -216,7 +216,6 @@ static gpointer __zblib_request_create_alarm_request_data(guint request_type,
 
                        /* Copy data */
                        memcpy(req->eui64, in_req->eui64, ZIGBEE_EUI64_SIZE);
-                       req->node_id = in_req->node_id;
                        req->endpoint = in_req->endpoint;
                        req->alarm_code = in_req->alarm_code;
                        req->cluster_id = in_req->cluster_id;
@@ -280,12 +279,12 @@ static gpointer __zblib_request_create_custom_request_data(guint request_type,
 
                        /* Copy data */
                        req->node_id = in_req->node_id;
-                       req->aps_frame_ctl = in_req->aps_frame_ctl;
+                       req->aps_frame_ctrl = in_req->aps_frame_ctrl;
                        req->src_ep = in_req->src_ep;
                        req->dest_ep = in_req->dest_ep;
                        req->cluster_id = in_req->cluster_id;
                        req->profile_id = in_req->profile_id;
-                       req->zcl_frame_ctl = in_req->zcl_frame_ctl;
+                       req->zcl_frame_ctrl = in_req->zcl_frame_ctrl;
                        req->mfg_code = in_req->mfg_code;
                        memcpy(req->payload,
                                in_req->payload, ZIGBEE_CUSTOM_SEND_PAYLOAD_LEN);
@@ -310,7 +309,7 @@ static gpointer __zblib_request_create_custom_request_data(guint request_type,
                        req->src_ep = in_req->src_ep;
                        req->dest_ep = in_req->dest_ep;
                        req->cluster_id = in_req->cluster_id;
-                       req->zcl_frame_ctl = in_req->zcl_frame_ctl;
+                       req->zcl_frame_ctrl = in_req->zcl_frame_ctrl;
                        req->cmd_id = in_req->cmd_id;
                        memcpy(req->payload,
                                in_req->payload, ZIGBEE_CUSTOM_SEND_PAYLOAD_LEN);
@@ -647,14 +646,14 @@ static gpointer __zblib_request_create_level_control_request_data(guint request_
        break;
 
        case ZBLIB_LEVEL_CONTROL_OPS_MOVE_WITH_ON_OFF: {
-               ZigbeeLevelControlMoveOnOff_t *in_req;
-               ZigbeeLevelControlMoveOnOff_t *req = NULL;
+               ZigbeeLevelControlMoveWithOnOff_t *in_req;
+               ZigbeeLevelControlMoveWithOnOff_t *req = NULL;
 
-               in_req = (ZigbeeLevelControlMoveOnOff_t *)request_data;
+               in_req = (ZigbeeLevelControlMoveWithOnOff_t *)request_data;
                if (in_req) {
                        /* Allocate memory */
-                       req = (ZigbeeLevelControlMoveOnOff_t *)
-                               g_malloc0(sizeof(ZigbeeLevelControlMoveOnOff_t));
+                       req = (ZigbeeLevelControlMoveWithOnOff_t *)
+                               g_malloc0(sizeof(ZigbeeLevelControlMoveWithOnOff_t));
 
                        /* Copy data */
                        req->node_id = in_req->node_id;
@@ -3330,9 +3329,9 @@ static void __zblib_request_free_level_control_request_data(ZigBeeRequest *reque
        break;
 
        case ZBLIB_LEVEL_CONTROL_OPS_MOVE_WITH_ON_OFF: {
-               ZigbeeLevelControlMoveOnOff_t *req = NULL;
+               ZigbeeLevelControlMoveWithOnOff_t *req = NULL;
 
-               req = (ZigbeeLevelControlMoveOnOff_t *)request->request_data;
+               req = (ZigbeeLevelControlMoveWithOnOff_t *)request->request_data;
                if (NULL != req) {
                        g_free(req);
                }
@@ -4673,6 +4672,7 @@ gint zblib_request_new(ZigBeeServiceInterface *service_interface,
                Z_LOGE("zblib_service_genrate_request_id failed!");
 
                /* Free resources */
+               __zblib_request_free_request_data(request);
                g_free(request);
 
                return ZIGBEE_REQUEST_INVALID_REQUEST_ID;
@@ -4684,6 +4684,7 @@ gint zblib_request_new(ZigBeeServiceInterface *service_interface,
                Z_LOGE("zblib_service_ref_request_hash_table failed!");
 
                /* Free resources */
+               __zblib_request_free_request_data(request);
                g_free(request);
 
                return ZIGBEE_REQUEST_INVALID_REQUEST_ID;