X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fnotifier.c;h=b328a2adbfaae03f371739324d30893fc51c759b;hb=89077bfd2abf7984027552c8cee223a0c6dab57c;hp=2403e91927048c4adb9d3a4005eff59c7010fb8d;hpb=8bdd2e999bd2466908224a2e53b0b9ef77c52c90;p=framework%2Fconnectivity%2Fconnman.git diff --git a/src/notifier.c b/src/notifier.c index 2403e91..b328a2a 100644 --- a/src/notifier.c +++ b/src/notifier.c @@ -2,7 +2,7 @@ * * Connection Manager * - * Copyright (C) 2007-2009 Intel Corporation. All rights reserved. + * Copyright (C) 2007-2012 Intel Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -30,6 +30,9 @@ static DBusConnection *connection = NULL; static GSList *notifier_list = NULL; +static GHashTable *service_hash = NULL; + +static const char *notifier_state; static gint compare_priority(gconstpointer a, gconstpointer b) { @@ -70,191 +73,91 @@ void connman_notifier_unregister(struct connman_notifier *notifier) notifier_list = g_slist_remove(notifier_list, notifier); } -static const char *type2string(enum connman_service_type type) -{ - switch (type) { - case CONNMAN_SERVICE_TYPE_UNKNOWN: - break; - case CONNMAN_SERVICE_TYPE_ETHERNET: - return "ethernet"; - case CONNMAN_SERVICE_TYPE_WIFI: - return "wifi"; - case CONNMAN_SERVICE_TYPE_WIMAX: - return "wimax"; - case CONNMAN_SERVICE_TYPE_BLUETOOTH: - return "bluetooth"; - case CONNMAN_SERVICE_TYPE_CELLULAR: - return "cellular"; - } - - return NULL; -} - #define MAX_TECHNOLOGIES 10 -static volatile gint registered[MAX_TECHNOLOGIES]; -static volatile gint enabled[MAX_TECHNOLOGIES]; -static volatile gint connected[MAX_TECHNOLOGIES]; +static int connected[MAX_TECHNOLOGIES]; +static int online[MAX_TECHNOLOGIES]; -void __connman_notifier_list_registered(DBusMessageIter *iter) +static connman_bool_t notifier_is_online(void) { - int i; + unsigned int i; - for (i = 0; i < 10; i++) { - const char *type = type2string(i); - - if (type == NULL) - continue; - - if (g_atomic_int_get(®istered[i]) > 0) - dbus_message_iter_append_basic(iter, - DBUS_TYPE_STRING, &type); + __sync_synchronize(); + for (i = 0; i < MAX_TECHNOLOGIES; i++) { + if (online[i] > 0) + return TRUE; } + + return FALSE; } -void __connman_notifier_list_enabled(DBusMessageIter *iter) +connman_bool_t __connman_notifier_is_connected(void) { - int i; + unsigned int i; - for (i = 0; i < 10; i++) { - const char *type = type2string(i); - - if (type == NULL) - continue; - - if (g_atomic_int_get(&enabled[i]) > 0) - dbus_message_iter_append_basic(iter, - DBUS_TYPE_STRING, &type); + __sync_synchronize(); + for (i = 0; i < MAX_TECHNOLOGIES; i++) { + if (connected[i] > 0) + return TRUE; } + + return FALSE; } -void __connman_notifier_list_connected(DBusMessageIter *iter) +static const char *evaluate_notifier_state(void) { - int i; + if (notifier_is_online() == TRUE) + return "online"; - for (i = 0; i < 10; i++) { - const char *type = type2string(i); + if (__connman_notifier_is_connected() == TRUE) + return "ready"; - if (type == NULL) - continue; + if ( __connman_technology_get_offlinemode() == TRUE) + return "offline"; - if (g_atomic_int_get(&connected[i]) > 0) - dbus_message_iter_append_basic(iter, - DBUS_TYPE_STRING, &type); - } + return "idle"; } -static void technology_registered(enum connman_service_type type, - connman_bool_t registered) +const char *__connman_notifier_get_state(void) { - DBusMessage *signal; - DBusMessageIter entry, value, iter; - const char *key = "AvailableTechnologies"; - - DBG("type %d registered %d", type, registered); - - signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH, - CONNMAN_MANAGER_INTERFACE, "PropertyChanged"); - if (signal == NULL) - return; - - dbus_message_iter_init_append(signal, &entry); - - dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key); - - dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT, - DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_STRING_AS_STRING, - &value); - - dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY, - DBUS_TYPE_STRING_AS_STRING, &iter); - __connman_notifier_list_registered(&iter); - dbus_message_iter_close_container(&value, &iter); - - dbus_message_iter_close_container(&entry, &value); - - g_dbus_send_message(connection, signal); + return notifier_state; } -static void technology_enabled(enum connman_service_type type, - connman_bool_t enabled) +static void state_changed(void) { - GSList *list; - DBusMessage *signal; - DBusMessageIter entry, value, iter; - const char *key = "EnabledTechnologies"; - - DBG("type %d enabled %d", type, enabled); - - signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH, - CONNMAN_MANAGER_INTERFACE, "PropertyChanged"); - if (signal == NULL) - goto done; + const char *state; - dbus_message_iter_init_append(signal, &entry); + state = evaluate_notifier_state(); - dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key); - - dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT, - DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_STRING_AS_STRING, - &value); - - dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY, - DBUS_TYPE_STRING_AS_STRING, &iter); - __connman_notifier_list_enabled(&iter); - dbus_message_iter_close_container(&value, &iter); - - dbus_message_iter_close_container(&entry, &value); - - g_dbus_send_message(connection, signal); + if (g_strcmp0(state, notifier_state) == 0) + return; -done: - for (list = notifier_list; list; list = list->next) { - struct connman_notifier *notifier = list->data; + notifier_state = state; - if (notifier->service_enabled) - notifier->service_enabled(type, enabled); - } + connman_dbus_property_changed_basic(CONNMAN_MANAGER_PATH, + CONNMAN_MANAGER_INTERFACE, "State", + DBUS_TYPE_STRING, ¬ifier_state); } static void technology_connected(enum connman_service_type type, connman_bool_t connected) { - DBusMessage *signal; - DBusMessageIter entry, value, iter; - const char *key = "ConnectedTechnologies"; - DBG("type %d connected %d", type, connected); - signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH, - CONNMAN_MANAGER_INTERFACE, "PropertyChanged"); - if (signal == NULL) - return; - - dbus_message_iter_init_append(signal, &entry); - - dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key); - - dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT, - DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_STRING_AS_STRING, - &value); - - dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY, - DBUS_TYPE_STRING_AS_STRING, &iter); - __connman_notifier_list_connected(&iter); - dbus_message_iter_close_container(&value, &iter); - - dbus_message_iter_close_container(&entry, &value); - - g_dbus_send_message(connection, signal); + __connman_technology_set_connected(type, connected); + state_changed(); } -void __connman_notifier_register(enum connman_service_type type) +void __connman_notifier_connect(enum connman_service_type type) { DBG("type %d", type); switch (type) { case CONNMAN_SERVICE_TYPE_UNKNOWN: + case CONNMAN_SERVICE_TYPE_SYSTEM: + case CONNMAN_SERVICE_TYPE_GPS: + case CONNMAN_SERVICE_TYPE_VPN: + case CONNMAN_SERVICE_TYPE_GADGET: return; case CONNMAN_SERVICE_TYPE_ETHERNET: case CONNMAN_SERVICE_TYPE_WIFI: @@ -264,35 +167,42 @@ void __connman_notifier_register(enum connman_service_type type) break; } - if (g_atomic_int_exchange_and_add(®istered[type], 1) == 0) - technology_registered(type, TRUE); + if (__sync_fetch_and_add(&connected[type], 1) == 0) + technology_connected(type, TRUE); } -void __connman_notifier_unregister(enum connman_service_type type) +void __connman_notifier_enter_online(enum connman_service_type type) { DBG("type %d", type); - switch (type) { - case CONNMAN_SERVICE_TYPE_UNKNOWN: - return; - case CONNMAN_SERVICE_TYPE_ETHERNET: - case CONNMAN_SERVICE_TYPE_WIFI: - case CONNMAN_SERVICE_TYPE_WIMAX: - case CONNMAN_SERVICE_TYPE_BLUETOOTH: - case CONNMAN_SERVICE_TYPE_CELLULAR: - break; - } + if (__sync_fetch_and_add(&online[type], 1) == 0) + state_changed(); +} + +void __connman_notifier_leave_online(enum connman_service_type type) +{ + DBG("type %d", type); - if (g_atomic_int_dec_and_test(®istered[type]) == TRUE) - technology_registered(type, FALSE); + if (__sync_fetch_and_sub(&online[type], 1) == 1) + state_changed(); } -void __connman_notifier_enable(enum connman_service_type type) +void __connman_notifier_disconnect(enum connman_service_type type) { DBG("type %d", type); + __sync_synchronize(); + if (connected[type] == 0) { + connman_error("notifier disconnect underflow"); + return; + } + switch (type) { case CONNMAN_SERVICE_TYPE_UNKNOWN: + case CONNMAN_SERVICE_TYPE_SYSTEM: + case CONNMAN_SERVICE_TYPE_GPS: + case CONNMAN_SERVICE_TYPE_VPN: + case CONNMAN_SERVICE_TYPE_GADGET: return; case CONNMAN_SERVICE_TYPE_ETHERNET: case CONNMAN_SERVICE_TYPE_WIFI: @@ -302,107 +212,167 @@ void __connman_notifier_enable(enum connman_service_type type) break; } - if (g_atomic_int_exchange_and_add(&enabled[type], 1) == 0) - technology_enabled(type, TRUE); + if (__sync_fetch_and_sub(&connected[type], 1) != 1) + return; + + technology_connected(type, FALSE); } -void __connman_notifier_disable(enum connman_service_type type) +void __connman_notifier_default_changed(struct connman_service *service) { - DBG("type %d", type); + GSList *list; - switch (type) { - case CONNMAN_SERVICE_TYPE_UNKNOWN: - return; - case CONNMAN_SERVICE_TYPE_ETHERNET: - case CONNMAN_SERVICE_TYPE_WIFI: - case CONNMAN_SERVICE_TYPE_WIMAX: - case CONNMAN_SERVICE_TYPE_BLUETOOTH: - case CONNMAN_SERVICE_TYPE_CELLULAR: - break; + for (list = notifier_list; list; list = list->next) { + struct connman_notifier *notifier = list->data; + + if (notifier->default_changed) + notifier->default_changed(service); } +} - if (g_atomic_int_dec_and_test(&enabled[type]) == TRUE) - technology_enabled(type, FALSE); +void __connman_notifier_service_add(struct connman_service *service, + const char *name) +{ + GSList *list; + + for (list = notifier_list; list; list = list->next) { + struct connman_notifier *notifier = list->data; + + if (notifier->service_add) + notifier->service_add(service, name); + } } -void __connman_notifier_connect(enum connman_service_type type) +void __connman_notifier_service_remove(struct connman_service *service) { - DBG("type %d", type); + GSList *list; - switch (type) { - case CONNMAN_SERVICE_TYPE_UNKNOWN: - return; - case CONNMAN_SERVICE_TYPE_ETHERNET: - case CONNMAN_SERVICE_TYPE_WIFI: - case CONNMAN_SERVICE_TYPE_WIMAX: - case CONNMAN_SERVICE_TYPE_BLUETOOTH: - case CONNMAN_SERVICE_TYPE_CELLULAR: - break; + if (g_hash_table_lookup(service_hash, service) != NULL) { + /* + * This is a tempory check for consistency. It can be + * removed when there are no reports for the following + * error message. + */ + connman_error("Service state machine inconsistency detected."); + + g_hash_table_remove(service_hash, service); } - if (g_atomic_int_exchange_and_add(&connected[type], 1) == 0) - technology_connected(type, TRUE); + for (list = notifier_list; list; list = list->next) { + struct connman_notifier *notifier = list->data; + + if (notifier->service_remove) + notifier->service_remove(service); + } } -void __connman_notifier_disconnect(enum connman_service_type type) +void __connman_notifier_proxy_changed(struct connman_service *service) { - DBG("type %d", type); + GSList *list; - switch (type) { - case CONNMAN_SERVICE_TYPE_UNKNOWN: - return; - case CONNMAN_SERVICE_TYPE_ETHERNET: - case CONNMAN_SERVICE_TYPE_WIFI: - case CONNMAN_SERVICE_TYPE_WIMAX: - case CONNMAN_SERVICE_TYPE_BLUETOOTH: - case CONNMAN_SERVICE_TYPE_CELLULAR: - break; - } + for (list = notifier_list; list; list = list->next) { + struct connman_notifier *notifier = list->data; - if (g_atomic_int_dec_and_test(&connected[type]) == TRUE) - technology_connected(type, FALSE); + if (notifier->proxy_changed) + notifier->proxy_changed(service); + } } static void offlinemode_changed(dbus_bool_t enabled) { - DBusMessage *signal; - DBusMessageIter entry, value; - const char *key = "OfflineMode"; + DBG("enabled %d", enabled); + + connman_dbus_property_changed_basic(CONNMAN_MANAGER_PATH, + CONNMAN_MANAGER_INTERFACE, "OfflineMode", + DBUS_TYPE_BOOLEAN, &enabled); +} + +void __connman_notifier_offlinemode(connman_bool_t enabled) +{ + GSList *list; DBG("enabled %d", enabled); - signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH, - CONNMAN_MANAGER_INTERFACE, "PropertyChanged"); - if (signal == NULL) - return; + offlinemode_changed(enabled); + state_changed(); + + for (list = notifier_list; list; list = list->next) { + struct connman_notifier *notifier = list->data; + + if (notifier->offline_mode) + notifier->offline_mode(enabled); + } +} - dbus_message_iter_init_append(signal, &entry); +static void notify_idle_state(connman_bool_t idle) +{ + GSList *list; - dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key); + DBG("idle %d", idle); - dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT, - DBUS_TYPE_BOOLEAN_AS_STRING, &value); - dbus_message_iter_append_basic(&value, DBUS_TYPE_BOOLEAN, &enabled); - dbus_message_iter_close_container(&entry, &value); + for (list = notifier_list; list; list = list->next) { + struct connman_notifier *notifier = list->data; - g_dbus_send_message(connection, signal); + if (notifier->idle_state) + notifier->idle_state(idle); + } } -void __connman_notifier_offlinemode(connman_bool_t enabled) +void __connman_notifier_service_state_changed(struct connman_service *service, + enum connman_service_state state) { GSList *list; + unsigned int old_size; + connman_bool_t found; - DBG("enabled %d", enabled); + for (list = notifier_list; list; list = list->next) { + struct connman_notifier *notifier = list->data; + + if (notifier->service_state_changed) + notifier->service_state_changed(service, state); + } - __connman_profile_changed(FALSE); + old_size = g_hash_table_size(service_hash); + found = g_hash_table_lookup(service_hash, service) != NULL; - offlinemode_changed(enabled); + switch (state) { + case CONNMAN_SERVICE_STATE_UNKNOWN: + case CONNMAN_SERVICE_STATE_FAILURE: + case CONNMAN_SERVICE_STATE_DISCONNECT: + case CONNMAN_SERVICE_STATE_IDLE: + if (found == FALSE) + break; + + g_hash_table_remove(service_hash, service); + if (old_size == 1) + notify_idle_state(TRUE); + + break; + case CONNMAN_SERVICE_STATE_ASSOCIATION: + case CONNMAN_SERVICE_STATE_CONFIGURATION: + case CONNMAN_SERVICE_STATE_READY: + case CONNMAN_SERVICE_STATE_ONLINE: + if (found == TRUE) + break; + + g_hash_table_insert(service_hash, service, service); + if (old_size == 0) + notify_idle_state(FALSE); + + break; + } +} + +void __connman_notifier_ipconfig_changed(struct connman_service *service, + struct connman_ipconfig *ipconfig) +{ + GSList *list; for (list = notifier_list; list; list = list->next) { struct connman_notifier *notifier = list->data; - if (notifier->offline_mode) - notifier->offline_mode(enabled); + if (notifier->ipconfig_changed) + notifier->ipconfig_changed(service, ipconfig); } } @@ -412,6 +382,11 @@ int __connman_notifier_init(void) connection = connman_dbus_get_connection(); + service_hash = g_hash_table_new_full(g_direct_hash, g_direct_equal, + NULL, NULL); + + notifier_state = evaluate_notifier_state(); + return 0; } @@ -419,5 +394,8 @@ void __connman_notifier_cleanup(void) { DBG(""); + g_hash_table_destroy(service_hash); + service_hash = NULL; + dbus_connection_unref(connection); }