X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fnotifier.c;h=d1be47f6fb5cb27250a4f1931ec9ee2b90c87834;hb=8f4dbb1aa7ce0b39a12b9cc908a8660c5d61f0cc;hp=3862626a494f8a178b9ab1c7e70c401ea7a1564f;hpb=a3c485fb414f50dff42618c33dbe908f6d3e5f57;p=platform%2Fupstream%2Fconnman.git diff --git a/src/notifier.c b/src/notifier.c index 3862626..d1be47f 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 @@ -32,6 +32,8 @@ 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) { const struct connman_notifier *notifier1 = a; @@ -48,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; @@ -64,155 +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 int registered[MAX_TECHNOLOGIES]; -static volatile int enabled[MAX_TECHNOLOGIES]; -static volatile int 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; + unsigned int i; __sync_synchronize(); - for (i = 0; i < MAX_TECHNOLOGIES; i++) { - const char *type = __connman_service_type2string(i); - - if (type == NULL) - continue; - - if (registered[i] > 0) - dbus_message_iter_append_basic(iter, - DBUS_TYPE_STRING, &type); + 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; - - __sync_synchronize(); - for (i = 0; i < MAX_TECHNOLOGIES; i++) { - const char *type = __connman_service_type2string(i); - - if (type == NULL) - continue; - - if (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; + unsigned int i; __sync_synchronize(); - for (i = 0; i < MAX_TECHNOLOGIES; i++) { - const char *type = __connman_service_type2string(i); - - if (type == NULL) - continue; - + for (i = 0; i < MAX_CONNMAN_SERVICE_TYPES; i++) { if (connected[i] > 0) - dbus_message_iter_append_basic(iter, - DBUS_TYPE_STRING, &type); + 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"; - __sync_synchronize(); - for (i = 0; i < MAX_TECHNOLOGIES; i++) { - if (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(connman_bool_t connected) +static void state_changed(void) { - unsigned int count = __connman_notifier_count_connected(); - char *state = "offline"; + const char *state; + + state = evaluate_notifier_state(); - if (count > 1) + if (g_strcmp0(state, notifier_state) == 0) return; - if (count == 1) { - if (connected == FALSE) - return; - - state = "online"; - } + notifier_state = state; connman_dbus_property_changed_basic(CONNMAN_MANAGER_PATH, CONNMAN_MANAGER_INTERFACE, "State", - DBUS_TYPE_STRING, &state); -} - -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(connected); + 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); @@ -221,126 +146,39 @@ void __connman_notifier_register(enum connman_service_type type) 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: - case CONNMAN_SERVICE_TYPE_WIMAX: - case CONNMAN_SERVICE_TYPE_BLUETOOTH: - case CONNMAN_SERVICE_TYPE_CELLULAR: - break; - } - - if (__sync_fetch_and_add(®istered[type], 1) == 0) - technology_registered(type, TRUE); -} - -void __connman_notifier_unregister(enum connman_service_type type) -{ - DBG("type %d", type); - - __sync_synchronize(); - if (registered[type] == 0) { - connman_error("notifier unregister 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: - case CONNMAN_SERVICE_TYPE_WIMAX: case CONNMAN_SERVICE_TYPE_BLUETOOTH: case CONNMAN_SERVICE_TYPE_CELLULAR: + case CONNMAN_SERVICE_TYPE_P2P: +#if defined TIZEN_EXT_WIFI_MESH + case CONNMAN_SERVICE_TYPE_MESH: +#endif break; } - if (__sync_fetch_and_sub(®istered[type], 1) != 1) - return; - - technology_registered(type, FALSE); -} - -void __connman_notifier_enable(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: - case CONNMAN_SERVICE_TYPE_WIMAX: - case CONNMAN_SERVICE_TYPE_BLUETOOTH: - case CONNMAN_SERVICE_TYPE_CELLULAR: - break; + if (__sync_fetch_and_add(&connected[type], 1) == 0) { + __connman_technology_set_connected(type, true); + state_changed(); } - - if (__sync_fetch_and_add(&enabled[type], 1) == 0) - technology_enabled(type, TRUE); } -void __connman_notifier_disable(enum connman_service_type type) +void __connman_notifier_enter_online(enum connman_service_type type) { DBG("type %d", type); - __sync_synchronize(); - if (enabled[type] == 0) { - connman_error("notifier disable 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: - case CONNMAN_SERVICE_TYPE_WIMAX: - case CONNMAN_SERVICE_TYPE_BLUETOOTH: - case CONNMAN_SERVICE_TYPE_CELLULAR: - break; - } - - if (__sync_fetch_and_sub(&enabled[type], 1) != 1) - return; - - technology_enabled(type, FALSE); + if (__sync_fetch_and_add(&online[type], 1) == 0) + state_changed(); } -void __connman_notifier_connect(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: - case CONNMAN_SERVICE_TYPE_GADGET: - 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(&connected[type], 1) == 0) - technology_connected(type, TRUE); + if (__sync_fetch_and_sub(&online[type], 1) == 1) + state_changed(); } void __connman_notifier_disconnect(enum connman_service_type type) @@ -358,49 +196,32 @@ void __connman_notifier_disconnect(enum connman_service_type type) 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_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: +#if defined TIZEN_EXT_WIFI_MESH + case CONNMAN_SERVICE_TYPE_MESH: +#endif break; } if (__sync_fetch_and_sub(&connected[type], 1) != 1) return; - technology_connected(type, FALSE); -} - -static void technology_default(enum connman_service_type type) -{ - const char *str; - - str = __connman_service_type2string(type); - if (str == NULL) - str = ""; - - connman_dbus_property_changed_basic(CONNMAN_MANAGER_PATH, - CONNMAN_MANAGER_INTERFACE, "DefaultTechnology", - DBUS_TYPE_STRING, &str); + __connman_technology_set_connected(type, false); + state_changed(); } void __connman_notifier_default_changed(struct connman_service *service) { - enum connman_service_type type = connman_service_get_type(service); - char *interface; GSList *list; - technology_default(type); - - interface = connman_service_get_interface(service); - __connman_tethering_update_interface(interface); - g_free(interface); - 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); @@ -413,7 +234,7 @@ void __connman_notifier_service_add(struct connman_service *service, GSList *list; for (list = notifier_list; list; list = list->next) { - struct connman_notifier *notifier = list->data; + const struct connman_notifier *notifier = list->data; if (notifier->service_add) notifier->service_add(service, name); @@ -424,7 +245,7 @@ void __connman_notifier_service_remove(struct connman_service *service) { GSList *list; - if (g_hash_table_lookup(service_hash, service) != NULL) { + if (g_hash_table_lookup(service_hash, service)) { /* * This is a tempory check for consistency. It can be * removed when there are no reports for the following @@ -436,7 +257,7 @@ void __connman_notifier_service_remove(struct connman_service *service) } for (list = notifier_list; list; list = list->next) { - struct connman_notifier *notifier = list->data; + const struct connman_notifier *notifier = list->data; if (notifier->service_remove) notifier->service_remove(service); @@ -448,7 +269,7 @@ void __connman_notifier_proxy_changed(struct connman_service *service) GSList *list; for (list = notifier_list; list; list = list->next) { - struct connman_notifier *notifier = list->data; + const struct connman_notifier *notifier = list->data; if (notifier->proxy_changed) notifier->proxy_changed(service); @@ -464,30 +285,31 @@ 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); 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 void notify_idle_state(connman_bool_t idle) +static void notify_idle_state(bool idle) { GSList *list; DBG("idle %d", idle); for (list = notifier_list; list; list = list->next) { - struct connman_notifier *notifier = list->data; + const struct connman_notifier *notifier = list->data; if (notifier->idle_state) notifier->idle_state(idle); @@ -499,41 +321,41 @@ void __connman_notifier_service_state_changed(struct connman_service *service, { GSList *list; unsigned int old_size; - connman_bool_t found; + bool found; for (list = notifier_list; list; list = list->next) { - struct connman_notifier *notifier = list->data; + 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) != NULL; + 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 == FALSE) + if (!found) break; g_hash_table_remove(service_hash, service); if (old_size == 1) - notify_idle_state(TRUE); + 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) + if (found) break; g_hash_table_insert(service_hash, service, service); if (old_size == 0) - notify_idle_state(FALSE); + notify_idle_state(false); break; } @@ -545,61 +367,13 @@ void __connman_notifier_ipconfig_changed(struct connman_service *service, GSList *list; for (list = notifier_list; list; list = list->next) { - struct connman_notifier *notifier = list->data; + const struct connman_notifier *notifier = list->data; if (notifier->ipconfig_changed) notifier->ipconfig_changed(service, ipconfig); } } -static connman_bool_t technology_supported(enum connman_service_type 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 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; - } - - return TRUE; -} - -connman_bool_t __connman_notifier_is_registered(enum connman_service_type type) -{ - DBG("type %d", type); - - if (technology_supported(type) == FALSE) - return FALSE; - - __sync_synchronize(); - if (registered[type] > 0) - return TRUE; - - return FALSE; -} - -connman_bool_t __connman_notifier_is_enabled(enum connman_service_type type) -{ - DBG("type %d", type); - - if (technology_supported(type) == FALSE) - return FALSE; - - __sync_synchronize(); - if (enabled[type] > 0) - return TRUE; - - return FALSE; -} - int __connman_notifier_init(void) { DBG(""); @@ -609,6 +383,7 @@ int __connman_notifier_init(void) service_hash = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, NULL); + notifier_state = evaluate_notifier_state(); return 0; }