static gboolean on_zdodev_control_matched_descriptor_req(ZigbeeZdo_dev_control *zdodev_control_object,
GDBusMethodInvocation *invocation,
- gshort node_id,
- gshort profile_id,
- gchar num_in_cl,
+ gushort node_id,
+ gushort profile_id,
+ guchar num_in_cl,
GVariant *in_cl,
- gchar num_out_cl,
+ guchar num_out_cl,
GVariant *out_cl,
gpointer user_data)
{
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 =
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,
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;
/* 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!");
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 =
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,
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;
/* 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!");
NOT_USED(noti_cb_data);
- switch(noti_id) {
+ switch (noti_id) {
case ZBLIB_ZDO_DEV_CONTROL_NOTI_NWK_ADDR_RSP: {
ZigbeeZdoDevControlNwkAddrResp_t *nwk_addr_t =
(ZigbeeZdoDevControlNwkAddrResp_t*)noti_data;
GVariant *v_entries = NULL;
GVariantBuilder *entry_builder =
- g_variant_builder_new (G_VARIANT_TYPE ("a(ayyqyqayy)"));
+ g_variant_builder_new(G_VARIANT_TYPE("a(ayyqyqayy)"));
if (NULL == entry_builder) {
Z_LOGE("Failed to create variant builder!");
break;
}
- for(i = 0; i < desc_t->table_list_count ; i++) {
+ for (i = 0; i < desc_t->table_list_count ; i++) {
GVariantBuilder *eui64_builder =
- g_variant_builder_new (G_VARIANT_TYPE ("ay"));
+ g_variant_builder_new(G_VARIANT_TYPE("ay"));
GVariantBuilder *dest_eui64_builder =
- g_variant_builder_new (G_VARIANT_TYPE ("ay"));
+ g_variant_builder_new(G_VARIANT_TYPE("ay"));
if (NULL == eui64_builder || NULL == dest_eui64_builder) {
Z_LOGE("Failed to create variant builder!");
}
for (v = 0; v < ZIGBEE_EUI64_SIZE; v++) {
- g_variant_builder_add (eui64_builder, "y",
+ g_variant_builder_add(eui64_builder, "y",
desc_t->table_list[i].eui64[v]);
- g_variant_builder_add (dest_eui64_builder, "y",
+ g_variant_builder_add(dest_eui64_builder, "y",
desc_t->table_list[i].dest_eui64[v]);
}
- g_variant_builder_add (entry_builder, "(ayyqyqayy)",
+ g_variant_builder_add(entry_builder, "(ayyqyqayy)",
eui64_builder,
desc_t->table_list[i].source_endpoint,
desc_t->table_list[i].cluster_id,
GVariant *v_entries = NULL;
GVariantBuilder *entry_builder =
- g_variant_builder_new (G_VARIANT_TYPE ("a(ayayyqyyyyy)"));
+ g_variant_builder_new(G_VARIANT_TYPE("a(ayayyqyyyyy)"));
if (NULL == entry_builder) {
Z_LOGE("Failed to create variant builder!");
break;
}
- for(i = 0; i < desc_t->table_list_count ; i++) {
+ for (i = 0; i < desc_t->table_list_count ; i++) {
GVariantBuilder *ext_pan_builder =
- g_variant_builder_new (G_VARIANT_TYPE ("ay"));
+ g_variant_builder_new(G_VARIANT_TYPE("ay"));
GVariantBuilder *eui64_builder =
- g_variant_builder_new (G_VARIANT_TYPE ("ay"));
+ g_variant_builder_new(G_VARIANT_TYPE("ay"));
if (NULL == ext_pan_builder || NULL == eui64_builder) {
Z_LOGE("Failed to create variant builder!");
}
for (v = 0; v < ZIGBEE_EUI64_SIZE; v++) {
- g_variant_builder_add (ext_pan_builder, "y",
+ g_variant_builder_add(ext_pan_builder, "y",
desc_t->table_list[i].extended_pan_id[v]);
- g_variant_builder_add (eui64_builder, "y",
+ g_variant_builder_add(eui64_builder, "y",
desc_t->table_list[i].eui64[v]);
}
- g_variant_builder_add (entry_builder, "(ayayyqyyyyy)",
+ g_variant_builder_add(entry_builder, "(ayayyqyyyyy)",
ext_pan_builder,
eui64_builder,
desc_t->table_list[i].node_id,
GVariant *v_entries = NULL;
GVariantBuilder *entry_builder =
- g_variant_builder_new (G_VARIANT_TYPE ("a(qyyyyq)"));
+ g_variant_builder_new(G_VARIANT_TYPE("a(qyyyyq)"));
if (NULL == entry_builder) {
Z_LOGE("Failed to create variant builder!");
break;
}
- for(i = 0; i < desc_t->table_list_count ; i++) {
- g_variant_builder_add (entry_builder, "(qyyyyq)",
+ for (i = 0; i < desc_t->table_list_count ; i++) {
+ g_variant_builder_add(entry_builder, "(qyyyyq)",
desc_t->table_list[i].dest_addr,
desc_t->table_list[i].status,
desc_t->table_list[i].memory_constrained,
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;
GVariant *v_entries = NULL;
GVariantBuilder *entry_builder =
- g_variant_builder_new (G_VARIANT_TYPE ("a(ayyyyyyy)"));
+ g_variant_builder_new(G_VARIANT_TYPE("a(ayyyyyyy)"));
if (NULL == entry_builder) {
Z_LOGE("Failed to create variant builder!");
break;
}
- for(i = 0; i < nwk_disc_t->table_list_count ; i++) {
+ for (i = 0; i < nwk_disc_t->table_list_count ; i++) {
GVariantBuilder *ext_pan_builder =
- g_variant_builder_new (G_VARIANT_TYPE ("ay"));
+ g_variant_builder_new(G_VARIANT_TYPE("ay"));
if (NULL == ext_pan_builder) {
Z_LOGE("Failed to create variant builder!");
g_variant_builder_unref(entry_builder);
}
for (v = 0; v < ZIGBEE_EUI64_SIZE; v++) {
- g_variant_builder_add (ext_pan_builder, "y",
+ g_variant_builder_add(ext_pan_builder, "y",
nwk_disc_t->table_list[i].extended_pan_id[v]);
}
- g_variant_builder_add (entry_builder, "(ayyyyyyy)",
+ g_variant_builder_add(entry_builder, "(ayyyyyyy)",
ext_pan_builder,
nwk_disc_t->table_list[i].logical_channel,
nwk_disc_t->table_list[i].stack_profile,
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);
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;
}