From: Daniel Wagner <[email protected]>
---
src/manager.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 76 insertions(+), 2 deletions(-)
diff --git a/src/manager.c b/src/manager.c
index 722d621..338326f 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -29,6 +29,10 @@
#include "connman.h"
+connman_bool_t connman_state_idle;
+DBusMessage *session_mode_pending = NULL;
+guint session_mode_watch;
+
static DBusMessage *get_properties(DBusConnection *conn,
DBusMessage *msg, void *data)
{
@@ -92,6 +96,36 @@ static DBusMessage *get_properties(DBusConnection *conn,
return reply;
}
+static void session_mode_owner_disconnect(DBusConnection *conn, void
*user_data)
+{
+ DBG("");
+
+ if (session_mode_watch > 0)
+ g_dbus_remove_watch(conn, session_mode_watch);
+ session_mode_watch = 0;
+
+ session_mode_pending = NULL;
+}
+
+static DBusMessage *session_set_mode(DBusConnection *conn, DBusMessage *msg,
+ connman_bool_t enable)
+{
+ const char *owner;
+
+ __connman_session_set_mode(enable);
+ if (connman_state_idle == TRUE)
+ return msg;
+
+ owner = dbus_message_get_sender(msg);
+
+ session_mode_watch = g_dbus_add_disconnect_watch(conn, owner,
+ session_mode_owner_disconnect, NULL, NULL);
+
+ session_mode_pending = msg;
+
+ return NULL;
+}
+
static DBusMessage *set_property(DBusConnection *conn,
DBusMessage *msg, void *data)
{
@@ -135,7 +169,11 @@ static DBusMessage *set_property(DBusConnection *conn,
dbus_message_iter_get_basic(&value, &sessionmode);
- __connman_session_set_mode(sessionmode);
+ if (session_mode_pending != NULL)
+ return __connman_error_in_progress(msg);
+
+ if (session_set_mode(conn, msg, sessionmode) == NULL)
+ return NULL;
} else
return __connman_error_invalid_property(msg);
@@ -262,10 +300,39 @@ static void technology_notify(enum connman_service_type
type,
technology_reply(0);
}
+static void session_mode_notify(void)
+{
+ DBusMessage *reply;
+
+ if (session_mode_watch > 0)
+ g_dbus_remove_watch(connection, session_mode_watch);
+ session_mode_watch = 0;
+
+ reply = g_dbus_create_reply(session_mode_pending, DBUS_TYPE_INVALID);
+ g_dbus_send_message(connection, reply);
+
+ dbus_message_unref(session_mode_pending);
+ session_mode_pending = NULL;
+}
+
+static void idle_state(connman_bool_t idle)
+{
+
+ DBG("idle %d", idle);
+
+ connman_state_idle = idle;
+
+ if (connman_state_idle == FALSE || session_mode_pending == NULL)
+ return;
+
+ session_mode_notify();
+}
+
static struct connman_notifier technology_notifier = {
.name = "manager",
.priority = CONNMAN_NOTIFIER_PRIORITY_HIGH,
.service_enabled= technology_notify,
+ .idle_state = idle_state,
};
static DBusMessage *enable_technology(DBusConnection *conn,
@@ -630,7 +697,8 @@ static DBusMessage *release_private_network(DBusConnection
*conn,
static GDBusMethodTable manager_methods[] = {
{ "GetProperties", "", "a{sv}", get_properties },
- { "SetProperty", "sv", "", set_property },
+ { "SetProperty", "sv", "", set_property,
+ G_DBUS_METHOD_FLAG_ASYNC },
{ "GetState", "", "s", get_state },
{ "RemoveProvider", "o", "", remove_provider },
{ "RequestScan", "s", "", request_scan },
@@ -682,6 +750,8 @@ int __connman_manager_init(void)
manager_methods,
manager_signals, NULL, NULL, NULL);
+ connman_state_idle = TRUE;
+
return 0;
}
@@ -694,6 +764,10 @@ void __connman_manager_cleanup(void)
if (connection == NULL)
return;
+ if (session_mode_watch > 0)
+ g_dbus_remove_watch(connection, session_mode_watch);
+ session_mode_watch = 0;
+
g_dbus_unregister_interface(connection, CONNMAN_MANAGER_PATH,
CONNMAN_MANAGER_INTERFACE);
--
1.7.6
_______________________________________________
connman mailing list
[email protected]
http://lists.connman.net/listinfo/connman
