From ddf97cec572190da9a35f4e11e0e92a9d5b459bc Mon Sep 17 00:00:00 2001 From: saerome kim Date: Wed, 1 Feb 2017 08:31:47 +0900 Subject: [PATCH] Change D-bus object path '/org/tizen/zigbee/control' Problem : zigbee-test2 app. can not receive signals from zigbee-daemon Cause : signal path not match between app. and daemon Solution : change D-bus object path name Change-Id: Idf92c52b34de997013f6a36538c492ecc3e144dd Signed-off-by: saerome kim --- common/zb-common.h | 35 ---------------- lib/zbl-dbus.c | 100 ++++++++++++++++++++++----------------------- 2 files changed, 50 insertions(+), 85 deletions(-) diff --git a/common/zb-common.h b/common/zb-common.h index e33ff42..8370377 100644 --- a/common/zb-common.h +++ b/common/zb-common.h @@ -37,58 +37,23 @@ #define ZIGBEE_SERVICE_OBJECT_PATH "/org/tizen/zigbee/service" #define ZIGBEE_ZDO_DEV_CONTROL_INTERFACE "org.tizen.zigbee.zdo_dev_control" -#define ZIGBEE_ZDO_DEV_CONTROL_OBJECT_PATH "/org/tizen/zigbee/zdo_dev_control" - #define ZIGBEE_ZDO_BIND_INTERFACE "org.tizen.zigbee.zdo_bind" -#define ZIGBEE_ZDO_BIND_OBJECT_PATH "/org/tizen/zigbee/zdo_bind" - #define ZIGBEE_ZCL_GLOBAL_CONTROL_INTERFACE "org.tizen.zigbee.zcl_global_control" -#define ZIGBEE_ZCL_GLOBAL_CONTROL_OBJECT_PATH "/org/tizen/zigbee/zcl_global_control" - #define ZIGBEE_ZCL_ALARM_INTERFACE "org.tizen.zigbee.zcl_alarm" -#define ZIGBEE_ZCL_ALARM_OBJECT_PATH "/org/tizen/zigbee/zcl_alarm" - #define ZIGBEE_ZCL_BASIC_INTERFACE "org.tizen.zigbee.zcl_basic" -#define ZIGBEE_ZCL_BASIC_OBJECT_PATH "/org/tizen/zigbee/zcl_basic" - #define ZIGBEE_ZCL_COLOR_CONTROL_INTERFACE "org.tizen.zigbee.zcl_color_control" -#define ZIGBEE_ZCL_COLOR_CONTROL_OBJECT_PATH "/org/tizen/zigbee/zcl_color_control" - #define ZIGBEE_ZCL_ON_OFF_INTERFACE "org.tizen.zigbee.zcl_on_off" -#define ZIGBEE_ZCL_ON_OFF_OBJECT_PATH "/org/tizen/zigbee/zcl_on_off" - #define ZIGBEE_ZCL_DOOR_LOCK_INTERFACE "org.tizen.zigbee.zcl_door_lock" -#define ZIGBEE_ZCL_DOOR_LOCK_OBJECT_PATH "/org/tizen/zigbee/zcl_door_lock" - #define ZIGBEE_ZCL_GROUP_INTERFACE "org.tizen.zigbee.zcl_group" -#define ZIGBEE_ZCL_GROUP_OBJECT_PATH "/org/tizen/zigbee/zcl_group" - #define ZIGBEE_ZCL_FAN_CONTROL_INTERFACE "org.tizen.zigbee.zcl_fan_control" -#define ZIGBEE_ZCL_FAN_CONTROL_OBJECT_PATH "/org/tizen/zigbee/zcl_fan_control" - #define ZIGBEE_ZCL_IAS_ZONE_INTERFACE "org.tizen.zigbee.zcl_ias_zone" -#define ZIGBEE_ZCL_IAS_ZONE_OBJECT_PATH "/org/tizen/zigbee/zcl_ias_zone" - #define ZIGBEE_ZCL_IDENTIFY_INTERFACE "org.tizen.zigbee.zcl_identify" -#define ZIGBEE_ZCL_IDENTIFY_OBJECT_PATH "/org/tizen/zigbee/zcl_identify" - #define ZIGBEE_ZCL_LEVEL_CONTROL_INTERFACE "org.tizen.zigbee.zcl_level_control" -#define ZIGBEE_ZCL_LEVEL_CONTROL_OBJECT_PATH "/org/tizen/zigbee/zcl_level_control" - #define ZIGBEE_ZCL_POLL_CONTROL_INTERFACE "org.tizen.zigbee.zcl_poll_control" -#define ZIGBEE_ZCL_POLL_CONTROL_OBJECT_PATH "/org/tizen/zigbee/zcl_poll_control" - #define ZIGBEE_ZCL_SCENE_INTERFACE "org.tizen.zigbee.zcl_scene" -#define ZIGBEE_ZCL_SCENE_OBJECT_PATH "/org/tizen/zigbee/zcl_scene" - #define ZIGBEE_ZCL_THERMOSTAT_INTERFACE "org.tizen.zigbee.zcl_thermostat" -#define ZIGBEE_ZCL_THERMOSTAT_OBJECT_PATH "/org/tizen/zigbee/zcl_thermostat" - #define ZIGBEE_CUSTOM_INTERFACE "org.tizen.zigbee.custom" -#define ZIGBEE_CUSTOM_OBJECT_PATH "/org/tizen/zigbee/custom" - #define ZIGBEE_MFGLIB_CONTROL_INTERFACE "org.tizen.zigbee.mfglib_control" -#define ZIGBEE_MFGLIB_CONTROL_OBJECT_PATH "/org/tizen/zigbee/mfglib_control" #define ZIGBEE_BROADCAST_TIMEOUT (9.5 + 2) * 1000 /**< default timeout for gdbus */ diff --git a/lib/zbl-dbus.c b/lib/zbl-dbus.c index 3125cf7..9ee7022 100644 --- a/lib/zbl-dbus.c +++ b/lib/zbl-dbus.c @@ -1005,7 +1005,7 @@ static int _zbl_dbus_subscribe_signal(zigbee_h handle) /* Section 3. Subscribe ZCL global command */ id = g_dbus_connection_signal_subscribe(gdbus_conn, NULL, ZIGBEE_ZCL_GLOBAL_CONTROL_INTERFACE, "zcl_global_default_response", - ZIGBEE_ZCL_GLOBAL_CONTROL_OBJECT_PATH, NULL, G_DBUS_CALL_FLAGS_NONE, + ZIGBEE_CONTROL_OBJECT_PATH, NULL, G_DBUS_CALL_FLAGS_NONE, _zbl_signal_handler, handle, NULL); if (0 == id) { ERR("g_dbus_connection_signal_subscribe(zcl_global_default_response) Fail(%d)\n", errno); @@ -1017,7 +1017,7 @@ static int _zbl_dbus_subscribe_signal(zigbee_h handle) id = g_dbus_connection_signal_subscribe(gdbus_conn, NULL, ZIGBEE_ZCL_GLOBAL_CONTROL_INTERFACE, "report_attr_handler_rsp", - ZIGBEE_ZCL_GLOBAL_CONTROL_OBJECT_PATH, NULL, G_DBUS_CALL_FLAGS_NONE, + ZIGBEE_CONTROL_OBJECT_PATH, NULL, G_DBUS_CALL_FLAGS_NONE, _zbl_signal_handler, handle, NULL); if (0 == id) { ERR("g_dbus_connection_signal_subscribe(report_attr_handler_rsp) Fail(%d)\n", errno); @@ -1029,7 +1029,7 @@ static int _zbl_dbus_subscribe_signal(zigbee_h handle) /* Section 2. Subscribe ZCL alarm cluster signal */ id = g_dbus_connection_signal_subscribe(gdbus_conn, NULL, ZIGBEE_ZCL_ALARM_INTERFACE, - "alarm_count", ZIGBEE_ZCL_ALARM_OBJECT_PATH, NULL, + "alarm_count", ZIGBEE_CONTROL_OBJECT_PATH, NULL, G_DBUS_CALL_FLAGS_NONE, _zbl_signal_handler, handle, NULL); if (0 == id) { ERR("g_dbus_connection_signal_subscribe(alarm_count) Fail(%d)\n", errno); @@ -1041,7 +1041,7 @@ static int _zbl_dbus_subscribe_signal(zigbee_h handle) /* Section 3. Subscribe ZCL IAS cluster signal */ id = g_dbus_connection_signal_subscribe(gdbus_conn, NULL, ZIGBEE_ZCL_IAS_ZONE_INTERFACE, - "status_change_rsp", ZIGBEE_ZCL_IAS_ZONE_OBJECT_PATH, NULL, + "status_change_rsp", ZIGBEE_CONTROL_OBJECT_PATH, NULL, G_DBUS_CALL_FLAGS_NONE, _zbl_signal_handler, handle, NULL); if (0 == id) { ERR("g_dbus_connection_signal_subscribe(status_change_rsp) Fail(%d)\n", errno); @@ -1052,7 +1052,7 @@ static int _zbl_dbus_subscribe_signal(zigbee_h handle) DBG("subscribed for status_change_rsp signal %d", id); id = g_dbus_connection_signal_subscribe(gdbus_conn, NULL, ZIGBEE_ZCL_IAS_ZONE_INTERFACE, - "enroll_request", ZIGBEE_ZCL_IAS_ZONE_OBJECT_PATH, NULL, + "enroll_request", ZIGBEE_CONTROL_OBJECT_PATH, NULL, G_DBUS_CALL_FLAGS_NONE, _zbl_signal_handler, handle, NULL); if (0 == id) { ERR("g_dbus_connection_signal_subscribe(enroll_request) Fail(%d)\n", errno); @@ -3569,7 +3569,7 @@ int zbl_nwk_addr_req(zigbee_h handle, ieee_addr addr64, unsigned char request_ty to = zbl_dbus_get_timeout(zdo_dev_proxy); sub_id = g_dbus_connection_signal_subscribe((GDBusConnection*)gdbus_conn, NULL, ZIGBEE_ZDO_DEV_CONTROL_INTERFACE, "nwk_addr_rsp", - ZIGBEE_ZDO_DEV_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, + ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -3620,7 +3620,7 @@ int zbl_ieee_addr_req(zigbee_h handle, nwk_addr addr16, zb_zdo_addr_rsp cb, to = zbl_dbus_get_timeout(zdo_dev_proxy); sub_id = g_dbus_connection_signal_subscribe((GDBusConnection*)gdbus_conn, NULL, ZIGBEE_ZDO_DEV_CONTROL_INTERFACE, "nwk_addr_rsp", - ZIGBEE_ZDO_DEV_CONTROL_OBJECT_PATH, NULL, 0, + ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -3658,7 +3658,7 @@ int zbl_active_ep(zigbee_h handle, nwk_addr addr16, zb_zdo_active_ep_rsp cb, to = zbl_dbus_get_timeout(zdo_dev_proxy); sub_id = g_dbus_connection_signal_subscribe((GDBusConnection*)gdbus_conn, NULL, ZIGBEE_ZDO_DEV_CONTROL_INTERFACE, "active_ep_rsp", - ZIGBEE_ZDO_DEV_CONTROL_OBJECT_PATH, NULL, 0, + ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -3696,7 +3696,7 @@ int zbl_simple_desc_req(zigbee_h handle, nwk_addr addr16, unsigned char ep, to = zbl_dbus_get_timeout(zdo_dev_proxy); sub_id = g_dbus_connection_signal_subscribe((GDBusConnection*)gdbus_conn, NULL, ZIGBEE_ZDO_DEV_CONTROL_INTERFACE, "simple_desc_rsp", - ZIGBEE_ZDO_DEV_CONTROL_OBJECT_PATH, NULL, 0, + ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -3750,7 +3750,7 @@ int zbl_match_desc_req(zigbee_h handle, nwk_addr addr16, to = zbl_dbus_get_timeout(zdo_dev_proxy); sub_id = g_dbus_connection_signal_subscribe((GDBusConnection*)gdbus_conn, NULL, ZIGBEE_ZDO_DEV_CONTROL_INTERFACE, "matched_descriptor_rsp", - ZIGBEE_ZDO_DEV_CONTROL_OBJECT_PATH, NULL, 0, + ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -3802,7 +3802,7 @@ int zbl_node_desc_req(nwk_addr addr16, zb_zdo_node_desc_rsp cb, void *user_data) to = zbl_dbus_get_timeout(zdo_dev_proxy); sub_id = g_dbus_connection_signal_subscribe((GDBusConnection*)gdbus_conn, NULL, ZIGBEE_ZDO_DEV_CONTROL_INTERFACE, "node_desc_rsp", - ZIGBEE_ZDO_DEV_CONTROL_OBJECT_PATH, NULL, 0, + ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -3837,7 +3837,7 @@ int zbl_power_desc_req(nwk_addr addr16, zb_zdo_power_desc_rsp cb, void *user_dat to = zbl_dbus_get_timeout(zdo_dev_proxy); sub_id = g_dbus_connection_signal_subscribe((GDBusConnection*)gdbus_conn, NULL, ZIGBEE_ZDO_DEV_CONTROL_INTERFACE, "power_desc_rsp", - ZIGBEE_ZDO_DEV_CONTROL_OBJECT_PATH, NULL, 0, + ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -3872,7 +3872,7 @@ int zbl_complex_desc_req(nwk_addr addr16, zb_zdo_complex_desc_rsp cb, void *user to = zbl_dbus_get_timeout(zdo_dev_proxy); sub_id = g_dbus_connection_signal_subscribe((GDBusConnection*)gdbus_conn, NULL, ZIGBEE_ZDO_DEV_CONTROL_INTERFACE, "complex_desc_rsp", - ZIGBEE_ZDO_DEV_CONTROL_OBJECT_PATH, NULL, 0, + ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -3907,7 +3907,7 @@ int zbl_user_desc_req(nwk_addr addr16, zb_zdo_user_desc_rsp cb, void *user_data) to = zbl_dbus_get_timeout(zdo_dev_proxy); sub_id = g_dbus_connection_signal_subscribe((GDBusConnection*)gdbus_conn, NULL, ZIGBEE_ZDO_DEV_CONTROL_INTERFACE, "user_desc_rsp", - ZIGBEE_ZDO_DEV_CONTROL_OBJECT_PATH, NULL, 0, + ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -3952,7 +3952,7 @@ int zbl_user_desc_set(zigbee_h handle, nwk_addr addr16, unsigned char len, to = zbl_dbus_get_timeout(zdo_dev_proxy); sub_id = g_dbus_connection_signal_subscribe((GDBusConnection*)gdbus_conn, NULL, ZIGBEE_ZDO_DEV_CONTROL_INTERFACE, "user_desc_confirm", - ZIGBEE_ZDO_DEV_CONTROL_OBJECT_PATH, NULL, 0, + ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -4044,7 +4044,7 @@ int zbl_bind_req(nwk_addr dst_addr16, ieee_addr src_addr64, to = zbl_dbus_get_timeout(zdo_bind_proxy); sub_id = g_dbus_connection_signal_subscribe((GDBusConnection*)gdbus_conn, NULL, - ZIGBEE_ZDO_BIND_INTERFACE, "bind_rsp", ZIGBEE_ZDO_BIND_OBJECT_PATH, + ZIGBEE_ZDO_BIND_INTERFACE, "bind_rsp", ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { ERR("g_dbus_connection_signal_subscribe() Fail"); @@ -4117,7 +4117,7 @@ int zbl_unbind_req(nwk_addr dst_addr16, to = zbl_dbus_get_timeout(zdo_bind_proxy); sub_id = g_dbus_connection_signal_subscribe((GDBusConnection*)gdbus_conn, NULL, - ZIGBEE_ZDO_BIND_INTERFACE, "unbind_rsp", ZIGBEE_ZDO_BIND_OBJECT_PATH, + ZIGBEE_ZDO_BIND_INTERFACE, "unbind_rsp", ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { ERR("g_dbus_connection_signal_subscribe() Fail"); @@ -4186,7 +4186,7 @@ int zbl_mgmt_nwk_disc_req(nwk_addr addr16, unsigned int scan_channels, to = zbl_dbus_get_timeout(zdo_dev_proxy); sub_id = g_dbus_connection_signal_subscribe((GDBusConnection*)gdbus_conn, NULL, ZIGBEE_ZDO_DEV_CONTROL_INTERFACE, "nwk_disc_rsp", - ZIGBEE_ZDO_DEV_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, + ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -4253,7 +4253,7 @@ int zbl_mgmt_lqi_req(nwk_addr addr16, unsigned char start_idx, to = zbl_dbus_get_timeout(zdo_dev_proxy); sub_id = g_dbus_connection_signal_subscribe((GDBusConnection*)gdbus_conn, NULL, ZIGBEE_ZDO_DEV_CONTROL_INTERFACE, "mgmt_lqi_rsp", - ZIGBEE_ZDO_DEV_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, + ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -4292,7 +4292,7 @@ int zbl_mgmt_rtg_req(nwk_addr addr16, unsigned char start_idx, to = zbl_dbus_get_timeout(zdo_dev_proxy); sub_id = g_dbus_connection_signal_subscribe((GDBusConnection*)gdbus_conn, NULL, ZIGBEE_ZDO_DEV_CONTROL_INTERFACE, "mgmt_rtg_rsp", - ZIGBEE_ZDO_DEV_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, + ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -4331,7 +4331,7 @@ int zbl_mgmt_bind_req(nwk_addr addr16, unsigned char start_idx, to = zbl_dbus_get_timeout(zdo_dev_proxy); sub_id = g_dbus_connection_signal_subscribe((GDBusConnection*)gdbus_conn, NULL, ZIGBEE_ZDO_DEV_CONTROL_INTERFACE, "mgmt_bind_rsp", - ZIGBEE_ZDO_DEV_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, + ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -4371,7 +4371,7 @@ int zbl_mgmt_leave_device(ieee_addr addr64, unsigned char remove_children, to = zbl_dbus_get_timeout(zdo_dev_proxy); sub_id = g_dbus_connection_signal_subscribe((GDBusConnection*)gdbus_conn, NULL, ZIGBEE_ZDO_DEV_CONTROL_INTERFACE, "mgmt_leave_rsp", - ZIGBEE_ZDO_DEV_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, + ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -4420,7 +4420,7 @@ int zbl_mgmt_permit_joining_req(nwk_addr addr16, unsigned char duration, to = zbl_dbus_get_timeout(zdo_dev_proxy); sub_id = g_dbus_connection_signal_subscribe((GDBusConnection*)gdbus_conn, NULL, ZIGBEE_ZDO_DEV_CONTROL_INTERFACE, "mgmt_permit_join_rsp", - ZIGBEE_ZDO_DEV_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, + ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -4463,7 +4463,7 @@ int zbl_aps_send(nwk_addr addr16, unsigned char aps_frame_ctl, to = zbl_dbus_get_timeout(custom_gproxy); sub_id = g_dbus_connection_signal_subscribe((GDBusConnection*)gdbus_conn, NULL, - ZIGBEE_CUSTOM_INTERFACE, "aps_send_rsp", ZIGBEE_CUSTOM_OBJECT_PATH, NULL, 0, + ZIGBEE_CUSTOM_INTERFACE, "aps_send_rsp", ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -4514,7 +4514,7 @@ int zbl_zcl_send(nwk_addr addr16, unsigned char src_ep, unsigned char dst_ep, to = zbl_dbus_get_timeout(custom_gproxy); sub_id = g_dbus_connection_signal_subscribe((GDBusConnection*)gdbus_conn, NULL, - ZIGBEE_CUSTOM_INTERFACE, "zcl_send_rsp", ZIGBEE_CUSTOM_OBJECT_PATH, NULL, 0, + ZIGBEE_CUSTOM_INTERFACE, "zcl_send_rsp", ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -4562,7 +4562,7 @@ int zbl_send_to_local(unsigned short length, unsigned char *data, to = zbl_dbus_get_timeout(custom_gproxy); sub_id = g_dbus_connection_signal_subscribe((GDBusConnection*)gdbus_conn, NULL, - ZIGBEE_CUSTOM_INTERFACE, "send_to_local_rsp", ZIGBEE_CUSTOM_OBJECT_PATH, NULL, 0, + ZIGBEE_CUSTOM_INTERFACE, "send_to_local_rsp", ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -4619,8 +4619,8 @@ int zbl_read_attr_req(zigbee_h handle, unsigned short addr16, unsigned char dest to = zbl_dbus_get_timeout(zcl_global_proxy); sub_id = g_dbus_connection_signal_subscribe(gdbus_conn, NULL, ZIGBEE_ZCL_GLOBAL_CONTROL_INTERFACE, "read_attributes_rsp", - ZIGBEE_ZCL_GLOBAL_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, - container, _zbl_request_cleanup); + ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, + _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { ERR("g_dbus_connection_signal_subscribe() Fail"); @@ -4780,7 +4780,7 @@ int zbl_write_attr_req(zigbee_h handle, nwk_addr addr16, unsigned char src_ep, u to = zbl_dbus_get_timeout(zcl_global_proxy); sub_id = g_dbus_connection_signal_subscribe(gdbus_conn, NULL, ZIGBEE_ZCL_GLOBAL_CONTROL_INTERFACE, "write_attributes_rsp", - ZIGBEE_ZCL_GLOBAL_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, + ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -4945,7 +4945,7 @@ int zbl_wattr_undivided_req(zigbee_h handle, nwk_addr addr16, unsigned char src_ to = zbl_dbus_get_timeout(zcl_global_proxy); sub_id = g_dbus_connection_signal_subscribe(gdbus_conn, NULL, ZIGBEE_ZCL_GLOBAL_CONTROL_INTERFACE, "write_attributes_rsp", - ZIGBEE_ZCL_GLOBAL_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, + ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -5151,7 +5151,7 @@ int zbl_configure_reporting(zigbee_h handle, nwk_addr addr16, unsigned char src_ to = zbl_dbus_get_timeout(zcl_global_proxy); sub_id = g_dbus_connection_signal_subscribe(gdbus_conn, NULL, ZIGBEE_ZCL_GLOBAL_CONTROL_INTERFACE, "configure_reporting_rsp", - ZIGBEE_ZCL_GLOBAL_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, + ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -5258,7 +5258,7 @@ int zbl_read_configure_reporting(zigbee_h handle, nwk_addr addr16, unsigned char to = zbl_dbus_get_timeout(zcl_global_proxy); sub_id = g_dbus_connection_signal_subscribe(gdbus_conn, NULL, ZIGBEE_ZCL_GLOBAL_CONTROL_INTERFACE, "read_configure_reporting_rsp", - ZIGBEE_ZCL_GLOBAL_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, + ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -5366,7 +5366,7 @@ int zbl_discover_attr_req(zigbee_h handle, unsigned short addr16, unsigned char to = zbl_dbus_get_timeout(zcl_global_proxy); sub_id = g_dbus_connection_signal_subscribe(gdbus_conn, NULL, ZIGBEE_ZCL_GLOBAL_CONTROL_INTERFACE, "discover_attribute_rsp", - ZIGBEE_ZCL_GLOBAL_CONTROL_OBJECT_PATH, NULL, 0, + ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -5429,7 +5429,7 @@ int zbl_discover_cmds_gen(zigbee_h handle, nwk_addr addr16, unsigned char src_ep to = zbl_dbus_get_timeout(zcl_global_proxy); sub_id = g_dbus_connection_signal_subscribe(gdbus_conn, NULL, ZIGBEE_ZCL_GLOBAL_CONTROL_INTERFACE, "discover_commands_received_rsp", - ZIGBEE_ZCL_GLOBAL_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, + ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -5497,7 +5497,7 @@ int zbl_discover_cmds_recv(zigbee_h handle, nwk_addr addr16, unsigned char src_e to = zbl_dbus_get_timeout(zcl_global_proxy); sub_id = g_dbus_connection_signal_subscribe(gdbus_conn, NULL, ZIGBEE_ZCL_GLOBAL_CONTROL_INTERFACE, "discover_commands_received_rsp", - ZIGBEE_ZCL_GLOBAL_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, + ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -5571,7 +5571,7 @@ int zbl_discover_attr_ext(zigbee_h handle, nwk_addr addr16, unsigned char src_ep to = zbl_dbus_get_timeout(zcl_global_proxy); sub_id = g_dbus_connection_signal_subscribe(gdbus_conn, NULL, ZIGBEE_ZCL_GLOBAL_CONTROL_INTERFACE, "discover_attributes_extended_rsp", - ZIGBEE_ZCL_GLOBAL_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, + ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -5679,7 +5679,7 @@ int zbl_get_alarm(nwk_addr addr16, unsigned char ep, zb_zcl_alarm_get_alarm_rsp to = zbl_dbus_get_timeout(alarm_gproxy); sub_id = g_dbus_connection_signal_subscribe((GDBusConnection*)gdbus_conn, NULL, - ZIGBEE_ZCL_ALARM_INTERFACE, "get_alarm_rsp", ZIGBEE_ZCL_ALARM_OBJECT_PATH, + ZIGBEE_ZCL_ALARM_INTERFACE, "get_alarm_rsp", ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -6083,7 +6083,7 @@ int zbl_identify_query(nwk_addr addr16, unsigned char dst_ep, to = zbl_dbus_get_timeout(zcl_identify_proxy); sub_id = g_dbus_connection_signal_subscribe((GDBusConnection*)gdbus_conn, NULL, - ZIGBEE_ZCL_IDENTIFY_INTERFACE, "query_rsp", ZIGBEE_ZCL_IDENTIFY_OBJECT_PATH, + ZIGBEE_ZCL_IDENTIFY_INTERFACE, "query_rsp", ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -6125,7 +6125,7 @@ int zbl_add_group(nwk_addr addr16, unsigned char ep, unsigned short group_id, to = zbl_dbus_get_timeout(zcl_group_proxy); sub_id = g_dbus_connection_signal_subscribe((GDBusConnection*)gdbus_conn, NULL, - ZIGBEE_ZCL_GROUP_INTERFACE, "add_group_rsp", ZIGBEE_ZCL_GROUP_OBJECT_PATH, + ZIGBEE_ZCL_GROUP_INTERFACE, "add_group_rsp", ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -6172,7 +6172,7 @@ int zbl_view_group(nwk_addr addr16, unsigned char ep, unsigned short group_id, to = zbl_dbus_get_timeout(zcl_group_proxy); sub_id = g_dbus_connection_signal_subscribe((GDBusConnection*)gdbus_conn, NULL, - ZIGBEE_ZCL_GROUP_INTERFACE, "view_group_rsp", ZIGBEE_ZCL_GROUP_OBJECT_PATH, + ZIGBEE_ZCL_GROUP_INTERFACE, "view_group_rsp", ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -6216,7 +6216,7 @@ int zbl_group_get_group_membership(nwk_addr addr16, unsigned char ep, to = zbl_dbus_get_timeout(zcl_group_proxy); sub_id = g_dbus_connection_signal_subscribe((GDBusConnection*)gdbus_conn, NULL, ZIGBEE_ZCL_GROUP_INTERFACE, "get_group_membership_rsp", - ZIGBEE_ZCL_GROUP_OBJECT_PATH, NULL, 0, _zbl_response_cb, + ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -6262,7 +6262,7 @@ int zbl_remove_group(nwk_addr addr16, unsigned char ep, unsigned short group_id, to = zbl_dbus_get_timeout(zcl_group_proxy); sub_id = g_dbus_connection_signal_subscribe((GDBusConnection*)gdbus_conn, NULL, - ZIGBEE_ZCL_GROUP_INTERFACE, "remove_group_rsp", ZIGBEE_ZCL_GROUP_OBJECT_PATH, + ZIGBEE_ZCL_GROUP_INTERFACE, "remove_group_rsp", ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -6661,7 +6661,7 @@ int zbl_pollcontrol_set_long_poll_interval(nwk_addr addr16, unsigned char ep, to = zbl_dbus_get_timeout(zcl_poll_control_proxy); sub_id = g_dbus_connection_signal_subscribe((GDBusConnection*)gdbus_conn, NULL, ZIGBEE_ZCL_POLL_CONTROL_INTERFACE, "checkin_response", - ZIGBEE_ZCL_POLL_CONTROL_OBJECT_PATH, NULL, 0, + ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -6700,7 +6700,7 @@ int zbl_pollcontrol_set_short_poll_interval(nwk_addr addr16, unsigned char ep, to = zbl_dbus_get_timeout(zcl_poll_control_proxy); sub_id = g_dbus_connection_signal_subscribe((GDBusConnection*)gdbus_conn, NULL, ZIGBEE_ZCL_POLL_CONTROL_INTERFACE, "checkin_response", - ZIGBEE_ZCL_POLL_CONTROL_OBJECT_PATH, NULL, 0, + ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -6747,7 +6747,7 @@ int zbl_add_scene(nwk_addr addr16, unsigned char ep, unsigned short group_id, to = zbl_dbus_get_timeout(zcl_scene_proxy); sub_id = g_dbus_connection_signal_subscribe((GDBusConnection*)gdbus_conn, NULL, - ZIGBEE_ZCL_SCENE_INTERFACE, "add_scene_rsp", ZIGBEE_ZCL_SCENE_OBJECT_PATH, NULL, 0, + ZIGBEE_ZCL_SCENE_INTERFACE, "add_scene_rsp", ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -6804,7 +6804,7 @@ int zbl_view_scene(nwk_addr addr16, unsigned char ep, unsigned short group_id, to = zbl_dbus_get_timeout(zcl_scene_proxy); sub_id = g_dbus_connection_signal_subscribe((GDBusConnection*)gdbus_conn, NULL, - ZIGBEE_ZCL_SCENE_INTERFACE, "view_scene_rsp", ZIGBEE_ZCL_SCENE_OBJECT_PATH, NULL, 0, + ZIGBEE_ZCL_SCENE_INTERFACE, "view_scene_rsp", ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -6843,7 +6843,7 @@ int zbl_remove_scene(nwk_addr addr16, unsigned char ep, to = zbl_dbus_get_timeout(zcl_scene_proxy); sub_id = g_dbus_connection_signal_subscribe((GDBusConnection*)gdbus_conn, NULL, - ZIGBEE_ZCL_SCENE_INTERFACE, "remove_scene_rsp", ZIGBEE_ZCL_SCENE_OBJECT_PATH, + ZIGBEE_ZCL_SCENE_INTERFACE, "remove_scene_rsp", ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -6882,7 +6882,7 @@ int zbl_remove_all_scene(nwk_addr addr16, unsigned char ep, to = zbl_dbus_get_timeout(zcl_scene_proxy); sub_id = g_dbus_connection_signal_subscribe((GDBusConnection*)gdbus_conn, NULL, ZIGBEE_ZCL_SCENE_INTERFACE, "remove_all_scene_rsp", - ZIGBEE_ZCL_SCENE_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, + ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -6923,7 +6923,7 @@ int zbl_store_scene(nwk_addr addr16, unsigned char ep, unsigned short group_id, to = zbl_dbus_get_timeout(zcl_scene_proxy); sub_id = g_dbus_connection_signal_subscribe((GDBusConnection*)gdbus_conn, NULL, - ZIGBEE_ZCL_SCENE_INTERFACE, "store_scene_rsp", ZIGBEE_ZCL_SCENE_OBJECT_PATH, + ZIGBEE_ZCL_SCENE_INTERFACE, "store_scene_rsp", ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -6988,7 +6988,7 @@ int zbl_get_scene_membership(nwk_addr addr16, unsigned char ep, to = zbl_dbus_get_timeout(zcl_scene_proxy); sub_id = g_dbus_connection_signal_subscribe((GDBusConnection*)gdbus_conn, NULL, ZIGBEE_ZCL_SCENE_INTERFACE, "get_scene_membership_rsp", - ZIGBEE_ZCL_SCENE_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, + ZIGBEE_CONTROL_OBJECT_PATH, NULL, 0, _zbl_response_cb, container, _zbl_request_cleanup); if (0 == sub_id) { -- 2.34.1