Move mesh peer monitoring service from 'enable' to 'enable_mesh'

Signed-off-by: saerome.kim <saerome.kim@samsung.com>

diff --git a/src/mesh-monitor.c b/src/mesh-monitor.c
index da7a688..ac5b0de 100644 (file)
--- a/src/mesh-monitor.c
+++ b/src/mesh-monitor.c
@@ -74,7 +74,6 @@ static int _get_station_info(void *pdata)
        iter = service->station_list;
        while (iter) {
                mesh_station_info_s *item = (mesh_station_info_s*)iter->data;
-               MESH_LOGE("KSR1 : [%s]", item->bssid);
                iter = g_list_next(iter);
        }
 
@@ -120,7 +119,6 @@ static int _get_station_info(void *pdata)
        iter = service->station_list;
        while (iter) {
                mesh_station_info_s *item2 = (mesh_station_info_s*)iter->data;
-               MESH_LOGE("KSR2 : [%s]", item2->bssid);
                iter = g_list_next(iter);
        }
 

diff --git a/src/mesh-service-interface.c b/src/mesh-service-interface.c
index 9bdce7b..eb771d0 100644 (file)
--- a/src/mesh-service-interface.c
+++ b/src/mesh-service-interface.c
@@ -27,6 +27,7 @@
 #include "mesh-util.h"
 #include "mesh-gdbus.h"
 #include "mesh-service.h"
+#include "mesh-monitor.h"
 #include "mesh-service-interface.h"
 #include "mesh-generated-code.h"
 
@@ -378,6 +379,9 @@ static gboolean _meshd_dbus_handle_enable_mesh(NetMesh *object,
                MESH_LOGE("Failed to mesh_request_set_mesh_gate [%d]", ret);
 #endif
 
+       if (MESHD_ERROR_NONE == ret)
+               mesh_start_peer_monitor(service);
+
        net_mesh_complete_enable_mesh(object, invocation, ret);
 
        return TRUE;
@@ -404,6 +408,9 @@ static gboolean _meshd_dbus_handle_disable_mesh(NetMesh *object,
        if (MESHD_ERROR_NONE != ret)
                MESH_LOGE("Failed to disable mesh network !");
 
+       /* Stop Mesh Node Monitoring Service */
+       mesh_stop_peer_monitor(service);
+
        /* Make response */
        net_mesh_complete_disable_mesh(object, invocation, ret);
 

diff --git a/src/mesh-service.c b/src/mesh-service.c
index fc74c75..8ca577b 100644 (file)
--- a/src/mesh-service.c
+++ b/src/mesh-service.c
@@ -22,7 +22,6 @@
 #include "mesh-log.h"
 #include "mesh-util.h"
 #include "mesh-service.h"
-#include "mesh-monitor.h"
 
 mesh_service *meshd_service_new()
 {
@@ -56,8 +55,6 @@ gboolean meshd_service_run(mesh_service *service)
 {
        meshd_check_null_ret_error("service", service, FALSE);
        meshd_check_null_ret_error("service->main_loop", service->main_loop, FALSE);
-       /* Start Mesh Node Monitoring Service */
-       mesh_start_peer_monitor(service);
 
        g_main_loop_run(service->main_loop);
 
@@ -68,8 +65,6 @@ gboolean meshd_service_exit(mesh_service *service)
 {
        meshd_check_null_ret_error("service", service, FALSE);
        meshd_check_null_ret_error("service->main_loop", service->main_loop, FALSE);
-       /* Stop Mesh Node Monitoring Service */
-       mesh_stop_peer_monitor(service);
 
        g_main_loop_quit(service->main_loop);