Added new dbus to check is softap enabled

Change-Id: Ia00b1aab5d4d46012372f2cbe53eb67fedfa8a59
Signed-off-by: Saurav Babu <saurav.babu@samsung.com>

diff --git a/include/wmesh-request.h b/include/wmesh-request.h
index 3c625c0..61c30b4 100644 (file)
--- a/include/wmesh-request.h
+++ b/include/wmesh-request.h
@@ -66,6 +66,7 @@ int wmesh_request_enable_softap(
                const char* bridge_interface, const char* softap_interface);
 int wmesh_request_disable_softap(
                const char* bridge_interface, const char* softap_interface);
+bool wmesh_request_check_softap_status();
 
 /* Mesh Station & path */
 int wmesh_request_get_station_info(const char* mesh_interface, GList **station_list);

diff --git a/include/wmesh-softap.h b/include/wmesh-softap.h
index cb62828..bd86df7 100644 (file)
--- a/include/wmesh-softap.h
+++ b/include/wmesh-softap.h
@@ -31,6 +31,7 @@ int wmesh_softap_get_configuration(char **softap_interface, char **ssid,
                int *max_sta, int *security, char **passphrase);
 int wmesh_softap_enable_softap();
 int wmesh_softap_disable_softap();
+bool wmesh_softap_check_softap_status();
 
 #ifdef __cplusplus
 }

diff --git a/introspection/wmesh.xml b/introspection/wmesh.xml
index c3391b3..a91ba7e 100644 (file)
--- a/introspection/wmesh.xml
+++ b/introspection/wmesh.xml
@@ -85,6 +85,9 @@
                <method name="disable_softap">\r
                        <arg type="i" name="result" direction="out"/>\r
                </method>\r
+               <method name="is_softap_enabled">\r
+                       <arg type="b" name="status" direction="out"/>\r
+               </method>\r
                <method name="create_mesh_network">\r
                        <arg type="s" name="mesh_id" direction="in"/>\r
                        <arg type="i" name="channel" direction="in"/>\r

diff --git a/src/wmesh-request.c b/src/wmesh-request.c
index 854b372..c4126dd 100644 (file)
--- a/src/wmesh-request.c
+++ b/src/wmesh-request.c
@@ -235,6 +235,13 @@ int wmesh_request_disable_softap(
        return ret;
 }
 
+bool wmesh_request_check_softap_status()
+{
+       WMESH_LOGD("Check softAp status");
+
+       return  wmesh_softap_check_softap_status();
+}
+
 int wmesh_request_get_station_info(const char* mesh_interface, GList **station_list)
 {
        int ret = WMESHD_ERROR_NONE;

diff --git a/src/wmesh-service-interface.c b/src/wmesh-service-interface.c
index 6e52253..7eac245 100644 (file)
--- a/src/wmesh-service-interface.c
+++ b/src/wmesh-service-interface.c
@@ -721,6 +721,21 @@ static gboolean _wmeshd_dbus_handle_disable_softap(NetWmesh *object,
        return TRUE;
 }
 
+static gboolean _wmeshd_dbus_handle_is_softap_enabled(NetWmesh *object,
+               GDBusMethodInvocation *invocation, gpointer user_data)
+{
+       bool status;
+       (void) user_data;
+
+       /* Check SoftAP status */
+       status = wmesh_request_check_softap_status();
+       WMESH_LOGD("SoftAP is %s", status ? "enabled" : "disabled");
+
+       net_wmesh_complete_is_softap_enabled(object, invocation, status);
+
+       return TRUE;
+}
+
 static gboolean _wmeshd_dbus_handle_create_mesh_network(NetWmesh *object,
                GDBusMethodInvocation *invocation,
                gchar *mesh_id, gint channel, gint security,
@@ -1166,6 +1181,8 @@ static void _wmeshd_dbus_on_bus_acquired(GDBusConnection *conn, const gchar *nam
                        G_CALLBACK(_wmeshd_dbus_handle_enable_softap), service);
        g_signal_connect(meshd_dbus_object, "handle-disable-softap",
                        G_CALLBACK(_wmeshd_dbus_handle_disable_softap), service);
+       g_signal_connect(meshd_dbus_object, "handle-is-softap-enabled",
+                       G_CALLBACK(_wmeshd_dbus_handle_is_softap_enabled), NULL);
        g_signal_connect(meshd_dbus_object, "handle-create-mesh-network",
                        G_CALLBACK(_wmeshd_dbus_handle_create_mesh_network), service);
        g_signal_connect(meshd_dbus_object, "handle-connect-mesh-network",

diff --git a/src/wmesh-softap.c b/src/wmesh-softap.c
index 194ef7b..eb8198a 100644 (file)
--- a/src/wmesh-softap.c
+++ b/src/wmesh-softap.c
@@ -475,3 +475,22 @@ int wmesh_softap_disable_softap()
 
        return ret;
 }
+
+bool wmesh_softap_check_softap_status()
+{
+       int ret = WMESHD_ERROR_NONE;
+       pid_t hostapd_pid = 0;
+
+       ret = __get_pid_of_hostapd(&hostapd_pid);
+       if (ret != WMESHD_ERROR_NONE) {
+               WMESH_LOGE("hostapd is not running");
+               return false;
+       }
+
+       if (hostapd_pid == 0) {
+               WMESH_LOGD("hostapd is not running");
+               return false;
+       }
+
+       return true;
+}