return service;
}
-static void on_service_enable_resp(ZigBeeServiceInterface *service_interface,
- guint request_id, gpointer resp_data, guint resp_data_len, gpointer resp_cb_data)
-{
- ZigbeeServiceInterfaceRespCbData_t *cb_data =
- (ZigbeeServiceInterfaceRespCbData_t *)resp_cb_data;
-
- ZigbeeService *service_object;
- GDBusMethodInvocation *invocation;
- ZigbeeServiceServiceStateResp_t *payload =
- (ZigbeeServiceServiceStateResp_t*)resp_data;
-
- NOT_USED(service_interface);
- NOT_USED(request_id);
-
- if (NULL == resp_data || 0 == resp_data_len) {
- Z_LOGE("resp_data is null");
- return;
- }
-
- service_object = zigbee_service_dbus_interface_ref_interface_object(cb_data);
- zblib_check_null_free_and_ret("service_object", service_object, cb_data);
-
- invocation = zigbee_service_dbus_interface_ref_invocation(cb_data);
- zblib_check_null_free_and_ret("invocation", invocation, cb_data);
-
- zigbee_service_complete_enable(service_object, invocation,
- payload->result, payload->enabled);
-
- g_free(cb_data);
-}
-
-static gboolean on_service_enable(ZigbeeService *service_object,
- GDBusMethodInvocation *invocation,
- gpointer user_data)
-{
- ZigBeeServiceInterface *service_interface = (ZigBeeServiceInterface *)user_data;
- ZigbeeServiceInterfaceRespCbData_t *resp_cb_data = NULL;
-
- gboolean ret;
-
- Z_LOGE("KSR");
-
- /* Allocate response callback data */
- resp_cb_data =
- zigbee_service_dbus_interface_create_resp_cb_data(service_object,
- invocation, NULL, 0);
- if (NULL == resp_cb_data) {
- Z_LOGE("zigbee_service_dbus_interface_create_resp_cb_data failed!");
-
- /* Send failure response */
- ZIGBEE_DBUS_FAIL_RESPONSE(invocation, ZIGBEE_DBUS_DEFAULT_REQ_FAILED_MSG);
-
- return TRUE;
- }
-
- /* Dispatch request */
- ret = zigbee_service_dbus_interface_dispatch_request(service_interface,
- ZBLIB_DRIVER_TYPE_SERVICE,
- ZBLIB_SERVICE_OPS_ENABLE,
- NULL, 0,
- on_service_enable_resp, resp_cb_data);
- if (FALSE == ret) {
- Z_LOGE("zigbee_service_dbus_interface_dispatch_request failed!");
-
- /* Free response callback data */
- zigbee_service_dbus_interface_destroy_resp_cb_data(resp_cb_data);
-
- /* Send failure response */
- ZIGBEE_DBUS_FAIL_RESPONSE(invocation, ZIGBEE_DBUS_DEFAULT_REQ_FAILED_MSG);
-
- return TRUE;
- }
-
- return TRUE;
-}
-
-static void on_service_disable_resp(ZigBeeServiceInterface *service_interface,
- guint request_id, gpointer resp_data, guint resp_data_len, gpointer resp_cb_data)
-{
- ZigbeeServiceInterfaceRespCbData_t *cb_data =
- (ZigbeeServiceInterfaceRespCbData_t *)resp_cb_data;
-
- ZigbeeService *service_object;
- GDBusMethodInvocation *invocation;
- ZigbeeGeneralResp_t *payload = (ZigbeeGeneralResp_t*)resp_data;
-
- NOT_USED(service_interface);
- NOT_USED(request_id);
-
- if (NULL == resp_data || 0 == resp_data_len) {
- Z_LOGE("resp_data is null");
- return;
- }
-
- service_object = zigbee_service_dbus_interface_ref_interface_object(cb_data);
- zblib_check_null_free_and_ret("service_object", service_object, cb_data);
-
- invocation = zigbee_service_dbus_interface_ref_invocation(cb_data);
- zblib_check_null_free_and_ret("invocation", invocation, cb_data);
-
- zigbee_service_complete_disable(service_object, invocation, payload->result);
-
- g_free(cb_data);
-}
-
-static gboolean on_service_disable(ZigbeeService *service_object,
- GDBusMethodInvocation *invocation,
- gpointer user_data)
-{
- ZigBeeServiceInterface *service_interface = (ZigBeeServiceInterface *)user_data;
- ZigbeeServiceInterfaceRespCbData_t *resp_cb_data = NULL;
-
- gboolean ret;
-
- /* Allocate response callback data */
- resp_cb_data =
- zigbee_service_dbus_interface_create_resp_cb_data(service_object,
- invocation, NULL, 0);
- if (NULL == resp_cb_data) {
- Z_LOGE("zigbee_service_dbus_interface_create_resp_cb_data failed!");
-
- /* Send failure response */
- ZIGBEE_DBUS_FAIL_RESPONSE(invocation, ZIGBEE_DBUS_DEFAULT_REQ_FAILED_MSG);
-
- return TRUE;
- }
-
- /* Dispatch request */
- ret = zigbee_service_dbus_interface_dispatch_request(service_interface,
- ZBLIB_DRIVER_TYPE_SERVICE,
- ZBLIB_SERVICE_OPS_DISABLE,
- NULL, 0,
- on_service_disable_resp, resp_cb_data);
- if (FALSE == ret) {
- Z_LOGE("zigbee_service_dbus_interface_dispatch_request failed!");
-
- /* Free response callback data */
- zigbee_service_dbus_interface_destroy_resp_cb_data(resp_cb_data);
-
- /* Send failure response */
- ZIGBEE_DBUS_FAIL_RESPONSE(invocation, ZIGBEE_DBUS_DEFAULT_REQ_FAILED_MSG);
-
- return TRUE;
- }
-
- return TRUE;
-}
-
static void on_service_zb_hw_reset_resp(ZigBeeServiceInterface *service_interface,
guint request_id, gpointer resp_data, guint resp_data_len, gpointer resp_cb_data)
{
if (NULL == resp_data || 0 == resp_data_len) {
Z_LOGE("resp_data is null");
+ g_free(cb_data);
return;
}
if (NULL == resp_data || 0 == resp_data_len) {
Z_LOGE("resp_data is null");
+ g_free(cb_data);
return;
}
if (NULL == resp_data || 0 == resp_data_len) {
Z_LOGE("resp_data is null");
+ g_free(cb_data);
return;
}
if (NULL == resp_data || 0 == resp_data_len) {
Z_LOGE("resp_data is null");
+ g_free(cb_data);
return;
}
if (NULL == resp_data || 0 == resp_data_len) {
Z_LOGE("resp_data is null");
+ g_free(cb_data);
return;
}
if (NULL == resp_data || 0 == resp_data_len) {
Z_LOGE("resp_data is null");
+ g_free(cb_data);
return;
}
payload->result, v_eui64, payload->node_id,
payload->pan_id, payload->channel, payload->radio_tx_power);
+ if (v_eui64)
+ g_variant_unref(v_eui64);
+
g_free(cb_data);
}
if (NULL == resp_data || 0 == resp_data_len) {
Z_LOGE("resp_data is null");
+ g_free(cb_data);
return;
}
if (NULL == resp_data || 0 == resp_data_len) {
Z_LOGE("resp_data is null");
+ g_free(cb_data);
return;
}
invocation = zigbee_service_dbus_interface_ref_invocation(cb_data);
zblib_check_null_free_and_ret("invocation", invocation, cb_data);
- /* To-To : zigbee_service_complete_get_device_list */
- //zigbee_service_complete_get_device_list(service_object, invocation, resp_data);
+ /* TODO : zigbee_service_complete_get_device_list */
+ /* zigbee_service_complete_get_device_list(service_object, invocation, resp_data); */
g_free(cb_data);
}
zigbee_service_complete_get_mac(service_object, invocation, payload->result,
v_eui64);
+ if (v_eui64)
+ g_variant_unref(v_eui64);
+
g_free(cb_data);
}
invocation = zigbee_service_dbus_interface_ref_invocation(cb_data);
zblib_check_null_free_and_ret("invocation", invocation, cb_data);
- builder = g_variant_builder_new(G_VARIANT_TYPE ("a(qyayyay)"));
+ builder = g_variant_builder_new(G_VARIANT_TYPE("a(qyayyay)"));
for (index = 0; index < payload->count; index++) {
ZigbeeServiceGetDeviceInfoDetailResp_t *device = &(payload->list[index]);
- GVariantBuilder* mac_builder = g_variant_builder_new(G_VARIANT_TYPE ("ay"));
- GVariantBuilder* endpoint_builder = g_variant_builder_new(G_VARIANT_TYPE ("ay"));
+ GVariantBuilder* mac_builder = g_variant_builder_new(G_VARIANT_TYPE("ay"));
+ GVariantBuilder* endpoint_builder = g_variant_builder_new(G_VARIANT_TYPE("ay"));
- for (i = 0; i < ZIGBEE_EUI64_SIZE; i++) {
- g_variant_builder_add (mac_builder, "y", device->eui64[i]);
- }
- for (i = 0; i < device->endpoint_count; i++) {
- g_variant_builder_add (endpoint_builder, "y", device->endpoints[i]);
- }
+ for (i = 0; i < ZIGBEE_EUI64_SIZE; i++)
+ g_variant_builder_add(mac_builder, "y", device->eui64[i]);
+ for (i = 0; i < device->endpoint_count; i++)
+ g_variant_builder_add(endpoint_builder, "y", device->endpoints[i]);
- g_variant_builder_add (builder, "(qyayyay)",
+ g_variant_builder_add(builder, "(qyayyay)",
device->node_id, device->node_type,
mac_builder, device->endpoint_count, endpoint_builder);
- g_variant_builder_unref (mac_builder);
- g_variant_builder_unref (endpoint_builder);
+ g_variant_builder_unref(mac_builder);
+ g_variant_builder_unref(endpoint_builder);
}
variant = g_variant_builder_end(builder);
zigbee_service_complete_get_device_info(service_object, invocation,
payload->result, variant);
+ if (variant)
+ g_variant_unref(variant);
+
g_free(cb_data);
}
zigbee_service_complete_get_endpoint_list(service_object, invocation,
payload->result, v_endpoints);
+ if (v_endpoints)
+ g_variant_unref(v_endpoints);
+
g_free(cb_data);
}
GDBusMethodInvocation *invocation;
ZigbeeServiceGetClusterListResp_t *payload =
(ZigbeeServiceGetClusterListResp_t*)resp_data;
- GVariant *v_clusters = NULL;
+ GVariant *v_in_clusters = NULL;
+ GVariant *v_out_clusters = NULL;
NOT_USED(service_interface);
NOT_USED(request_id);
invocation = zigbee_service_dbus_interface_ref_invocation(cb_data);
zblib_check_null_free_and_ret("invocation", invocation, cb_data);
- v_clusters = g_variant_new_from_data(G_VARIANT_TYPE("aq"),
- payload->clusters, payload->cluster_count, TRUE, NULL, NULL);
+ v_in_clusters = g_variant_new_from_data(G_VARIANT_TYPE("aq"),
+ payload->in_clusters, (payload->in_cluster_count * sizeof(unsigned short)),
+ TRUE, NULL, NULL);
+ v_out_clusters = g_variant_new_from_data(G_VARIANT_TYPE("aq"),
+ payload->out_clusters, (payload->out_cluster_count * sizeof(unsigned short)),
+ TRUE, NULL, NULL);
zigbee_service_complete_get_cluster_list(service_object, invocation,
- payload->result, v_clusters);
+ payload->result, v_in_clusters, v_out_clusters);
+
+ if (v_in_clusters)
+ g_variant_unref(v_in_clusters);
+ if (v_out_clusters)
+ g_variant_unref(v_out_clusters);
g_free(cb_data);
}
return TRUE;
}
+static gboolean on_service_check_privilege(ZigbeeService *service_object,
+ GDBusMethodInvocation *invocation,
+ gpointer user_data)
+{
+ NOT_USED(user_data);
+
+ zigbee_service_complete_check_privilege(service_object, invocation);
+
+ return TRUE;
+}
+
void zigbee_service_dbus_interface_service_notification(ZigBeeServiceInterface *service_interface,
guint noti_id, gpointer noti_data, guint noti_data_len, gpointer noti_cb_data)
{
NOT_USED(noti_cb_data);
- switch(noti_id) {
+ switch (noti_id) {
case ZBLIB_SERVICE_NOTI_FORM_NETWORK_DONE: {
ZigbeeServiceServiceFormNetworkDone_t *panid_t =
(ZigbeeServiceServiceFormNetworkDone_t*)noti_data;
child_t->endpoints, child_t->endpoint_count, TRUE, NULL, NULL);
if (NULL == v_eui64 || NULL == v_endpoints) {
Z_LOGE("Failed to create variant!");
- if (v_eui64)
- g_object_unref(v_eui64);
- if (v_endpoints)
- g_object_unref(v_endpoints);
} else {
zigbee_service_emit_child_joined(service_object,
v_eui64, child_t->endpoint_count, v_endpoints, child_t->node_id);
}
+ if (v_eui64)
+ g_variant_unref(v_eui64);
+ if (v_endpoints)
+ g_variant_unref(v_endpoints);
}
break;
case ZBLIB_SERVICE_NOTI_CHILD_REJOINED: {
GVariant *v_eui64 = g_variant_new_from_data(G_VARIANT_TYPE("a(y)"),
child_t->eui64, ZIGBEE_EUI64_SIZE, TRUE, NULL, NULL);
- if (NULL == v_eui64) {
+ if (NULL == v_eui64)
Z_LOGE("Failed to create variant!");
- } else {
+ else
zigbee_service_emit_child_rejoined(service_object, v_eui64);
- }
+ if (v_eui64)
+ g_variant_unref(v_eui64);
}
break;
case ZBLIB_SERVICE_NOTI_CHILD_LEFT: {
GVariant *v_eui64 = g_variant_new_from_data(G_VARIANT_TYPE("a(y)"),
child_left_t->eui64, ZIGBEE_EUI64_SIZE, TRUE, NULL, NULL);
- if (NULL == v_eui64) {
+ if (NULL == v_eui64)
Z_LOGE("Failed to create variant!");
- } else {
+ else {
zigbee_service_emit_child_left(service_object,
v_eui64, child_left_t->status);
+ g_variant_unref(v_eui64);
}
}
break;
* Register signal handlers for 'service' interface
*/
g_signal_connect(service_object,
- "handle-enable",
- G_CALLBACK(on_service_enable), service_interface);
-
- g_signal_connect(service_object,
- "handle-disable",
- G_CALLBACK(on_service_disable), service_interface);
-
- g_signal_connect(service_object,
"handle-zb-hw-reset",
G_CALLBACK(on_service_zb_hw_reset), service_interface);
"handle-get-node-type",
G_CALLBACK(on_service_get_node_type), service_interface);
+ g_signal_connect(service_object,
+ "handle-check-privilege",
+ G_CALLBACK(on_service_check_privilege), service_interface);
+
return TRUE;
}