---
src/session.c | 97 ++++++++++++++++++++++++++------------------------------
1 files changed, 45 insertions(+), 52 deletions(-)
diff --git a/src/session.c b/src/session.c
index 80e1073..dc0fe46 100644
--- a/src/session.c
+++ b/src/session.c
@@ -102,7 +102,6 @@ struct connman_session {
guint notify_watch;
connman_bool_t append_all;
- connman_bool_t info_dirty;
struct session_info *info;
struct session_info *info_last;
@@ -483,7 +482,35 @@ static void append_notify(DBusMessageIter *dict,
}
session->append_all = FALSE;
- session->info_dirty = FALSE;
+}
+
+static connman_bool_t compute_notifiable_changes(struct connman_session
*session)
+{
+ struct session_info *info_last = session->info_last;
+ struct session_info *info = session->info;
+
+ if (session->append_all == TRUE)
+ return TRUE;
+
+ if (info->state != info_last->state)
+ return TRUE;
+
+ if (info->entry != info_last->entry &&
+ info->state >= CONNMAN_SESSION_STATE_CONNECTED)
+ return TRUE;
+
+ if (info->periodic_connect != info_last->periodic_connect ||
+ info->allowed_bearers != info_last->allowed_bearers ||
+ info->avoid_handover != info_last->avoid_handover ||
+ info->stay_connected != info_last->stay_connected ||
+ info->roaming_policy != info_last->roaming_policy ||
+ info->idle_timeout != info_last->idle_timeout ||
+ info->priority != info_last->priority ||
+ info->marker != info_last->marker ||
+ info->ecall != info_last->ecall)
+ return TRUE;
+
+ return FALSE;
}
static gboolean session_notify(gpointer user_data)
@@ -492,8 +519,8 @@ static gboolean session_notify(gpointer user_data)
DBusMessage *msg;
DBusMessageIter array, dict;
- if (session->info_dirty == FALSE)
- return 0;
+ if (compute_notifiable_changes(session) == FALSE)
+ return FALSE;
DBG("session %p owner %s notify_path %s", session,
session->owner, session->notify_path);
@@ -874,7 +901,7 @@ static gboolean call_connect(gpointer user_data)
return FALSE;
}
-static connman_bool_t deselect_service(struct session_info *info)
+static void deselect_service(struct session_info *info)
{
struct service_entry *entry;
connman_bool_t disconnect, online;
@@ -882,7 +909,7 @@ static connman_bool_t deselect_service(struct session_info
*info)
DBG("");
if (info->entry == NULL)
- return FALSE;
+ return;
disconnect = explicit_disconnect(info);
@@ -899,8 +926,6 @@ static connman_bool_t deselect_service(struct session_info
*info)
if (disconnect == TRUE && online == TRUE)
pending_timeout_add(0, call_disconnect, entry);
-
- return TRUE;
}
static void deselect_and_disconnect(struct connman_session *session,
@@ -908,12 +933,13 @@ static void deselect_and_disconnect(struct
connman_session *session,
{
struct session_info *info = session->info;
- session->info_dirty |= deselect_service(info);
+ deselect_service(info);
info->reason = reason;
+ session->info_last->entry = NULL;
}
-static connman_bool_t select_connected_service(struct session_info *info,
+static void select_connected_service(struct session_info *info,
struct service_entry *entry)
{
info->state = service_to_session_state(entry->state);
@@ -922,18 +948,16 @@ static connman_bool_t select_connected_service(struct
session_info *info,
info->entry->reason = info->reason;
if (explicit_connect(info->reason) == FALSE)
- return TRUE;
+ return;
__connman_service_session_inc(info->entry->service);
-
- return TRUE;
}
-static connman_bool_t select_offline_service(struct session_info *info,
+static void select_offline_service(struct session_info *info,
struct service_entry *entry)
{
if (explicit_connect(info->reason) == FALSE)
- return FALSE;
+ return;
info->state = service_to_session_state(entry->state);
@@ -942,19 +966,17 @@ static connman_bool_t select_offline_service(struct
session_info *info,
__connman_service_session_inc(info->entry->service);
pending_timeout_add(0, call_connect, entry);
-
- return TRUE;
}
-static connman_bool_t select_service(struct session_info *info,
+static void select_service(struct session_info *info,
struct service_entry *entry)
{
DBG("service %p", entry->service);
if (is_connected(entry->state) == TRUE)
- return select_connected_service(info, entry);
+ select_connected_service(info, entry);
else
- return select_offline_service(info, entry);
+ select_offline_service(info, entry);
}
static void select_and_connect(struct connman_session *session,
@@ -980,8 +1002,7 @@ static void select_and_connect(struct connman_session
*session,
case CONNMAN_SERVICE_STATE_ONLINE:
case CONNMAN_SERVICE_STATE_IDLE:
case CONNMAN_SERVICE_STATE_DISCONNECT:
- session->info_dirty |=
- select_service(info, entry);
+ select_service(info, entry);
return;
case CONNMAN_SERVICE_STATE_UNKNOWN:
case CONNMAN_SERVICE_STATE_FAILURE:
@@ -1081,11 +1102,8 @@ static void session_changed(struct connman_session
*session,
DBG("session %p trigger %s reason %s", session, trigger2string(trigger),
reason2string(info->reason));
- if (info->entry != NULL) {
+ if (info->entry != NULL)
info->state = service_to_session_state(info->entry->state);
- if (info_last->state != info->state)
- session->info_dirty = TRUE;
- }
switch (trigger) {
case CONNMAN_SESSION_TRIGGER_UNKNOWN:
@@ -1236,7 +1254,6 @@ static void update_ecall_sessions(struct connman_session
*session)
continue;
session_iter->info->ecall = info->ecall;
- session_iter->info_dirty = TRUE;
session_changed(session_iter, CONNMAN_SESSION_TRIGGER_ECALL);
}
@@ -1266,7 +1283,6 @@ static void update_ecall(struct connman_session *session)
update_ecall_sessions(session);
- session->info_dirty = TRUE;
return;
err:
@@ -1279,7 +1295,6 @@ static DBusMessage *change_session(DBusConnection *conn,
{
struct connman_session *session = user_data;
struct session_info *info = session->info;
- struct session_info *info_last = session->info_last;
DBusMessageIter iter, value;
const char *name;
GSList *allowed_bearers;
@@ -1309,8 +1324,6 @@ static DBusMessage *change_session(DBusConnection *conn,
}
info->allowed_bearers = allowed_bearers;
-
- session->info_dirty = TRUE;
} else {
goto err;
}
@@ -1319,21 +1332,12 @@ static DBusMessage *change_session(DBusConnection *conn,
if (g_str_equal(name, "Priority") == TRUE) {
dbus_message_iter_get_basic(&value,
&info->priority);
-
- if (info_last->priority != info->priority)
- session->info_dirty = TRUE;
} else if (g_str_equal(name, "AvoidHandover") == TRUE) {
dbus_message_iter_get_basic(&value,
&info->avoid_handover);
-
- if (info_last->avoid_handover != info->avoid_handover)
- session->info_dirty = TRUE;
} else if (g_str_equal(name, "StayConnected") == TRUE) {
dbus_message_iter_get_basic(&value,
&info->stay_connected);
-
- if (info_last->stay_connected != info->stay_connected)
- session->info_dirty = TRUE;
} else if (g_str_equal(name, "EmergencyCall") == TRUE) {
dbus_message_iter_get_basic(&value,
&info->ecall);
@@ -1347,15 +1351,9 @@ static DBusMessage *change_session(DBusConnection *conn,
if (g_str_equal(name, "PeriodicConnect") == TRUE) {
dbus_message_iter_get_basic(&value,
&info->periodic_connect);
-
- if (info_last->periodic_connect !=
info->periodic_connect)
- session->info_dirty = TRUE;
} else if (g_str_equal(name, "IdleTimeout") == TRUE) {
dbus_message_iter_get_basic(&value,
&info->idle_timeout);
-
- if (info_last->idle_timeout != info->idle_timeout)
- session->info_dirty = TRUE;
} else {
goto err;
}
@@ -1366,9 +1364,6 @@ static DBusMessage *change_session(DBusConnection *conn,
dbus_message_iter_get_basic(&value, &val);
info->roaming_policy =
string2roamingpolicy(val);
-
- if (info_last->roaming_policy != info->roaming_policy)
- session->info_dirty = TRUE;
} else {
goto err;
}
@@ -1377,8 +1372,7 @@ static DBusMessage *change_session(DBusConnection *conn,
goto err;
}
- if (session->info_dirty == TRUE)
- session_changed(session, CONNMAN_SESSION_TRIGGER_SETTING);
+ session_changed(session, CONNMAN_SESSION_TRIGGER_SETTING);
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
@@ -1665,7 +1659,6 @@ int __connman_session_create(DBusMessage *msg)
info_last->marker = info->marker;
info_last->allowed_bearers = info->allowed_bearers;
- session->info_dirty = TRUE;
session->append_all = TRUE;
session_changed(session, CONNMAN_SESSION_TRIGGER_SETTING);
--
1.7.8.3
_______________________________________________
connman mailing list
[email protected]
http://lists.connman.net/listinfo/connman
