X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fnotifier.c;h=a39d54c7a69a41a19eaf4b45ea049fae99801f7f;hb=dd3cccc5e67548dcc2dd6c6254ed6c97859085d5;hp=7871ffb866f947268538a6b9e2267d4c4e3d47d0;hpb=cd9553812a30cdbb7d30731d84cc90a8d4463156;p=platform%2Fupstream%2Fconnman.git diff --git a/src/notifier.c b/src/notifier.c index 7871ffb..a39d54c 100644 --- a/src/notifier.c +++ b/src/notifier.c @@ -2,7 +2,7 @@ * * Connection Manager * - * Copyright (C) 2007-2010 Intel Corporation. All rights reserved. + * Copyright (C) 2007-2013 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) { @@ -47,11 +50,11 @@ static gint compare_priority(gconstpointer a, gconstpointer b) * * Returns: %0 on success */ -int connman_notifier_register(struct connman_notifier *notifier) +int connman_notifier_register(const struct connman_notifier *notifier) { DBG("notifier %p name %s", notifier, notifier->name); - notifier_list = g_slist_insert_sorted(notifier_list, notifier, + notifier_list = g_slist_insert_sorted(notifier_list, (void*)notifier, compare_priority); return 0; @@ -63,158 +66,78 @@ int connman_notifier_register(struct connman_notifier *notifier) * * Remove a previously registered notifier module */ -void connman_notifier_unregister(struct connman_notifier *notifier) +void connman_notifier_unregister(const struct connman_notifier *notifier) { DBG("notifier %p name %s", notifier, notifier->name); notifier_list = g_slist_remove(notifier_list, notifier); } -#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_CONNMAN_SERVICE_TYPES]; +static int online[MAX_CONNMAN_SERVICE_TYPES]; -void __connman_notifier_list_registered(DBusMessageIter *iter, void *user_data) +static bool notifier_is_online(void) { - int i; - - for (i = 0; i < MAX_TECHNOLOGIES; i++) { - const char *type = __connman_service_type2string(i); + unsigned int 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_CONNMAN_SERVICE_TYPES; i++) { + if (online[i] > 0) + return true; } -} -void __connman_notifier_list_enabled(DBusMessageIter *iter, void *user_data) -{ - int i; - - for (i = 0; i < MAX_TECHNOLOGIES; i++) { - const char *type = __connman_service_type2string(i); - - if (type == NULL) - continue; - - if (g_atomic_int_get(&enabled[i]) > 0) - dbus_message_iter_append_basic(iter, - DBUS_TYPE_STRING, &type); - } + return false; } -void __connman_notifier_list_connected(DBusMessageIter *iter, void *user_data) +bool __connman_notifier_is_connected(void) { - int i; - - for (i = 0; i < MAX_TECHNOLOGIES; i++) { - const char *type = __connman_service_type2string(i); + unsigned int i; - if (type == NULL) - continue; - - if (g_atomic_int_get(&connected[i]) > 0) - dbus_message_iter_append_basic(iter, - DBUS_TYPE_STRING, &type); + __sync_synchronize(); + for (i = 0; i < MAX_CONNMAN_SERVICE_TYPES; i++) { + if (connected[i] > 0) + return true; } -} -static void technology_registered(enum connman_service_type type, - connman_bool_t registered) -{ - DBG("type %d registered %d", type, registered); - - connman_dbus_property_changed_array(CONNMAN_MANAGER_PATH, - CONNMAN_MANAGER_INTERFACE, "AvailableTechnologies", - DBUS_TYPE_STRING, __connman_notifier_list_registered, NULL); + return false; } -static void technology_enabled(enum connman_service_type type, - connman_bool_t enabled) +static const char *evaluate_notifier_state(void) { - GSList *list; - - DBG("type %d enabled %d", type, enabled); - - connman_dbus_property_changed_array(CONNMAN_MANAGER_PATH, - CONNMAN_MANAGER_INTERFACE, "EnabledTechnologies", - DBUS_TYPE_STRING, __connman_notifier_list_enabled, NULL); - - for (list = notifier_list; list; list = list->next) { - struct connman_notifier *notifier = list->data; - - if (notifier->service_enabled) - notifier->service_enabled(type, enabled); - } -} + if (notifier_is_online()) + return "online"; -unsigned int __connman_notifier_count_connected(void) -{ - unsigned int i, count = 0; + if (__connman_notifier_is_connected()) + return "ready"; - for (i = 0; i < MAX_TECHNOLOGIES; i++) { - if (g_atomic_int_get(&connected[i]) > 0) - count++; - } + if (__connman_technology_get_offlinemode()) + return "offline"; - return count; + return "idle"; } const char *__connman_notifier_get_state(void) { - unsigned int count = __connman_notifier_count_connected(); - - if (count > 0) - return "online"; - - return "offline"; + return notifier_state; } static void state_changed(void) { - unsigned int count = __connman_notifier_count_connected(); - char *state = "offline"; - DBusMessage *signal; + const char *state; - if (count > 1) + state = evaluate_notifier_state(); + + if (g_strcmp0(state, notifier_state) == 0) return; - if (count > 0) - state = "online"; + notifier_state = state; connman_dbus_property_changed_basic(CONNMAN_MANAGER_PATH, CONNMAN_MANAGER_INTERFACE, "State", - DBUS_TYPE_STRING, &state); - - signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH, - CONNMAN_MANAGER_INTERFACE, "StateChanged"); - if (signal == NULL) - return; - - dbus_message_append_args(signal, DBUS_TYPE_STRING, &state, - DBUS_TYPE_INVALID); - - g_dbus_send_message(connection, signal); -} - -static void technology_connected(enum connman_service_type type, - connman_bool_t connected) -{ - DBG("type %d connected %d", type, connected); - - connman_dbus_property_changed_array(CONNMAN_MANAGER_PATH, - CONNMAN_MANAGER_INTERFACE, "ConnectedTechnologies", - DBUS_TYPE_STRING, __connman_notifier_list_connected, NULL); - - state_changed(); + DBUS_TYPE_STRING, ¬ifier_state); } -void __connman_notifier_register(enum connman_service_type type) +void __connman_notifier_connect(enum connman_service_type type) { DBG("type %d", type); @@ -225,87 +148,46 @@ void __connman_notifier_register(enum connman_service_type type) case CONNMAN_SERVICE_TYPE_VPN: return; case CONNMAN_SERVICE_TYPE_ETHERNET: + case CONNMAN_SERVICE_TYPE_GADGET: case CONNMAN_SERVICE_TYPE_WIFI: - case CONNMAN_SERVICE_TYPE_WIMAX: case CONNMAN_SERVICE_TYPE_BLUETOOTH: case CONNMAN_SERVICE_TYPE_CELLULAR: + case CONNMAN_SERVICE_TYPE_P2P: 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) { + __connman_technology_set_connected(type, true); + state_changed(); + } } -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: - case CONNMAN_SERVICE_TYPE_SYSTEM: - case CONNMAN_SERVICE_TYPE_GPS: - case CONNMAN_SERVICE_TYPE_VPN: - 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_atomic_int_dec_and_test(®istered[type]) == TRUE) - technology_registered(type, FALSE); + if (__sync_fetch_and_add(&online[type], 1) == 0) + state_changed(); } -void __connman_notifier_enable(enum connman_service_type type) +void __connman_notifier_leave_online(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: - 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_atomic_int_exchange_and_add(&enabled[type], 1) == 0) - technology_enabled(type, TRUE); + if (__sync_fetch_and_sub(&online[type], 1) == 1) + state_changed(); } -void __connman_notifier_disable(enum connman_service_type type) +void __connman_notifier_disconnect(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: + __sync_synchronize(); + if (connected[type] == 0) { + connman_error("notifier disconnect underflow"); 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_atomic_int_dec_and_test(&enabled[type]) == TRUE) - technology_enabled(type, FALSE); -} - -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: @@ -313,69 +195,78 @@ void __connman_notifier_connect(enum connman_service_type type) case CONNMAN_SERVICE_TYPE_VPN: return; case CONNMAN_SERVICE_TYPE_ETHERNET: + case CONNMAN_SERVICE_TYPE_GADGET: case CONNMAN_SERVICE_TYPE_WIFI: - case CONNMAN_SERVICE_TYPE_WIMAX: case CONNMAN_SERVICE_TYPE_BLUETOOTH: case CONNMAN_SERVICE_TYPE_CELLULAR: + case CONNMAN_SERVICE_TYPE_P2P: break; } - if (g_atomic_int_exchange_and_add(&connected[type], 1) == 0) - technology_connected(type, TRUE); + if (__sync_fetch_and_sub(&connected[type], 1) != 1) + return; + + __connman_technology_set_connected(type, false); + state_changed(); } -void __connman_notifier_disconnect(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: - case CONNMAN_SERVICE_TYPE_SYSTEM: - case CONNMAN_SERVICE_TYPE_GPS: - case CONNMAN_SERVICE_TYPE_VPN: - 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) { + const struct connman_notifier *notifier = list->data; - if (g_atomic_int_dec_and_test(&connected[type]) == TRUE) - technology_connected(type, FALSE); + if (notifier->default_changed) + notifier->default_changed(service); + } } -static void technology_default(enum connman_service_type type) +void __connman_notifier_service_add(struct connman_service *service, + const char *name) { - const char *str; + GSList *list; - str = __connman_service_type2string(type); - if (str == NULL) - str = ""; + for (list = notifier_list; list; list = list->next) { + const struct connman_notifier *notifier = list->data; - connman_dbus_property_changed_basic(CONNMAN_MANAGER_PATH, - CONNMAN_MANAGER_INTERFACE, "DefaultTechnology", - DBUS_TYPE_STRING, &str); + if (notifier->service_add) + notifier->service_add(service, name); + } } -void __connman_notifier_default_changed(struct connman_service *service) +void __connman_notifier_service_remove(struct connman_service *service) { - enum connman_service_type type = connman_service_get_type(service); - char *interface; GSList *list; - technology_default(type); + if (g_hash_table_lookup(service_hash, service)) { + /* + * This is a temporary check for consistency. It can be + * removed when there are no reports for the following + * error message. + */ + connman_error("Service state machine inconsistency detected."); - interface = connman_service_get_interface(service); - __connman_tethering_update_interface(interface); - g_free(interface); + g_hash_table_remove(service_hash, service); + } for (list = notifier_list; list; list = list->next) { - struct connman_notifier *notifier = list->data; + const struct connman_notifier *notifier = list->data; - if (notifier->default_changed) - notifier->default_changed(service); + if (notifier->service_remove) + notifier->service_remove(service); + } +} + +void __connman_notifier_proxy_changed(struct connman_service *service) +{ + GSList *list; + + for (list = notifier_list; list; list = list->next) { + const struct connman_notifier *notifier = list->data; + + if (notifier->proxy_changed) + notifier->proxy_changed(service); } } @@ -388,67 +279,93 @@ static void offlinemode_changed(dbus_bool_t enabled) DBUS_TYPE_BOOLEAN, &enabled); } -void __connman_notifier_offlinemode(connman_bool_t enabled) +void __connman_notifier_offlinemode(bool enabled) { GSList *list; DBG("enabled %d", enabled); - __connman_profile_changed(FALSE); - offlinemode_changed(enabled); + state_changed(); for (list = notifier_list; list; list = list->next) { - struct connman_notifier *notifier = list->data; + const struct connman_notifier *notifier = list->data; if (notifier->offline_mode) notifier->offline_mode(enabled); } } -static connman_bool_t technology_supported(enum connman_service_type type) +static void notify_idle_state(bool idle) { - switch (type) { - case CONNMAN_SERVICE_TYPE_UNKNOWN: - case CONNMAN_SERVICE_TYPE_SYSTEM: - case CONNMAN_SERVICE_TYPE_GPS: - case CONNMAN_SERVICE_TYPE_VPN: - return FALSE; - 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; - } + GSList *list; + + DBG("idle %d", idle); - return TRUE; + for (list = notifier_list; list; list = list->next) { + const struct connman_notifier *notifier = list->data; + + if (notifier->idle_state) + notifier->idle_state(idle); + } } -connman_bool_t __connman_notifier_is_registered(enum connman_service_type type) +void __connman_notifier_service_state_changed(struct connman_service *service, + enum connman_service_state state) { - DBG("type %d", type); + GSList *list; + unsigned int old_size; + bool found; + + for (list = notifier_list; list; list = list->next) { + const struct connman_notifier *notifier = list->data; + + if (notifier->service_state_changed) + notifier->service_state_changed(service, state); + } + + old_size = g_hash_table_size(service_hash); + found = g_hash_table_lookup(service_hash, service); + + switch (state) { + case CONNMAN_SERVICE_STATE_UNKNOWN: + case CONNMAN_SERVICE_STATE_FAILURE: + case CONNMAN_SERVICE_STATE_DISCONNECT: + case CONNMAN_SERVICE_STATE_IDLE: + if (!found) + break; - if (technology_supported(type) == FALSE) - return FALSE; + 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) + break; - if (g_atomic_int_get(®istered[type]) > 0) - return TRUE; + g_hash_table_insert(service_hash, service, service); + if (old_size == 0) + notify_idle_state(false); - return FALSE; + break; + } } -connman_bool_t __connman_notifier_is_enabled(enum connman_service_type type) +void __connman_notifier_ipconfig_changed(struct connman_service *service, + struct connman_ipconfig *ipconfig) { - DBG("type %d", type); - - if (technology_supported(type) == FALSE) - return FALSE; + GSList *list; - if (g_atomic_int_get(&enabled[type]) > 0) - return TRUE; + for (list = notifier_list; list; list = list->next) { + const struct connman_notifier *notifier = list->data; - return FALSE; + if (notifier->ipconfig_changed) + notifier->ipconfig_changed(service, ipconfig); + } } int __connman_notifier_init(void) @@ -457,6 +374,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; } @@ -464,5 +386,8 @@ void __connman_notifier_cleanup(void) { DBG(""); + g_hash_table_destroy(service_hash); + service_hash = NULL; + dbus_connection_unref(connection); }