X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fnotifier.c;h=b328a2adbfaae03f371739324d30893fc51c759b;hb=2aa593bceff2698fe3ca714152064e4758cf5593;hp=c1346f20377fa36d62c2e53fc6b4cd9bad5666c9;hpb=200219af1dffba22a09cc4110fad24bafdf54e0a;p=framework%2Fconnectivity%2Fconnman.git diff --git a/src/notifier.c b/src/notifier.c index c1346f2..b328a2a 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-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 @@ -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; @@ -73,72 +75,68 @@ void connman_notifier_unregister(struct connman_notifier *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_TECHNOLOGIES]; +static int online[MAX_TECHNOLOGIES]; -static void technology_registered(enum connman_service_type type, - connman_bool_t registered) +static connman_bool_t notifier_is_online(void) { - DBG("type %d registered %d", type, registered); -} - -static void technology_enabled(enum connman_service_type type, - connman_bool_t enabled) -{ - GSList *list; + unsigned int i; - DBG("type %d enabled %d", type, enabled); - - for (list = notifier_list; list; list = list->next) { - struct connman_notifier *notifier = list->data; - - if (notifier->service_enabled) - notifier->service_enabled(type, enabled); + __sync_synchronize(); + for (i = 0; i < MAX_TECHNOLOGIES; i++) { + if (online[i] > 0) + return TRUE; } + + return FALSE; } -unsigned int __connman_notifier_count_connected(void) +connman_bool_t __connman_notifier_is_connected(void) { - unsigned int i, count = 0; + unsigned int i; __sync_synchronize(); for (i = 0; i < MAX_TECHNOLOGIES; i++) { if (connected[i] > 0) - count++; + return TRUE; } - return count; + return FALSE; } -const char *__connman_notifier_get_state(void) +static const char *evaluate_notifier_state(void) { - unsigned int count = __connman_notifier_count_connected(); - - if (count > 0) + if (notifier_is_online() == TRUE) return "online"; - return "offline"; + if (__connman_notifier_is_connected() == TRUE) + return "ready"; + + if ( __connman_technology_get_offlinemode() == TRUE) + return "offline"; + + return "idle"; } -static void state_changed(connman_bool_t connected) +const char *__connman_notifier_get_state(void) { - unsigned int count = __connman_notifier_count_connected(); - char *state = "offline"; + return notifier_state; +} - if (count > 1) - return; +static void state_changed(void) +{ + const char *state; - if (count == 1) { - if (connected == FALSE) - return; + state = evaluate_notifier_state(); - state = "online"; - } + if (g_strcmp0(state, notifier_state) == 0) + return; + + notifier_state = state; connman_dbus_property_changed_basic(CONNMAN_MANAGER_PATH, CONNMAN_MANAGER_INTERFACE, "State", - DBUS_TYPE_STRING, &state); + DBUS_TYPE_STRING, ¬ifier_state); } static void technology_connected(enum connman_service_type type, @@ -146,64 +144,11 @@ static void technology_connected(enum connman_service_type type, { DBG("type %d connected %d", type, connected); - state_changed(connected); -} - -void __connman_notifier_register(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(®istered[type], 1) == 0) - technology_registered(type, TRUE); + __connman_technology_set_connected(type, connected); + state_changed(); } -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: - break; - } - - if (__sync_fetch_and_sub(®istered[type], 1) != 1) - return; - - technology_registered(type, FALSE); -} - -void __connman_notifier_enable(enum connman_service_type type) +void __connman_notifier_connect(enum connman_service_type type) { DBG("type %d", type); @@ -222,62 +167,24 @@ void __connman_notifier_enable(enum connman_service_type type) break; } - if (__sync_fetch_and_add(&enabled[type], 1) == 0) - technology_enabled(type, TRUE); + if (__sync_fetch_and_add(&connected[type], 1) == 0) + technology_connected(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) @@ -311,31 +218,10 @@ void __connman_notifier_disconnect(enum connman_service_type type) 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); -} - 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; @@ -408,6 +294,7 @@ void __connman_notifier_offlinemode(connman_bool_t enabled) DBG("enabled %d", enabled); offlinemode_changed(enabled); + state_changed(); for (list = notifier_list; list; list = list->next) { struct connman_notifier *notifier = list->data; @@ -489,54 +376,6 @@ void __connman_notifier_ipconfig_changed(struct connman_service *service, } } -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(""); @@ -546,6 +385,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; }