notifier: Handle Manager state when exiting online

Service state can transition from online to disconnect like this:
 1) old online - new disconnect/association => association
 2) old association - new disconnect/disconnect => disconnect

Create a separate function for leaving online mode, don't rely on
the previous old_state in service_indicate_state().

Fixes BMC#25073

1 files changed, 10 insertions, 6 deletions

diff --git a/src/notifier.c b/src/notifier.c
index f9905be5..0681aa14 100644
--- a/src/notifier.c
+++ b/src/notifier.c
@@ -171,7 +171,7 @@ void __connman_notifier_connect(enum connman_service_type type)
 		technology_connected(type, TRUE);
 }
 
-void __connman_notifier_online(enum connman_service_type type)
+void __connman_notifier_enter_online(enum connman_service_type type)
 {
 	DBG("type %d", type);
 
@@ -179,8 +179,15 @@ void __connman_notifier_online(enum connman_service_type type)
 		state_changed();
 }
 
-void __connman_notifier_disconnect(enum connman_service_type type,
-					enum connman_service_state old_state)
+void __connman_notifier_leave_online(enum connman_service_type type)
+{
+	DBG("type %d", type);
+
+	if (__sync_fetch_and_sub(&online[type], 1) == 1)
+		state_changed();
+}
+
+void __connman_notifier_disconnect(enum connman_service_type type)
 {
 	DBG("type %d", type);
 
@@ -205,9 +212,6 @@ void __connman_notifier_disconnect(enum connman_service_type type,
 		break;
 	}
 
-	if (old_state == CONNMAN_SERVICE_STATE_ONLINE)
-		__sync_fetch_and_sub(&online[type], 1);
-
 	if (__sync_fetch_and_sub(&connected[type], 1) != 1)
 		return;