Fix mismatched function call

diff --git a/include/mesh-gdbus.h b/include/mesh-gdbus.h
index 343b5ff..eed8fe9 100644 (file)
--- a/include/mesh-gdbus.h
+++ b/include/mesh-gdbus.h
@@ -45,9 +45,9 @@ int mesh_gdbus_mesh_scan(mesh_service *service);
 int mesh_gdbus_mesh_specific_scan(mesh_service *service, gchar *mesh_id,
         gint channel);
 int mesh_gdbus_mesh_cancel_scan(mesh_service *service);
-int mesh_gdbus_get_mesh_peers(mesh_service *service);
-int mesh_gdbus_get_connected_peers(mesh_service *service);
+int mesh_gdbus_get_mesh_networks(mesh_service *service);
 int mesh_gdbus_get_joined_mesh_network(mesh_service *service);
+int mesh_gdbus_get_connected_peers(mesh_service *service);
 
 int mesh_gdbus_create_network(mesh_service *service, gchar *mesh_id,
         gint channel, meshd_security_type_e sec);

diff --git a/include/mesh-request.h b/include/mesh-request.h
index 4cc97ed..f4d8d61 100644 (file)
--- a/include/mesh-request.h
+++ b/include/mesh-request.h
@@ -26,8 +26,9 @@ int mesh_request_scan(mesh_service *service);
 int mesh_request_specific_scan(mesh_service *service, gchar *mesh_id,
         gint channel);
 int mesh_request_cancel_scan(mesh_service *service);
-int mesh_request_get_peers(mesh_service *service);
+int mesh_request_get_networks(mesh_service *service);
 int mesh_request_get_joined_network(mesh_service *service);
+int mesh_request_get_connected_peers(mesh_service *service);
 
 int mesh_request_create_mesh_network(mesh_service *service, gchar *mesh_id,
                gint channel, meshd_security_type_e sec);

diff --git a/src/mesh-gdbus.c b/src/mesh-gdbus.c
index 93e3a7a..e634c48 100644 (file)
--- a/src/mesh-gdbus.c
+++ b/src/mesh-gdbus.c
@@ -770,7 +770,7 @@ static void _get_connected_mesh_peers(mesh_service *service, GVariant *variant)
        g_variant_iter_free(peer);
 }
 
-int mesh_gdbus_get_mesh_peers(mesh_service *service)
+int mesh_gdbus_get_mesh_networks(mesh_service *service)
 {
        GVariant *variant = NULL;
        GError *error = NULL;
@@ -807,7 +807,7 @@ int mesh_gdbus_get_mesh_peers(mesh_service *service)
        return MESHD_ERROR_NONE;
 }
 
