diff options
| author | Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com> | 2012-10-15 15:35:15 +0300 |
|---|---|---|
| committer | Patrik Flykt <patrik.flykt@linux.intel.com> | 2012-10-16 15:03:06 +0300 |
| commit | 5e4d3658afc7379a1d1def2ec06afd2cb2cac99d (patch) | |
| tree | 2a31101a06b65f546d8d51cd14b53693e0b3896f | |
| parent | 75a2878a29945d9f4f9db135d82336109a888f5d (diff) | |
| download | connman-5e4d3658afc7379a1d1def2ec06afd2cb2cac99d.tar.gz connman-5e4d3658afc7379a1d1def2ec06afd2cb2cac99d.tar.bz2 connman-5e4d3658afc7379a1d1def2ec06afd2cb2cac99d.zip | |
technology: Add and handle a marker for softblock status
| -rw-r--r-- | src/technology.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/technology.c b/src/technology.c index 11bf0c0c..16324c96 100644 --- a/src/technology.c +++ b/src/technology.c @@ -74,6 +74,7 @@ struct connman_technology { GSList *scan_pending; connman_bool_t rfkill_driven; + connman_bool_t softblocked; connman_bool_t hardblocked; connman_bool_t dbus_registered; }; @@ -988,6 +989,7 @@ static struct connman_technology *technology_get(enum connman_service_type type) technology->refcount = 1; technology->rfkill_driven = FALSE; + technology->softblocked = FALSE; if (type == CONNMAN_SERVICE_TYPE_ETHERNET) technology->hardblocked = FALSE; @@ -1315,14 +1317,15 @@ void __connman_technology_set_connected(enum connman_service_type type, DBUS_TYPE_BOOLEAN, &connected); } -static void technology_apply_hardblock_change(struct connman_technology *technology, +static void technology_apply_rfkill_change(struct connman_technology *technology, + connman_bool_t softblock, connman_bool_t hardblock) { gboolean apply = TRUE; GList *start, *list; if (technology->hardblocked == hardblock) - return; + goto softblock_change; start = g_hash_table_get_values(rfkill_list); for (list = start; list != NULL; list = list->next) { @@ -1338,7 +1341,7 @@ static void technology_apply_hardblock_change(struct connman_technology *technol g_list_free(start); if (apply == FALSE) - return; + goto softblock_change; technology->hardblocked = hardblock; @@ -1350,6 +1353,9 @@ static void technology_apply_hardblock_change(struct connman_technology *technol technology_enable(technology, TRUE); technology_dbus_register(technology); } + +softblock_change: + technology->softblocked = softblock; } int __connman_technology_add_rfkill(unsigned int index, @@ -1386,7 +1392,7 @@ done: technology->rfkill_driven = TRUE; - technology_apply_hardblock_change(technology, hardblock); + technology_apply_rfkill_change(technology, softblock, hardblock); /* * If Offline mode is on, we softblock the device if it isnt already. @@ -1432,7 +1438,7 @@ int __connman_technology_update_rfkill(unsigned int index, if (technology == NULL) return -ENXIO; - technology_apply_hardblock_change(technology, hardblock); + technology_apply_rfkill_change(technology, softblock, hardblock); if (!global_offlinemode) { if (technology->enable_persistent && softblock) |