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

diff --git a/src/connman.h b/src/connman.h
index 317af708c63548e0ffbf7145c9bf89cb8b497e63..97e5437fb7105eebe701f55bb200ecf9d1cdff6d 100644 (file)
--- a/src/connman.h
+++ b/src/connman.h
@@ -692,10 +692,10 @@ void __connman_notifier_cleanup(void);
 void __connman_notifier_service_add(struct connman_service *service,
                                        const char *name);
 void __connman_notifier_service_remove(struct connman_service *service);
-void __connman_notifier_online(enum connman_service_type type);
+void __connman_notifier_enter_online(enum connman_service_type type);
+void __connman_notifier_leave_online(enum connman_service_type type);
 void __connman_notifier_connect(enum connman_service_type type);
-void __connman_notifier_disconnect(enum connman_service_type type,
-                                       enum connman_service_state old_state);
+void __connman_notifier_disconnect(enum connman_service_type type);
 void __connman_notifier_offlinemode(connman_bool_t enabled);
 void __connman_notifier_default_changed(struct connman_service *service);
 void __connman_notifier_proxy_changed(struct connman_service *service);

diff --git a/src/notifier.c b/src/notifier.c
index f9905be5dc8b28ead2513e4c1e12ab9fa6531bc7..0681aa14f059c92a53c9b360b6c401b1a846fc56 100644 (file)
--- 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;
 

diff --git a/src/service.c b/src/service.c
index 2219a013a7eb93a08af6c20d590de1b8c409644b..c710ff8abd5a07642fa41b978109d6aa96e071cd 100644 (file)
--- a/src/service.c
+++ b/src/service.c
@@ -4530,6 +4530,9 @@ static int service_indicate_state(struct connman_service *service)
                        __connman_service_auto_connect();
        }
 
+       if (old_state == CONNMAN_SERVICE_STATE_ONLINE)
+               __connman_notifier_leave_online(service->type);
+
        service->state = new_state;
        state_changed(service);
 
@@ -4640,7 +4643,7 @@ static int service_indicate_state(struct connman_service *service)
                dns_changed(service);
                domain_changed(service);
 
-               __connman_notifier_disconnect(service->type, old_state);
+               __connman_notifier_disconnect(service->type);
 
                /*
                 * Previous services which are connected and which states
@@ -4671,7 +4674,7 @@ static int service_indicate_state(struct connman_service *service)
        __connman_connection_update_gateway();
 
        if (new_state == CONNMAN_SERVICE_STATE_ONLINE) {
-               __connman_notifier_online(service->type);
+               __connman_notifier_enter_online(service->type);
                default_changed();
        }