From 6bafb728bdcb2b6fb7f351f0c9a34209e1c6d355 Mon Sep 17 00:00:00 2001 From: saerome kim Date: Wed, 11 Jan 2017 17:50:08 +0900 Subject: [PATCH] Update DBus interface name Change-Id: I4082b6f4570e46e2c69136709982cfd3d0b7ae87 Signed-off-by: saerome kim --- common/zb-common.h | 76 +++++++++--- lib/zbl-dbus.c | 304 ++++++++++++++++++++++++++------------------- 2 files changed, 231 insertions(+), 149 deletions(-) diff --git a/common/zb-common.h b/common/zb-common.h index fb9c046..846c641 100644 --- a/common/zb-common.h +++ b/common/zb-common.h @@ -33,25 +33,63 @@ #define ZIGBEE_SERVER_NAME "org.tizen.zigbee" #define ZIGBEE_OBJECT_PATH "/org/tizen/zigbee" -#define ZIGBEE_SERVICE_INTERFACE "org.tizen.zigbee_service" -#define ZIGBEE_ON_OFF_INTERFACE "org.tizen.zigbee_on_off" -#define ZIGBEE_DOOR_LOCK_INTERFACE "org.tizen.zigbee_door_lock" -#define ZIGBEE_THERMOSTAT_INTERFACE "org.tizen.zigbee_thermostat" -#define ZIGBEE_LEVEL_CONTROL_INTERFACE "org.tizen.zigbee_level_control" -#define ZIGBEE_ALARM_INTERFACE "org.tizen.zigbee_alarm" -#define ZIGBEE_FAN_CONTROL_INTERFACE "org.tizen.zigbee_fan_control" -#define ZIGBEE_MFGLIB_INTERFACE "org.tizen.zigbee_mfglib_control" -#define ZIGBEE_ZCLGLB_INTERFACE "org.tizen.zigbee_zclglobal_control" -#define ZIGBEE_ZDOGLB_INTERFACE "org.tizen.zigbee_zdodev_control" -#define ZIGBEE_ZCLBASIC_INTERFACE "org.tizen.zigbee_zclbasic_control" -#define ZIGBEE_ZCLIDENTIFY_INTERFACE "org.tizen.zigbee_zclidentify_control" -#define ZIGBEE_ZCLIAS_INTERFACE "org.tizen.zigbee_zclias_control" -#define ZIGBEE_ZCLPOLL_INTERFACE "org.tizen.zigbee_zcl_poll_control" -#define ZIGBEE_ZCLGROUP_INTERFACE "org.tizen.zigbee_zcl_group" -#define ZIGBEE_ZCLSCENE_INTERFACE "org.tizen.zigbee_zcl_scene" -#define ZIGBEE_ZDOBIND_INTERFACE "org.tizen.zigbee_zdo_bind" -#define ZIGBEE_ZCLCOLOR_INTERFACE "org.tizen.zigbee_zcl_color" -#define ZIGBEE_CUSTOM_INTERFACE "org.tizen.zigbee_custom" +#define ZIGBEE_SERVICE_INTERFACE "org.tizen.zigbee.service" +#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_control_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 3091241..b22b9ca 100644 --- a/lib/zbl-dbus.c +++ b/lib/zbl-dbus.c @@ -81,7 +81,8 @@ static GDBusProxy *_zbl_get_service_proxy(void) if (NULL == service_gproxy) { proxy = g_dbus_proxy_new_sync(gdbus_conn, G_DBUS_PROXY_FLAGS_NONE, NULL, - ZIGBEE_SERVER_NAME, ZIGBEE_OBJECT_PATH, ZIGBEE_SERVICE_INTERFACE, NULL, NULL); + ZIGBEE_SERVER_NAME, ZIGBEE_SERVICE_OBJECT_PATH, ZIGBEE_SERVICE_INTERFACE, + NULL, NULL); } else proxy = service_gproxy; @@ -94,14 +95,9 @@ static GDBusProxy *_zbl_get_on_off_proxy(void) RETVM_IF(NULL == gdbus_conn, NULL, "Connection Object is invalid"); if (NULL == on_off_gproxy) { - proxy = g_dbus_proxy_new_sync((GDBusConnection*)gdbus_conn, - G_DBUS_PROXY_FLAGS_NONE, - NULL, - ZIGBEE_SERVER_NAME, - ZIGBEE_OBJECT_PATH, - ZIGBEE_ON_OFF_INTERFACE, - NULL, - NULL); + proxy = g_dbus_proxy_new_sync(gdbus_conn, G_DBUS_PROXY_FLAGS_NONE, NULL, + ZIGBEE_SERVER_NAME, ZIGBEE_ZCL_ON_OFF_OBJECT_PATH, + ZIGBEE_ZCL_ON_OFF_INTERFACE, NULL, NULL); } else proxy = on_off_gproxy; @@ -115,7 +111,8 @@ static GDBusProxy *_zbl_get_door_lock_proxy(void) if (NULL == door_lock_gproxy) { proxy = g_dbus_proxy_new_sync(gdbus_conn, G_DBUS_PROXY_FLAGS_NONE, NULL, - ZIGBEE_SERVER_NAME, ZIGBEE_OBJECT_PATH, ZIGBEE_DOOR_LOCK_INTERFACE, NULL, NULL); + ZIGBEE_SERVER_NAME, ZIGBEE_ZCL_DOOR_LOCK_OBJECT_PATH, + ZIGBEE_ZCL_DOOR_LOCK_INTERFACE, NULL, NULL); } else proxy = door_lock_gproxy; @@ -129,8 +126,8 @@ static GDBusProxy *_zbl_get_level_control_proxy(void) if (NULL == level_control_gproxy) { proxy = g_dbus_proxy_new_sync(gdbus_conn, G_DBUS_PROXY_FLAGS_NONE, NULL, - ZIGBEE_SERVER_NAME, ZIGBEE_OBJECT_PATH, ZIGBEE_LEVEL_CONTROL_INTERFACE, - NULL, NULL); + ZIGBEE_SERVER_NAME, ZIGBEE_ZCL_LEVEL_CONTROL_OBJECT_PATH, + ZIGBEE_ZCL_LEVEL_CONTROL_INTERFACE, NULL, NULL); } else proxy = level_control_gproxy; @@ -144,7 +141,8 @@ static GDBusProxy *_zbl_get_thermostat_proxy(void) if (NULL == thermostat_gproxy) { proxy = g_dbus_proxy_new_sync(gdbus_conn, G_DBUS_PROXY_FLAGS_NONE, NULL, - ZIGBEE_SERVER_NAME, ZIGBEE_OBJECT_PATH, ZIGBEE_THERMOSTAT_INTERFACE, NULL, NULL); + ZIGBEE_SERVER_NAME, ZIGBEE_ZCL_THERMOSTAT_OBJECT_PATH, + ZIGBEE_ZCL_THERMOSTAT_INTERFACE, NULL, NULL); } else proxy = thermostat_gproxy; @@ -158,7 +156,8 @@ static GDBusProxy *_zbl_get_alarm_proxy(void) if (NULL == alarm_gproxy) { proxy = g_dbus_proxy_new_sync(gdbus_conn, G_DBUS_PROXY_FLAGS_NONE, NULL, - ZIGBEE_SERVER_NAME, ZIGBEE_OBJECT_PATH, ZIGBEE_ALARM_INTERFACE, NULL, NULL); + ZIGBEE_SERVER_NAME, ZIGBEE_ZCL_ALARM_OBJECT_PATH, ZIGBEE_ZCL_ALARM_INTERFACE, + NULL, NULL); } else proxy = alarm_gproxy; @@ -172,7 +171,8 @@ static GDBusProxy *_zbl_get_fan_control_proxy(void) if (NULL == fan_control_gproxy) { proxy = g_dbus_proxy_new_sync(gdbus_conn, G_DBUS_PROXY_FLAGS_NONE, NULL, - ZIGBEE_SERVER_NAME, ZIGBEE_OBJECT_PATH, ZIGBEE_FAN_CONTROL_INTERFACE, NULL, + ZIGBEE_SERVER_NAME, ZIGBEE_ZCL_FAN_CONTROL_OBJECT_PATH, + ZIGBEE_ZCL_FAN_CONTROL_INTERFACE, NULL, NULL); } else proxy = fan_control_gproxy; @@ -187,7 +187,8 @@ static GDBusProxy *_zbl_get_mfglib_proxy(void) if (NULL == mfglib_gproxy) { proxy = g_dbus_proxy_new_sync(gdbus_conn, G_DBUS_PROXY_FLAGS_NONE, NULL, - ZIGBEE_SERVER_NAME, ZIGBEE_OBJECT_PATH, ZIGBEE_MFGLIB_INTERFACE, NULL, NULL); + ZIGBEE_SERVER_NAME, ZIGBEE_MFGLIB_CONTROL_OBJECT_PATH, + ZIGBEE_MFGLIB_CONTROL_INTERFACE, NULL, NULL); } else proxy = mfglib_gproxy; @@ -201,7 +202,8 @@ static GDBusProxy *_zbl_get_zcl_global_proxy(void) if (NULL == zcl_global_proxy) { proxy = g_dbus_proxy_new_sync(gdbus_conn, G_DBUS_PROXY_FLAGS_NONE, NULL, - ZIGBEE_SERVER_NAME, ZIGBEE_OBJECT_PATH, ZIGBEE_ZCLGLB_INTERFACE, NULL, NULL); + ZIGBEE_SERVER_NAME, ZIGBEE_ZCL_GLOBAL_CONTROL_OBJECT_PATH, + ZIGBEE_ZCL_GLOBAL_CONTROL_INTERFACE, NULL, NULL); } else proxy = zcl_global_proxy; @@ -215,7 +217,8 @@ static GDBusProxy *_zbl_get_zdo_dev_proxy(void) if (NULL == zdo_dev_proxy) { proxy = g_dbus_proxy_new_sync(gdbus_conn, G_DBUS_PROXY_FLAGS_NONE, NULL, - ZIGBEE_SERVER_NAME, ZIGBEE_OBJECT_PATH, ZIGBEE_ZDOGLB_INTERFACE, NULL, NULL); + ZIGBEE_SERVER_NAME, ZIGBEE_ZDO_DEV_CONTROL_OBJECT_PATH, + ZIGBEE_ZDO_DEV_CONTROL_INTERFACE, NULL, NULL); } else proxy = zdo_dev_proxy; @@ -229,7 +232,8 @@ static GDBusProxy *_zbl_get_basic_proxy(void) if (NULL == zcl_basic_proxy) { proxy = g_dbus_proxy_new_sync(gdbus_conn, G_DBUS_PROXY_FLAGS_NONE, NULL, - ZIGBEE_SERVER_NAME, ZIGBEE_OBJECT_PATH, ZIGBEE_ZCLBASIC_INTERFACE, NULL, NULL); + ZIGBEE_SERVER_NAME, ZIGBEE_ZCL_BASIC_OBJECT_PATH, ZIGBEE_ZCL_BASIC_INTERFACE, + NULL, NULL); } else proxy = zcl_basic_proxy; @@ -243,7 +247,8 @@ static GDBusProxy *_zbl_get_identify_proxy(void) if (NULL == zcl_identify_proxy) { proxy = g_dbus_proxy_new_sync(gdbus_conn, G_DBUS_PROXY_FLAGS_NONE, NULL, - ZIGBEE_SERVER_NAME, ZIGBEE_OBJECT_PATH, ZIGBEE_ZCLIDENTIFY_INTERFACE, NULL, NULL); + ZIGBEE_SERVER_NAME, ZIGBEE_ZCL_IDENTIFY_OBJECT_PATH, + ZIGBEE_ZCL_IDENTIFY_INTERFACE, NULL, NULL); } else proxy = zcl_identify_proxy; @@ -257,7 +262,8 @@ static GDBusProxy *_zbl_get_ias_zone_proxy(void) if (NULL == zcl_ias_zone_proxy) { proxy = g_dbus_proxy_new_sync(gdbus_conn, G_DBUS_PROXY_FLAGS_NONE, NULL, - ZIGBEE_SERVER_NAME, ZIGBEE_OBJECT_PATH, ZIGBEE_ZCLIAS_INTERFACE, NULL, NULL); + ZIGBEE_SERVER_NAME, ZIGBEE_ZCL_IAS_ZONE_OBJECT_PATH, + ZIGBEE_ZCL_IAS_ZONE_INTERFACE, NULL, NULL); } else proxy = zcl_ias_zone_proxy; @@ -271,7 +277,8 @@ static GDBusProxy *_zbl_get_poll_control_proxy(void) if (NULL == zcl_poll_control_proxy) { proxy = g_dbus_proxy_new_sync(gdbus_conn, G_DBUS_PROXY_FLAGS_NONE, NULL, - ZIGBEE_SERVER_NAME, ZIGBEE_OBJECT_PATH, ZIGBEE_ZCLPOLL_INTERFACE, NULL, NULL); + ZIGBEE_SERVER_NAME, ZIGBEE_ZCL_POLL_CONTROL_OBJECT_PATH, + ZIGBEE_ZCL_POLL_CONTROL_INTERFACE, NULL, NULL); } else proxy = zcl_poll_control_proxy; @@ -285,7 +292,8 @@ static GDBusProxy *_zbl_get_group_proxy(void) if (NULL == zcl_group_proxy) { proxy = g_dbus_proxy_new_sync(gdbus_conn, G_DBUS_PROXY_FLAGS_NONE, NULL, - ZIGBEE_SERVER_NAME, ZIGBEE_OBJECT_PATH, ZIGBEE_ZCLGROUP_INTERFACE, NULL, NULL); + ZIGBEE_SERVER_NAME, ZIGBEE_ZCL_GROUP_OBJECT_PATH, ZIGBEE_ZCL_GROUP_INTERFACE, + NULL, NULL); } else proxy = zcl_group_proxy; @@ -299,7 +307,8 @@ static GDBusProxy *_zbl_get_scene_proxy(void) if (NULL == zcl_scene_proxy) { proxy = g_dbus_proxy_new_sync(gdbus_conn, G_DBUS_PROXY_FLAGS_NONE, NULL, - ZIGBEE_SERVER_NAME, ZIGBEE_OBJECT_PATH, ZIGBEE_ZCLSCENE_INTERFACE, NULL, NULL); + ZIGBEE_SERVER_NAME, ZIGBEE_ZCL_SCENE_OBJECT_PATH, ZIGBEE_ZCL_SCENE_INTERFACE, + NULL, NULL); } else proxy = zcl_scene_proxy; @@ -313,7 +322,8 @@ static GDBusProxy *_zbl_get_zdo_bind_proxy(void) if (NULL == zdo_bind_proxy) { proxy = g_dbus_proxy_new_sync(gdbus_conn, G_DBUS_PROXY_FLAGS_NONE, NULL, - ZIGBEE_SERVER_NAME, ZIGBEE_OBJECT_PATH, ZIGBEE_ZDOBIND_INTERFACE, NULL, NULL); + ZIGBEE_SERVER_NAME, ZIGBEE_ZDO_BIND_OBJECT_PATH, ZIGBEE_ZDO_BIND_INTERFACE, + NULL, NULL); } else proxy = zdo_bind_proxy; @@ -327,7 +337,8 @@ static GDBusProxy *_zbl_get_color_control_proxy(void) if (NULL == zcl_color_control_proxy) { proxy = g_dbus_proxy_new_sync(gdbus_conn, G_DBUS_PROXY_FLAGS_NONE, NULL, - ZIGBEE_SERVER_NAME, ZIGBEE_OBJECT_PATH, ZIGBEE_ZCLCOLOR_INTERFACE, NULL, NULL); + ZIGBEE_SERVER_NAME, ZIGBEE_ZCL_COLOR_CONTROL_OBJECT_PATH, + ZIGBEE_ZCL_COLOR_CONTROL_INTERFACE, NULL, NULL); } else proxy = zcl_color_control_proxy; @@ -341,7 +352,8 @@ static GDBusProxy *_zbl_get_custom_gproxy(void) if (NULL == custom_gproxy) { proxy = g_dbus_proxy_new_sync(gdbus_conn, G_DBUS_PROXY_FLAGS_NONE, NULL, - ZIGBEE_SERVER_NAME, ZIGBEE_OBJECT_PATH, ZIGBEE_CUSTOM_INTERFACE, NULL, NULL); + ZIGBEE_SERVER_NAME, ZIGBEE_CUSTOM_OBJECT_PATH, ZIGBEE_CUSTOM_INTERFACE, + NULL, NULL); } else proxy = custom_gproxy; @@ -828,8 +840,8 @@ static int _zbl_dbus_subscribe_signal(zigbee_h handle) /* Section 1. Subscribe ZDO signal */ id = g_dbus_connection_signal_subscribe(gdbus_conn, NULL, ZIGBEE_SERVICE_INTERFACE, - "service_enabled", ZIGBEE_OBJECT_PATH, NULL, G_DBUS_CALL_FLAGS_NONE, - _zbl_signal_handler, handle, NULL); + "service_enabled", ZIGBEE_SERVICE_OBJECT_PATH, NULL, + G_DBUS_CALL_FLAGS_NONE, _zbl_signal_handler, handle, NULL); if (0 == id) { ERR("g_dbus_connection_signal_subscribe(service_enabled) Fail(%d)", errno); return ZIGBEE_ERROR_IO_ERROR; @@ -838,8 +850,8 @@ static int _zbl_dbus_subscribe_signal(zigbee_h handle) DBG("subscribed for service_enabled signal %d", id); id = g_dbus_connection_signal_subscribe(gdbus_conn, NULL, ZIGBEE_SERVICE_INTERFACE, - "child_joined", ZIGBEE_OBJECT_PATH, NULL, G_DBUS_CALL_FLAGS_NONE, - _zbl_signal_handler, handle, NULL); + "child_joined", ZIGBEE_SERVICE_OBJECT_PATH, NULL, + G_DBUS_CALL_FLAGS_NONE, _zbl_signal_handler, handle, NULL); if (0 == id) { ERR("g_dbus_connection_signal_subscribe(child_rejoined) Fail(%d)\n", errno); _zbl_dbus_unsubscribe_signal(handle->dbus_sub_ids); @@ -849,8 +861,8 @@ static int _zbl_dbus_subscribe_signal(zigbee_h handle) DBG("subscribed for child_joined signal %d", id); id = g_dbus_connection_signal_subscribe(gdbus_conn, NULL, ZIGBEE_SERVICE_INTERFACE, - "child_rejoined", ZIGBEE_OBJECT_PATH, NULL, G_DBUS_CALL_FLAGS_NONE, - _zbl_signal_handler, handle, NULL); + "child_rejoined", ZIGBEE_SERVICE_OBJECT_PATH, NULL, + G_DBUS_CALL_FLAGS_NONE, _zbl_signal_handler, handle, NULL); if (0 == id) { ERR("g_dbus_connection_signal_subscribe(child_rejoined) Fail(%d)\n", errno); _zbl_dbus_unsubscribe_signal(handle->dbus_sub_ids); @@ -860,8 +872,8 @@ static int _zbl_dbus_subscribe_signal(zigbee_h handle) DBG("subscribed for child_rejoined signal %d", id); id = g_dbus_connection_signal_subscribe(gdbus_conn, NULL, ZIGBEE_SERVICE_INTERFACE, - "child_left", ZIGBEE_OBJECT_PATH, NULL, G_DBUS_CALL_FLAGS_NONE, - _zbl_signal_handler, handle, NULL); + "child_left", ZIGBEE_SERVICE_OBJECT_PATH, NULL, + G_DBUS_CALL_FLAGS_NONE, _zbl_signal_handler, handle, NULL); if (0 == id) { ERR("g_dbus_connection_signal_subscribe(child_left) Fail(%d)\n", errno); _zbl_dbus_unsubscribe_signal(handle->dbus_sub_ids); @@ -871,8 +883,8 @@ static int _zbl_dbus_subscribe_signal(zigbee_h handle) DBG("subscribed for child_left signal %d", id); id = g_dbus_connection_signal_subscribe(gdbus_conn, NULL, ZIGBEE_SERVICE_INTERFACE, - "leave_network_done", ZIGBEE_OBJECT_PATH, NULL, G_DBUS_CALL_FLAGS_NONE, - _zbl_signal_handler, handle, NULL); + "leave_network_done", ZIGBEE_SERVICE_OBJECT_PATH, NULL, + G_DBUS_CALL_FLAGS_NONE, _zbl_signal_handler, handle, NULL); if (0 == id) { ERR("g_dbus_connection_signal_subscribe(leave_network_done) Fail(%d)\n", errno); _zbl_dbus_unsubscribe_signal(handle->dbus_sub_ids); @@ -882,8 +894,8 @@ static int _zbl_dbus_subscribe_signal(zigbee_h handle) DBG("subscribed for leave_network_done signal %d", id); id = g_dbus_connection_signal_subscribe(gdbus_conn, NULL, ZIGBEE_SERVICE_INTERFACE, - "form_network_done", ZIGBEE_OBJECT_PATH, NULL, G_DBUS_CALL_FLAGS_NONE, - _zbl_signal_handler, handle, NULL); + "form_network_done", ZIGBEE_SERVICE_OBJECT_PATH, NULL, + G_DBUS_CALL_FLAGS_NONE, _zbl_signal_handler, handle, NULL); if (0 == id) { ERR("g_dbus_connection_signal_subscribe(form_network_done) Fail(%d)\n", errno); _zbl_dbus_unsubscribe_signal(handle->dbus_sub_ids); @@ -893,8 +905,9 @@ static int _zbl_dbus_subscribe_signal(zigbee_h handle) DBG("subscribed for form_network_done signal %d", id); /* Section 3. Subscribe ZCL global command */ - id = g_dbus_connection_signal_subscribe(gdbus_conn, NULL, ZIGBEE_ZCLGLB_INTERFACE, - "zcl_global_default_response", ZIGBEE_OBJECT_PATH, NULL, G_DBUS_CALL_FLAGS_NONE, + 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, _zbl_signal_handler, handle, NULL); if (0 == id) { ERR("g_dbus_connection_signal_subscribe(zcl_global_default_response) Fail(%d)\n", errno); @@ -904,8 +917,9 @@ static int _zbl_dbus_subscribe_signal(zigbee_h handle) handle->dbus_sub_ids = g_list_append(handle->dbus_sub_ids, GUINT_TO_POINTER(id)); DBG("subscribed for zcl_global_default_response signal %d", id); - id = g_dbus_connection_signal_subscribe(gdbus_conn, NULL, ZIGBEE_ZCLGLB_INTERFACE, - "report_attr_handler_rsp", ZIGBEE_OBJECT_PATH, NULL, G_DBUS_CALL_FLAGS_NONE, + 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, _zbl_signal_handler, handle, NULL); if (0 == id) { ERR("g_dbus_connection_signal_subscribe(report_attr_handler_rsp) Fail(%d)\n", errno); @@ -916,9 +930,9 @@ static int _zbl_dbus_subscribe_signal(zigbee_h handle) DBG("subscribed for report_attr_handler_rsp signal %d", id); /* Section 2. Subscribe ZCL alarm cluster signal */ - id = g_dbus_connection_signal_subscribe(gdbus_conn, NULL, ZIGBEE_ALARM_INTERFACE, - "alarm_count", ZIGBEE_OBJECT_PATH, NULL, G_DBUS_CALL_FLAGS_NONE, - _zbl_signal_handler, handle, NULL); + id = g_dbus_connection_signal_subscribe(gdbus_conn, NULL, ZIGBEE_ZCL_ALARM_INTERFACE, + "alarm_count", ZIGBEE_ZCL_ALARM_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); _zbl_dbus_unsubscribe_signal(handle->dbus_sub_ids); @@ -928,9 +942,9 @@ static int _zbl_dbus_subscribe_signal(zigbee_h handle) DBG("subscribed for alarm_count signal %d", id); /* Section 3. Subscribe ZCL IAS cluster signal */ - id = g_dbus_connection_signal_subscribe(gdbus_conn, NULL, ZIGBEE_ZCLIAS_INTERFACE, - "status_change_rsp", ZIGBEE_OBJECT_PATH, NULL, G_DBUS_CALL_FLAGS_NONE, - _zbl_signal_handler, handle, NULL); + id = g_dbus_connection_signal_subscribe(gdbus_conn, NULL, ZIGBEE_ZCL_IAS_ZONE_INTERFACE, + "status_change_rsp", ZIGBEE_ZCL_IAS_ZONE_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); _zbl_dbus_unsubscribe_signal(handle->dbus_sub_ids); @@ -939,9 +953,9 @@ static int _zbl_dbus_subscribe_signal(zigbee_h handle) handle->dbus_sub_ids = g_list_append(handle->dbus_sub_ids, GUINT_TO_POINTER(id)); DBG("subscribed for status_change_rsp signal %d", id); - id = g_dbus_connection_signal_subscribe(gdbus_conn, NULL, ZIGBEE_ZCLIAS_INTERFACE, - "enroll_request", ZIGBEE_OBJECT_PATH, NULL, G_DBUS_CALL_FLAGS_NONE, - _zbl_signal_handler, handle, NULL); + id = g_dbus_connection_signal_subscribe(gdbus_conn, NULL, ZIGBEE_ZCL_IAS_ZONE_INTERFACE, + "enroll_request", ZIGBEE_ZCL_IAS_ZONE_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); _zbl_dbus_unsubscribe_signal(handle->dbus_sub_ids); @@ -1585,8 +1599,9 @@ 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_ZDOGLB_INTERFACE, "nwk_addr_rsp", ZIGBEE_OBJECT_PATH, NULL, 0, - _zbl_addr_req_cb, container, _zbl_request_cleanup); + ZIGBEE_ZDO_DEV_CONTROL_INTERFACE, "nwk_addr_rsp", + ZIGBEE_ZDO_DEV_CONTROL_OBJECT_PATH, NULL, 0, _zbl_addr_req_cb, container, + _zbl_request_cleanup); if (0 == sub_id) { ERR("g_dbus_connection_signal_subscribe() Fail"); @@ -1633,7 +1648,8 @@ 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_ZDOGLB_INTERFACE, "nwk_addr_rsp", ZIGBEE_OBJECT_PATH, NULL, 0, + ZIGBEE_ZDO_DEV_CONTROL_INTERFACE, "nwk_addr_rsp", + ZIGBEE_ZDO_DEV_CONTROL_OBJECT_PATH, NULL, 0, _zbl_addr_req_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -1727,7 +1743,8 @@ 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_ZDOGLB_INTERFACE, "active_ep_rsp", ZIGBEE_OBJECT_PATH, NULL, 0, + ZIGBEE_ZDO_DEV_CONTROL_INTERFACE, "active_ep_rsp", + ZIGBEE_ZDO_DEV_CONTROL_OBJECT_PATH, NULL, 0, _zbl_active_ep_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -1854,7 +1871,8 @@ 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_ZDOGLB_INTERFACE, "simple_desc_rsp", ZIGBEE_OBJECT_PATH, NULL, 0, + ZIGBEE_ZDO_DEV_CONTROL_INTERFACE, "simple_desc_rsp", + ZIGBEE_ZDO_DEV_CONTROL_OBJECT_PATH, NULL, 0, _zbl_simple_desc_req_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -1965,7 +1983,8 @@ 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_ZDOGLB_INTERFACE, "matched_descriptor_rsp", ZIGBEE_OBJECT_PATH, NULL, 0, + ZIGBEE_ZDO_DEV_CONTROL_INTERFACE, "matched_descriptor_rsp", + ZIGBEE_ZDO_DEV_CONTROL_OBJECT_PATH, NULL, 0, _zbl_match_desc_req_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -2071,7 +2090,8 @@ 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_ZDOGLB_INTERFACE, "node_desc_rsp", ZIGBEE_OBJECT_PATH, NULL, 0, + ZIGBEE_ZDO_DEV_CONTROL_INTERFACE, "node_desc_rsp", + ZIGBEE_ZDO_DEV_CONTROL_OBJECT_PATH, NULL, 0, _zbl_node_desc_req_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -2159,7 +2179,8 @@ 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_ZDOGLB_INTERFACE, "power_desc_rsp", ZIGBEE_OBJECT_PATH, NULL, 0, + ZIGBEE_ZDO_DEV_CONTROL_INTERFACE, "power_desc_rsp", + ZIGBEE_ZDO_DEV_CONTROL_OBJECT_PATH, NULL, 0, _zbl_power_desc_req_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -2254,7 +2275,8 @@ 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_ZDOGLB_INTERFACE, "complex_desc_rsp", ZIGBEE_OBJECT_PATH, NULL, 0, + ZIGBEE_ZDO_DEV_CONTROL_INTERFACE, "complex_desc_rsp", + ZIGBEE_ZDO_DEV_CONTROL_OBJECT_PATH, NULL, 0, _zbl_complex_desc_req_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -2349,7 +2371,8 @@ 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_ZDOGLB_INTERFACE, "user_desc_rsp", ZIGBEE_OBJECT_PATH, NULL, 0, + ZIGBEE_ZDO_DEV_CONTROL_INTERFACE, "user_desc_rsp", + ZIGBEE_ZDO_DEV_CONTROL_OBJECT_PATH, NULL, 0, _zbl_user_desc_req_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -2438,7 +2461,8 @@ 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_ZDOGLB_INTERFACE, "user_desc_confirm", ZIGBEE_OBJECT_PATH, NULL, 0, + ZIGBEE_ZDO_DEV_CONTROL_INTERFACE, "user_desc_confirm", + ZIGBEE_ZDO_DEV_CONTROL_OBJECT_PATH, NULL, 0, _zbl_user_desc_set_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -2562,8 +2586,8 @@ 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_ZDOBIND_INTERFACE, "binding_rsp", ZIGBEE_OBJECT_PATH, NULL, 0, - _zbl_bind_req_cb, container, _zbl_request_cleanup); + ZIGBEE_ZDO_BIND_INTERFACE, "binding_rsp", ZIGBEE_ZDO_BIND_OBJECT_PATH, + NULL, 0, _zbl_bind_req_cb, container, _zbl_request_cleanup); if (0 == sub_id) { ERR("g_dbus_connection_signal_subscribe() Fail"); free(container); @@ -2676,8 +2700,8 @@ 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_ZDOBIND_INTERFACE, "unbindng_rsp", ZIGBEE_OBJECT_PATH, NULL, 0, - _zbl_unbind_req_cb, container, _zbl_request_cleanup); + ZIGBEE_ZDO_BIND_INTERFACE, "unbindng_rsp", ZIGBEE_ZDO_BIND_OBJECT_PATH, + NULL, 0, _zbl_unbind_req_cb, container, _zbl_request_cleanup); if (0 == sub_id) { ERR("g_dbus_connection_signal_subscribe() Fail"); free(container); @@ -2833,8 +2857,9 @@ 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_ZDOGLB_INTERFACE, "nwk_disc_rsp", ZIGBEE_OBJECT_PATH, NULL, 0, - _zbl_mgmt_nwk_disc_req_cb, container, _zbl_request_cleanup); + ZIGBEE_ZDO_DEV_CONTROL_INTERFACE, "nwk_disc_rsp", + ZIGBEE_ZDO_DEV_CONTROL_OBJECT_PATH, NULL, 0, _zbl_mgmt_nwk_disc_req_cb, + container, _zbl_request_cleanup); if (0 == sub_id) { ERR("g_dbus_connection_signal_subscribe() Fail"); @@ -2989,8 +3014,9 @@ 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_ZDOGLB_INTERFACE, "mgmt_lqi_rsp", ZIGBEE_OBJECT_PATH, NULL, 0, - _zbl_mgmt_lqi_req_cb, container, _zbl_request_cleanup); + ZIGBEE_ZDO_DEV_CONTROL_INTERFACE, "mgmt_lqi_rsp", + ZIGBEE_ZDO_DEV_CONTROL_OBJECT_PATH, NULL, 0, _zbl_mgmt_lqi_req_cb, container, + _zbl_request_cleanup); if (0 == sub_id) { ERR("g_dbus_connection_signal_subscribe() Fail"); @@ -3110,8 +3136,9 @@ 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_ZDOGLB_INTERFACE, "mgmt_rtg_rsp", ZIGBEE_OBJECT_PATH, NULL, 0, - _zbl_mgmt_rtg_req_cb, container, _zbl_request_cleanup); + ZIGBEE_ZDO_DEV_CONTROL_INTERFACE, "mgmt_rtg_rsp", + ZIGBEE_ZDO_DEV_CONTROL_OBJECT_PATH, NULL, 0, _zbl_mgmt_rtg_req_cb, container, + _zbl_request_cleanup); if (0 == sub_id) { ERR("g_dbus_connection_signal_subscribe() Fail"); @@ -3256,8 +3283,9 @@ 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_ZDOGLB_INTERFACE, "mgmt_bind_rsp", ZIGBEE_OBJECT_PATH, NULL, 0, - _zbl_mgmt_bind_req_cb, container, _zbl_request_cleanup); + ZIGBEE_ZDO_DEV_CONTROL_INTERFACE, "mgmt_bind_rsp", + ZIGBEE_ZDO_DEV_CONTROL_OBJECT_PATH, NULL, 0, _zbl_mgmt_bind_req_cb, container, + _zbl_request_cleanup); if (0 == sub_id) { ERR("g_dbus_connection_signal_subscribe() Fail"); @@ -3334,8 +3362,9 @@ 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_ZDOGLB_INTERFACE, "mgmt_left_rsp", ZIGBEE_OBJECT_PATH, NULL, 0, - _zbl_mgmt_leave_req_cb, container, _zbl_request_cleanup); + ZIGBEE_ZDO_DEV_CONTROL_INTERFACE, "mgmt_left_rsp", + ZIGBEE_ZDO_DEV_CONTROL_OBJECT_PATH, NULL, 0, _zbl_mgmt_leave_req_cb, container, + _zbl_request_cleanup); if (0 == sub_id) { ERR("g_dbus_connection_signal_subscribe() Fail"); @@ -3426,8 +3455,9 @@ 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_ZDOGLB_INTERFACE, "mgmt_permit_join_rsp", ZIGBEE_OBJECT_PATH, NULL, 0, - _zbl_mgmt_permit_joining_req_cb, container, _zbl_request_cleanup); + ZIGBEE_ZDO_DEV_CONTROL_INTERFACE, "mgmt_permit_join_rsp", + ZIGBEE_ZDO_DEV_CONTROL_OBJECT_PATH, NULL, 0, _zbl_mgmt_permit_joining_req_cb, + container, _zbl_request_cleanup); if (0 == sub_id) { ERR("g_dbus_connection_signal_subscribe() Fail"); @@ -3537,7 +3567,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_OBJECT_PATH, NULL, 0, + ZIGBEE_CUSTOM_INTERFACE, "aps_send_rsp", ZIGBEE_CUSTOM_OBJECT_PATH, NULL, 0, _zbl_aps_send_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -3657,7 +3687,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_OBJECT_PATH, NULL, 0, + ZIGBEE_CUSTOM_INTERFACE, "zcl_send_rsp", ZIGBEE_CUSTOM_OBJECT_PATH, NULL, 0, _zbl_zcl_send_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -3767,7 +3797,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_OBJECT_PATH, NULL, 0, + ZIGBEE_CUSTOM_INTERFACE, "send_to_local_rsp", ZIGBEE_CUSTOM_OBJECT_PATH, NULL, 0, _zbl_send_to_local_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -3923,9 +3953,10 @@ int zbl_read_attr_req(zigbee_h handle, unsigned short addr16, unsigned char dest RETVM_IF(NULL == container, ZIGBEE_ERROR_OUT_OF_MEMORY, "calloc() Fail(%d)", errno); to = zbl_dbus_get_timeout(zcl_global_proxy); - sub_id = g_dbus_connection_signal_subscribe(gdbus_conn, NULL, ZIGBEE_ZCLGLB_INTERFACE, - "read_attributes_rsp", ZIGBEE_OBJECT_PATH, NULL, 0, - _zbl_read_attributes_req_cb, container, _zbl_request_cleanup); + 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_read_attributes_req_cb, + container, _zbl_request_cleanup); if (0 == sub_id) { ERR("g_dbus_connection_signal_subscribe() Fail"); @@ -4161,9 +4192,10 @@ 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_ZCLGLB_INTERFACE, - "write_attributes_rsp", ZIGBEE_OBJECT_PATH, NULL, 0, - _zbl_write_attributes_req_cb, container, _zbl_request_cleanup); + 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_write_attributes_req_cb, + container, _zbl_request_cleanup); if (0 == sub_id) { ERR("g_dbus_connection_signal_subscribe() Fail"); @@ -4330,9 +4362,10 @@ 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_ZCLGLB_INTERFACE, - "write_attributes_rsp", ZIGBEE_OBJECT_PATH, NULL, 0, - _zbl_write_attributes_req_cb, container, _zbl_request_cleanup); + 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_write_attributes_req_cb, + container, _zbl_request_cleanup); if (0 == sub_id) { ERR("g_dbus_connection_signal_subscribe() Fail"); @@ -4618,9 +4651,10 @@ int zbl_configure_reporting(zigbee_h handle, nwk_addr addr16, unsigned char src_ RETVM_IF(NULL == container, ZIGBEE_ERROR_OUT_OF_MEMORY, "calloc() Fail(%d)", errno); to = zbl_dbus_get_timeout(zcl_global_proxy); - sub_id = g_dbus_connection_signal_subscribe(gdbus_conn, NULL, ZIGBEE_ZCLGLB_INTERFACE, - "configure_reporting_rsp", ZIGBEE_OBJECT_PATH, NULL, 0, - _zbl_configure_reporting_cb, container, _zbl_request_cleanup); + 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_configure_reporting_cb, + container, _zbl_request_cleanup); if (0 == sub_id) { ERR("g_dbus_connection_signal_subscribe() Fail"); @@ -4858,9 +4892,10 @@ int zbl_read_configure_reporting(zigbee_h handle, nwk_addr addr16, unsigned char RETVM_IF(NULL == container, ZIGBEE_ERROR_OUT_OF_MEMORY, "calloc() Fail(%d)", errno); to = zbl_dbus_get_timeout(zcl_global_proxy); - sub_id = g_dbus_connection_signal_subscribe(gdbus_conn, NULL, ZIGBEE_ZCLGLB_INTERFACE, - "read_configure_reporting_rsp", ZIGBEE_OBJECT_PATH, NULL, 0, - _zbl_read_configure_reporting_cb, container, _zbl_request_cleanup); + 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_read_configure_reporting_cb, + container, _zbl_request_cleanup); if (0 == sub_id) { ERR("g_dbus_connection_signal_subscribe() Fail"); @@ -5053,7 +5088,8 @@ 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_ZCLGLB_INTERFACE, "discover_attribute_rsp", ZIGBEE_OBJECT_PATH, NULL, 0, + ZIGBEE_ZCL_GLOBAL_CONTROL_INTERFACE, "discover_attribute_rsp", + ZIGBEE_ZCL_GLOBAL_CONTROL_OBJECT_PATH, NULL, 0, _zbl_discover_attributes_req_cb, container, _zbl_request_cleanup); if (0 == sub_id) { @@ -5183,9 +5219,10 @@ int zbl_discover_cmds_gen(zigbee_h handle, nwk_addr addr16, unsigned char src_ep RETVM_IF(NULL == con, ZIGBEE_ERROR_OUT_OF_MEMORY, "calloc() Fail(%d)", errno); to = zbl_dbus_get_timeout(zcl_global_proxy); - sub_id = g_dbus_connection_signal_subscribe(gdbus_conn, NULL, ZIGBEE_ZCLGLB_INTERFACE, - "discover_commands_received_rsp", ZIGBEE_OBJECT_PATH, NULL, 0, - _zbl_discover_cmds_cb, con, _zbl_request_cleanup); + 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_discover_cmds_cb, con, + _zbl_request_cleanup); if (0 == sub_id) { ERR("g_dbus_connection_signal_subscribe() Fail"); @@ -5249,9 +5286,10 @@ int zbl_discover_cmds_recv(zigbee_h handle, nwk_addr addr16, unsigned char src_e RETVM_IF(NULL == con, ZIGBEE_ERROR_OUT_OF_MEMORY, "calloc() Fail(%d)", errno); to = zbl_dbus_get_timeout(zcl_global_proxy); - sub_id = g_dbus_connection_signal_subscribe(gdbus_conn, NULL, ZIGBEE_ZCLGLB_INTERFACE, - "discover_commands_received_rsp", ZIGBEE_OBJECT_PATH, NULL, 0, - _zbl_discover_cmds_cb, con, _zbl_request_cleanup); + 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_discover_cmds_cb, con, + _zbl_request_cleanup); if (0 == sub_id) { ERR("g_dbus_connection_signal_subscribe() Fail"); @@ -5405,9 +5443,10 @@ int zbl_discover_attr_ext(zigbee_h handle, nwk_addr addr16, unsigned char src_ep RETVM_IF(NULL == con, ZIGBEE_ERROR_OUT_OF_MEMORY, "calloc() Fail(%d)", errno); to = zbl_dbus_get_timeout(zcl_global_proxy); - sub_id = g_dbus_connection_signal_subscribe(gdbus_conn, NULL, ZIGBEE_ZCLGLB_INTERFACE, - "discover_attributes_extended_rsp", ZIGBEE_OBJECT_PATH, NULL, 0, - _zbl_discover_attr_ext_cb, con, _zbl_request_cleanup); + 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_discover_attr_ext_cb, con, + _zbl_request_cleanup); if (0 == sub_id) { ERR("g_dbus_connection_signal_subscribe() Fail"); @@ -5556,8 +5595,8 @@ 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_ALARM_INTERFACE, "get_alarm_rsp", ZIGBEE_OBJECT_PATH, NULL, 0, - _zbl_get_alarm_cb, container, _zbl_request_cleanup); + ZIGBEE_ZCL_ALARM_INTERFACE, "get_alarm_rsp", ZIGBEE_ZCL_ALARM_OBJECT_PATH, + NULL, 0, _zbl_get_alarm_cb, container, _zbl_request_cleanup); if (0 == sub_id) { ERR("g_dbus_connection_signal_subscribe() Fail"); @@ -5846,8 +5885,8 @@ 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_ZCLIDENTIFY_INTERFACE, "query_rsp", ZIGBEE_OBJECT_PATH, NULL, 0, - _zbl_identify_query_cb, con, _zbl_request_cleanup); + ZIGBEE_ZCL_IDENTIFY_INTERFACE, "query_rsp", ZIGBEE_ZCL_IDENTIFY_OBJECT_PATH, + NULL, 0, _zbl_identify_query_cb, con, _zbl_request_cleanup); if (0 == sub_id) { ERR("g_dbus_connection_signal_subscribe() Fail"); @@ -5935,8 +5974,8 @@ 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_ZCLGROUP_INTERFACE, "add_group_rsp", ZIGBEE_OBJECT_PATH, NULL, 0, - _zbl_add_group_cb, con, _zbl_request_cleanup); + ZIGBEE_ZCL_GROUP_INTERFACE, "add_group_rsp", ZIGBEE_ZCL_GROUP_OBJECT_PATH, + NULL, 0, _zbl_add_group_cb, con, _zbl_request_cleanup); if (0 == sub_id) { ERR("g_dbus_connection_signal_subscribe() Fail"); @@ -6065,8 +6104,8 @@ 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_ZCLGROUP_INTERFACE, "view_group_rsp", ZIGBEE_OBJECT_PATH, NULL, 0, - _zbl_view_group_cb, con, _zbl_request_cleanup); + ZIGBEE_ZCL_GROUP_INTERFACE, "view_group_rsp", ZIGBEE_ZCL_GROUP_OBJECT_PATH, + NULL, 0, _zbl_view_group_cb, con, _zbl_request_cleanup); if (0 == sub_id) { ERR("g_dbus_connection_signal_subscribe() Fail"); @@ -6171,8 +6210,9 @@ 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_ZCLGROUP_INTERFACE, "get_group_membership_rsp", ZIGBEE_OBJECT_PATH, - NULL, 0, _zbl_group_get_group_membership_cb, con, _zbl_request_cleanup); + ZIGBEE_ZCL_GROUP_INTERFACE, "get_group_membership_rsp", + ZIGBEE_ZCL_GROUP_OBJECT_PATH, NULL, 0, _zbl_group_get_group_membership_cb, + con, _zbl_request_cleanup); if (0 == sub_id) { ERR("g_dbus_connection_signal_subscribe() Fail"); @@ -6264,7 +6304,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_ZCLGROUP_INTERFACE, "remove_group_rsp", ZIGBEE_OBJECT_PATH, + ZIGBEE_ZCL_GROUP_INTERFACE, "remove_group_rsp", ZIGBEE_ZCL_GROUP_OBJECT_PATH, NULL, 0, _zbl_remove_group_cb, con, _zbl_request_cleanup); if (0 == sub_id) { @@ -6630,7 +6670,8 @@ 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_ZCLPOLL_INTERFACE, "checkin_response", ZIGBEE_OBJECT_PATH, NULL, 0, + ZIGBEE_ZCL_POLL_CONTROL_INTERFACE, "checkin_response", + ZIGBEE_ZCL_POLL_CONTROL_OBJECT_PATH, NULL, 0, _zbl_set_long_poll_interval_cb, con, _zbl_request_cleanup); if (0 == sub_id) { @@ -6667,7 +6708,8 @@ 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_ZCLPOLL_INTERFACE, "checkin_response", ZIGBEE_OBJECT_PATH, NULL, 0, + ZIGBEE_ZCL_POLL_CONTROL_INTERFACE, "checkin_response", + ZIGBEE_ZCL_POLL_CONTROL_OBJECT_PATH, NULL, 0, _zbl_set_long_poll_interval_cb, con, _zbl_request_cleanup); if (0 == sub_id) { @@ -6763,7 +6805,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_ZCLSCENE_INTERFACE, "add_scene_rsp", ZIGBEE_OBJECT_PATH, NULL, 0, + ZIGBEE_ZCL_SCENE_INTERFACE, "add_scene_rsp", ZIGBEE_ZCL_SCENE_OBJECT_PATH, NULL, 0, _zbl_add_scene_cb, con, _zbl_request_cleanup); if (0 == sub_id) { @@ -6922,7 +6964,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_ZCLSCENE_INTERFACE, "view_scene_rsp", ZIGBEE_OBJECT_PATH, NULL, 0, + ZIGBEE_ZCL_SCENE_INTERFACE, "view_scene_rsp", ZIGBEE_ZCL_SCENE_OBJECT_PATH, NULL, 0, _zbl_view_scene_cb, con, _zbl_request_cleanup); if (0 == sub_id) { @@ -7010,8 +7052,8 @@ 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_ZCLSCENE_INTERFACE, "remove_scene_rsp", ZIGBEE_OBJECT_PATH, NULL, 0, - _zbl_remove_scene_cb, con, _zbl_request_cleanup); + ZIGBEE_ZCL_SCENE_INTERFACE, "remove_scene_rsp", ZIGBEE_ZCL_SCENE_OBJECT_PATH, + NULL, 0, _zbl_remove_scene_cb, con, _zbl_request_cleanup); if (0 == sub_id) { ERR("g_dbus_connection_signal_subscribe() Fail"); @@ -7098,8 +7140,9 @@ 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_ZCLSCENE_INTERFACE, "remove_all_scene_rsp", ZIGBEE_OBJECT_PATH, NULL, 0, - _zbl_remove_all_scene_cb, con, _zbl_request_cleanup); + ZIGBEE_ZCL_SCENE_INTERFACE, "remove_all_scene_rsp", + ZIGBEE_ZCL_SCENE_OBJECT_PATH, NULL, 0, _zbl_remove_all_scene_cb, con, + _zbl_request_cleanup); if (0 == sub_id) { ERR("g_dbus_connection_signal_subscribe() Fail"); @@ -7185,8 +7228,8 @@ 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_ZCLSCENE_INTERFACE, "store_scene_rsp", ZIGBEE_OBJECT_PATH, NULL, 0, - _zbl_scene_store_scene_cb, con, _zbl_request_cleanup); + ZIGBEE_ZCL_SCENE_INTERFACE, "store_scene_rsp", ZIGBEE_ZCL_SCENE_OBJECT_PATH, + NULL, 0, _zbl_scene_store_scene_cb, con, _zbl_request_cleanup); if (0 == sub_id) { ERR("g_dbus_connection_signal_subscribe() Fail"); @@ -7308,8 +7351,9 @@ 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_ZCLSCENE_INTERFACE, "get_scene_membership_rsp", ZIGBEE_OBJECT_PATH, - NULL, 0, _zbl_get_scene_membership_cb, con, _zbl_request_cleanup); + ZIGBEE_ZCL_SCENE_INTERFACE, "get_scene_membership_rsp", + ZIGBEE_ZCL_SCENE_OBJECT_PATH, NULL, 0, _zbl_get_scene_membership_cb, con, + _zbl_request_cleanup); if (0 == sub_id) { ERR("g_dbus_connection_signal_subscribe() Fail"); -- 2.34.1