-int mesh_gdbus_get_connected_peers(mesh_service *service)
+int mesh_gdbus_get_joined_mesh_network(mesh_service *service)
 {
        GVariant *variant = NULL;
        GError *error = NULL;
@@ -818,23 +818,21 @@ int mesh_gdbus_get_connected_peers(mesh_service *service)
        meshd_check_null_ret_error("_gproxy_connman",
                        _gproxy_connman, MESHD_ERROR_IO_ERROR);
 
-       variant = g_dbus_proxy_call_sync(_gproxy_connman, "GetConnectedMeshPeers",
+       variant = g_dbus_proxy_call_sync(_gproxy_connman, "GetMeshPeers",
                                NULL,
                                G_DBUS_CALL_FLAGS_NONE,
                                -1, NULL, &error);
        if (variant) {
-               MESH_LOGD("Successfully requested. [GetConnectedMeshPeers]");
+               MESH_LOGD("Successfully requested. [GetMeshPeers]");
 
-               if (service->connected_mesh_peers) {
-                       g_list_free_full(service->connected_mesh_peers, _on_peer_info_destroy);
-                       service->connected_mesh_peers = NULL;
+               if (service->joined_network) {
+                       g_free(service->joined_network->mesh_id);
+                       g_free(service->joined_network->bssid);
+                       g_free(service->joined_network);
+                       service->joined_network = NULL;
                }
 
-               _get_connected_mesh_peers(service, variant);
-
-               /* List item is saved with reversed order for efficiency. */
-               service->connected_mesh_peers =
-                               g_list_reverse(service->connected_mesh_peers);
+               _get_joined_network(service, variant);
        } else if (error) {
                MESH_LOGE("Failed DBus call [%s]", error->message);
                g_error_free(error);
@@ -844,7 +842,7 @@ int mesh_gdbus_get_connected_peers(mesh_service *service)
        return MESHD_ERROR_NONE;
 }
 
-int mesh_gdbus_get_joined_mesh_network(mesh_service *service)
+int mesh_gdbus_get_connected_peers(mesh_service *service)
 {
        GVariant *variant = NULL;
        GError *error = NULL;
@@ -855,21 +853,23 @@ int mesh_gdbus_get_joined_mesh_network(mesh_service *service)
        meshd_check_null_ret_error("_gproxy_connman",
                        _gproxy_connman, MESHD_ERROR_IO_ERROR);
 
-       variant = g_dbus_proxy_call_sync(_gproxy_connman, "GetMeshPeers",
+       variant = g_dbus_proxy_call_sync(_gproxy_connman, "GetConnectedMeshPeers",
                                NULL,
                                G_DBUS_CALL_FLAGS_NONE,
                                -1, NULL, &error);
        if (variant) {
-               MESH_LOGD("Successfully requested. [GetMeshPeers]");
+               MESH_LOGD("Successfully requested. [GetConnectedMeshPeers]");
 
-               if (service->joined_network) {
-                       g_free(service->joined_network->mesh_id);
-                       g_free(service->joined_network->bssid);
-                       g_free(service->joined_network);
-                       service->joined_network = NULL;
+               if (service->connected_mesh_peers) {
+                       g_list_free_full(service->connected_mesh_peers, _on_peer_info_destroy);
+                       service->connected_mesh_peers = NULL;
                }
 
-               _get_joined_network(service, variant);
+               _get_connected_mesh_peers(service, variant);
+
+               /* List item is saved with reversed order for efficiency. */
+               service->connected_mesh_peers =
+                               g_list_reverse(service->connected_mesh_peers);
        } else if (error) {
                MESH_LOGE("Failed DBus call [%s]", error->message);
                g_error_free(error);

diff --git a/src/mesh-request.c b/src/mesh-request.c
index 9749933..103235c 100644 (file)
--- a/src/mesh-request.c
+++ b/src/mesh-request.c
@@ -374,7 +374,7 @@ int mesh_request_cancel_scan(mesh_service *service)
        return MESHD_ERROR_NONE;
 }
 
-int mesh_request_get_peers(mesh_service *service)
+int mesh_request_get_networks(mesh_service *service)
 {
        int ret;
        if (NULL == service) {
@@ -382,11 +382,11 @@ int mesh_request_get_peers(mesh_service *service)
                return MESHD_ERROR_INVALID_PARAMETER;
        }
 
-       MESH_LOGD("[IPC] Get mesh peers");
+       MESH_LOGD("[IPC] Get mesh networks");
 
-       ret = mesh_gdbus_get_mesh_peers(service);
+       ret = mesh_gdbus_get_mesh_networks(service);
        if(MESHD_ERROR_NONE != ret) {
-               MESH_LOGE("Failed to get mesh peers");
+               MESH_LOGE("Failed to get mesh networks !");
                return ret;
        }
 
@@ -446,6 +446,26 @@ int mesh_request_get_joined_network(mesh_service *service)
        return MESHD_ERROR_NONE;
 }
 
+int mesh_request_get_connected_peers(mesh_service *service)
+{
+       int ret;
+
+       if (NULL == service) {
+               MESH_LOGE("Invalid parameter");
+               return MESHD_ERROR_INVALID_PARAMETER;
+       }
+
+       MESH_LOGD("[IPC] Get connected mesh peers");
+
+       ret = mesh_gdbus_get_connected_peers(service);
+       if(MESHD_ERROR_NONE != ret) {
+               MESH_LOGE("Failed to get connected mesh peers");
+               return ret;
+       }
+
+       return MESHD_ERROR_NONE;
+}
+
 int mesh_request_create_mesh_network(mesh_service *service, gchar *mesh_id,
                gint channel, meshd_security_type_e sec)
 {

diff --git a/src/mesh-service-interface.c b/src/mesh-service-interface.c
index 31331ca..a192bba 100644 (file)
--- a/src/mesh-service-interface.c
+++ b/src/mesh-service-interface.c
@@ -317,9 +317,9 @@ static gboolean _meshd_dbus_handle_get_found_mesh_networks(NetMesh *object,
 
        MESH_LOGD("Request to get scanned mesh network list");
 
-       ret = mesh_request_get_peers(service);
+       ret = mesh_request_get_networks(service);
        if (MESHD_ERROR_NONE != ret)
-               MESH_LOGE("Failed to mesh_request_get_peers");
+               MESH_LOGE("Failed to mesh_request_get_networks");
 
        g_variant_builder_init(&builder, G_VARIANT_TYPE("aa{sv}"));
 
@@ -416,7 +416,7 @@ static gboolean _meshd_dbus_handle_get_joined_mesh_network(NetMesh *object,
        mesh_service *service = (mesh_service *)user_data;
        mesh_network_info_s *joined = NULL;
 
-       ret = mesh_request_get_peers(service);
+       ret = mesh_request_get_networks(service);
        if (MESHD_ERROR_NONE == ret) {
                joined = service->joined_network;
                if (joined) {
@@ -450,9 +450,9 @@ static gboolean _meshd_dbus_handle_get_connected_peers(NetMesh *object,
 
        MESH_LOGD("Request to get connected peers");
 
-       ret = mesh_request_get_peers(service);
+       ret = mesh_request_get_connected_peers(service);
        if (MESHD_ERROR_NONE != ret)
-               MESH_LOGE("Failed to mesh_request_get_peers");
+               MESH_LOGE("Failed to mesh_request_get_connected_peers");
        g_variant_builder_init(&builder, G_VARIANT_TYPE("aa{sv}"));
 
        iter = service->connected_mesh_peers;