*
* Connection Manager
*
- * Copyright (C) 2007-2012 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
*
* 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;
*
* 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 int connected[MAX_CONNMAN_SERVICE_TYPES];
+static int online[MAX_CONNMAN_SERVICE_TYPES];
-static int connected[MAX_TECHNOLOGIES];
-static int online[MAX_TECHNOLOGIES];
-
-static connman_bool_t notifier_is_online(void)
+static bool notifier_is_online(void)
{
unsigned int i;
__sync_synchronize();
- for (i = 0; i < MAX_TECHNOLOGIES; i++) {
+ for (i = 0; i < MAX_CONNMAN_SERVICE_TYPES; i++) {
if (online[i] > 0)
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
-connman_bool_t __connman_notifier_is_connected(void)
+bool __connman_notifier_is_connected(void)
{
unsigned int i;
__sync_synchronize();
- for (i = 0; i < MAX_TECHNOLOGIES; i++) {
+ for (i = 0; i < MAX_CONNMAN_SERVICE_TYPES; i++) {
if (connected[i] > 0)
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
static const char *evaluate_notifier_state(void)
{
- if (notifier_is_online() == TRUE)
+ if (notifier_is_online())
return "online";
- if (__connman_notifier_is_connected() == TRUE)
+ if (__connman_notifier_is_connected())
return "ready";
- if ( __connman_technology_get_offlinemode() == TRUE)
+ if (__connman_technology_get_offlinemode())
return "offline";
return "idle";
DBUS_TYPE_STRING, ¬ifier_state);
}
-static void technology_connected(enum connman_service_type type,
- connman_bool_t connected)
-{
- DBG("type %d connected %d", type, connected);
-
- __connman_technology_set_connected(type, connected);
- state_changed();
-}
-
void __connman_notifier_connect(enum connman_service_type type)
{
DBG("type %d", 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:
break;
}
- if (__sync_fetch_and_add(&connected[type], 1) == 0)
- technology_connected(type, TRUE);
+ if (__sync_fetch_and_add(&connected[type], 1) == 0) {
+ __connman_technology_set_connected(type, true);
+ state_changed();
+ }
}
void __connman_notifier_enter_online(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:
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);
GSList *list;
- technology_default(type);
-
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);
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);
{
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
+ * This is a temporary check for consistency. It can be
* removed when there are no reports for the following
* error message.
*/
}
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);
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);
DBUS_TYPE_BOOLEAN, &enabled);
}
-void __connman_notifier_offlinemode(connman_bool_t enabled)
+void __connman_notifier_offlinemode(bool enabled)
{
GSList *list;
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);
{
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;
}
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);
projects / platform / upstream / connman.git / blobdiff