diff options
| -rw-r--r-- | src/connman.h | 5 | ||||
| -rw-r--r-- | src/device.c | 66 | ||||
| -rw-r--r-- | src/profile.c | 9 | ||||
| -rw-r--r-- | src/technology.c | 135 |
4 files changed, 54 insertions, 161 deletions
diff --git a/src/connman.h b/src/connman.h index 451febb1..699291ba 100644 --- a/src/connman.h +++ b/src/connman.h @@ -333,8 +333,6 @@ void __connman_technology_add_interface(enum connman_service_type type, void __connman_technology_remove_interface(enum connman_service_type type, int index, const char *name, const char *ident); -connman_bool_t __connman_technology_get_blocked(enum connman_service_type type); - #include <connman/device.h> int __connman_device_init(const char *device, const char *nodevice); @@ -351,9 +349,6 @@ connman_bool_t __connman_device_isfiltered(const char *devname); int __connman_device_get_phyindex(struct connman_device *device); void __connman_device_set_phyindex(struct connman_device *device, int phyindex); -int __connman_device_set_blocked(struct connman_device *device, - connman_bool_t blocked); -connman_bool_t __connman_device_get_blocked(struct connman_device *device); void __connman_device_increase_connections(struct connman_device *device); void __connman_device_decrease_connections(struct connman_device *device); diff --git a/src/device.c b/src/device.c index 60c50fde..59321239 100644 --- a/src/device.c +++ b/src/device.c @@ -44,7 +44,6 @@ struct connman_device { enum connman_pending_type powered_pending; /* Indicates a pending enable/disable request */ connman_bool_t offlinemode; - connman_bool_t blocked; connman_bool_t powered; connman_bool_t powered_persistent; connman_bool_t scanning; @@ -237,14 +236,11 @@ int __connman_device_enable(struct connman_device *device) { int err; - DBG("device %p %d", device, device->blocked); + DBG("device %p", device); if (!device->driver || !device->driver->enable) return -EOPNOTSUPP; - if (device->blocked == TRUE) - return -ENOLINK; - /* There is an ongoing power disable request. */ if (device->powered_pending == PENDING_DISABLE) return -EBUSY; @@ -293,9 +289,6 @@ int __connman_device_disable(struct connman_device *device) if (!device->driver || !device->driver->disable) return -EOPNOTSUPP; - if (device->blocked == TRUE) - return -ENOLINK; - /* Ongoing power enable request */ if (device->powered_pending == PENDING_ENABLE) return -EBUSY; @@ -328,29 +321,6 @@ done: return err; } -static int set_powered(struct connman_device *device, connman_bool_t powered) -{ - DBG("device %p powered %d", device, powered); - - if (powered == TRUE) - return __connman_device_enable(device); - else - return __connman_device_disable(device); -} - -static int setup_device(struct connman_device *device) -{ - DBG("device %p", device); - - __connman_technology_add_device(device); - - if (device->offlinemode == FALSE && - device->powered_persistent == TRUE) - __connman_device_enable(device); - - return 0; -} - static void probe_driver(struct connman_device_driver *driver) { GSList *list; @@ -371,7 +341,7 @@ static void probe_driver(struct connman_device_driver *driver) device->driver = driver; - setup_device(device); + __connman_technology_add_device(device); } } @@ -501,7 +471,6 @@ struct connman_device *connman_device_create(const char *node, enum connman_device_type type) { struct connman_device *device; - enum connman_service_type service_type; connman_bool_t bg_scan; DBG("node %s type %d", node, type); @@ -523,8 +492,6 @@ struct connman_device *connman_device_create(const char *node, device->phyindex = -1; - service_type = __connman_device_get_service_type(device); - device->blocked = __connman_technology_get_blocked(service_type); device->backoff_interval = SCAN_INITIAL_DELAY; switch (type) { @@ -733,33 +700,6 @@ int connman_device_set_powered(struct connman_device *device, return 0; } -int __connman_device_set_blocked(struct connman_device *device, - connman_bool_t blocked) -{ - connman_bool_t powered; - - DBG("device %p blocked %d", device, blocked); - - device->blocked = blocked; - - if (device->offlinemode == TRUE) - return 0; - - connman_info("%s {rfkill} blocked %d", device->interface, blocked); - - if (blocked == FALSE) - powered = device->powered_persistent; - else - powered = FALSE; - - return set_powered(device, powered); -} - -connman_bool_t __connman_device_get_blocked(struct connman_device *device) -{ - return device->blocked; -} - static int device_scan(struct connman_device *device) { if (!device->driver || !device->driver->scan) @@ -1177,7 +1117,7 @@ static int device_probe(struct connman_device *device) if (device->driver == NULL) return 0; - return setup_device(device); + return __connman_technology_add_device(device); } static void device_remove(struct connman_device *device) diff --git a/src/profile.c b/src/profile.c index 11e2adc0..aaf0ad0c 100644 --- a/src/profile.c +++ b/src/profile.c @@ -44,13 +44,6 @@ static struct connman_profile *default_profile = NULL; static DBusConnection *connection = NULL; -static void offlinemode_changed(struct connman_profile *profile) -{ - connman_dbus_property_changed_basic(CONNMAN_MANAGER_PATH, - CONNMAN_MANAGER_INTERFACE, "OfflineMode", - DBUS_TYPE_BOOLEAN, &profile->offlinemode); -} - connman_bool_t __connman_profile_get_offlinemode(void) { if (default_profile == NULL) @@ -72,8 +65,6 @@ int __connman_profile_set_offlinemode(connman_bool_t offlinemode) return -EALREADY; default_profile->offlinemode = offlinemode; - offlinemode_changed(default_profile); - return 0; } diff --git a/src/technology.c b/src/technology.c index ae381aad..b62ee31b 100644 --- a/src/technology.c +++ b/src/technology.c @@ -56,7 +56,6 @@ struct connman_technology { GHashTable *rfkill_list; GSList *device_list; gint enabled; - gint blocked; char *regdom; connman_bool_t tethering; @@ -618,6 +617,7 @@ int __connman_technology_add_device(struct connman_device *device) { struct connman_technology *technology; enum connman_service_type type; + connman_bool_t offlinemode = __connman_profile_get_offlinemode(); DBG("device %p", device); @@ -628,10 +628,11 @@ int __connman_technology_add_device(struct connman_device *device) if (technology == NULL) return -ENXIO; - if (g_atomic_int_get(&technology->blocked)) - goto done; - -done: + if (technology->enable_persistent && !offlinemode) + __connman_device_enable(device); + /* if technology persistent state is offline */ + if (!technology->enable_persistent) + __connman_device_disable(device); technology->device_list = g_slist_append(technology->device_list, device); @@ -690,9 +691,6 @@ int __connman_technology_enabled(enum connman_service_type type) if (technology == NULL) return -ENXIO; - if (g_atomic_int_get(&technology->blocked)) - return -ERFKILL; - if (g_atomic_int_exchange_and_add(&technology->enabled, 1) == 0) { __connman_notifier_enable(type); technology->state = CONNMAN_TECHNOLOGY_STATE_ENABLED; @@ -741,6 +739,8 @@ int __connman_technology_enable(enum connman_service_type type, DBusMessage *msg __connman_storage_save_technology(technology); } + __connman_rfkill_block(technology->type, FALSE); + for (list = technology->device_list; list; list = list->next) { struct connman_device *device = list->data; @@ -775,7 +775,6 @@ done: int __connman_technology_disabled(enum connman_service_type type) { struct connman_technology *technology; - GSList *list; technology = technology_find(type); if (technology == NULL) @@ -793,13 +792,6 @@ int __connman_technology_disabled(enum connman_service_type type) state_changed(technology); } - for (list = technology->device_list; list; list = list->next) { - struct connman_device *device = list->data; - - if (__connman_device_get_blocked(device) == FALSE) - return 0; - } - return 0; } @@ -830,6 +822,8 @@ int __connman_technology_disable(enum connman_service_type type, DBusMessage *ms __connman_storage_save_technology(technology); } + __connman_rfkill_block(technology->type, TRUE); + for (list = technology->device_list; list; list = list->next) { struct connman_device *device = list->data; @@ -862,6 +856,15 @@ int __connman_technology_set_offlinemode(connman_bool_t offlinemode) int err = -EINVAL; DBG("offlinemode %s", offlinemode ? "On" : "Off"); + /* + * This is a bit tricky. When you set offlinemode, there is no + * way to differentiate between attempting offline mode and + * resuming offlinemode from last saved profile. We need that + * information in rfkill_update, otherwise it falls back on the + * technology's persistent state. Hence we set the offline mode here + * but save it & call the notifier only if its successful. + */ + __connman_profile_set_offlinemode(offlinemode); /* Traverse technology list, enable/disable each technology. */ for (list = technology_list; list; list = list->next) { @@ -869,32 +872,19 @@ int __connman_technology_set_offlinemode(connman_bool_t offlinemode) if (offlinemode) err = __connman_technology_disable(technology->type, NULL); + if (!offlinemode && technology->enable_persistent) err = __connman_technology_enable(technology->type, NULL); } - if (err == 0 || err == -EINPROGRESS) { - __connman_profile_set_offlinemode(offlinemode); + if (err == 0 || err == -EINPROGRESS || err == -EALREADY) { __connman_profile_save_default(); - __connman_notifier_offlinemode(offlinemode); } return err; } -static void technology_blocked(struct connman_technology *technology, - connman_bool_t blocked) -{ - GSList *list; - - for (list = technology->device_list; list; list = list->next) { - struct connman_device *device = list->data; - - __connman_device_set_blocked(device, blocked); - } -} - int __connman_technology_add_rfkill(unsigned int index, enum connman_service_type type, connman_bool_t softblock, @@ -902,7 +892,7 @@ int __connman_technology_add_rfkill(unsigned int index, { struct connman_technology *technology; struct connman_rfkill *rfkill; - connman_bool_t blocked; + connman_bool_t offlinemode = __connman_profile_get_offlinemode(); DBG("index %u type %d soft %u hard %u", index, type, softblock, hardblock); @@ -922,15 +912,24 @@ int __connman_technology_add_rfkill(unsigned int index, g_hash_table_replace(technology->rfkill_list, &rfkill->index, rfkill); - blocked = (softblock || hardblock) ? TRUE : FALSE; - if (blocked == FALSE) + if (hardblock) { + DBG("%s is switched off.", get_name(type)); return 0; + } - if (g_atomic_int_exchange_and_add(&technology->blocked, 1) == 0) { - technology_blocked(technology, TRUE); - - technology->state = CONNMAN_TECHNOLOGY_STATE_OFFLINE; - state_changed(technology); + /* + * If Offline mode is on, we softblock the device if it isnt already. + * If Offline mode is off, we rely on the persistent state of tech. + */ + if (offlinemode) { + if (!softblock) + return __connman_rfkill_block(type, TRUE); + } else { + if (technology->enable_persistent && softblock) + return __connman_rfkill_block(type, FALSE); + /* if technology persistent state is offline */ + if (!technology->enable_persistent && !softblock) + return __connman_rfkill_block(type, TRUE); } return 0; @@ -943,7 +942,7 @@ int __connman_technology_update_rfkill(unsigned int index, { struct connman_technology *technology; struct connman_rfkill *rfkill; - connman_bool_t blocked, old_blocked; + connman_bool_t offlinemode = __connman_profile_get_offlinemode(); DBG("index %u soft %u hard %u", index, softblock, hardblock); @@ -955,33 +954,23 @@ int __connman_technology_update_rfkill(unsigned int index, if (rfkill == NULL) return -ENXIO; - old_blocked = (rfkill->softblock || rfkill->hardblock) ? TRUE : FALSE; - blocked = (softblock || hardblock) ? TRUE : FALSE; + if (rfkill->softblock == softblock && + rfkill->hardblock == hardblock) + return 0; rfkill->softblock = softblock; rfkill->hardblock = hardblock; - if (blocked == old_blocked) + if (hardblock) { + DBG("%s is switched off.", get_name(type)); return 0; + } - if (blocked) { - guint n_blocked; - - n_blocked = - g_atomic_int_exchange_and_add(&technology->blocked, 1); - if (n_blocked != g_hash_table_size(technology->rfkill_list) - 1) - return 0; - - technology_blocked(technology, blocked); - technology->state = CONNMAN_TECHNOLOGY_STATE_OFFLINE; - state_changed(technology); - } else { - if (g_atomic_int_dec_and_test(&technology->blocked) == FALSE) - return 0; - - technology_blocked(technology, blocked); - technology->state = CONNMAN_TECHNOLOGY_STATE_ENABLED; - state_changed(technology); + if (!offlinemode) { + if (technology->enable_persistent && softblock) + return __connman_rfkill_block(type, FALSE); + if (!technology->enable_persistent && !softblock) + return __connman_rfkill_block(type, TRUE); } return 0; @@ -992,7 +981,6 @@ int __connman_technology_remove_rfkill(unsigned int index, { struct connman_technology *technology; struct connman_rfkill *rfkill; - connman_bool_t blocked; DBG("index %u", index); @@ -1004,34 +992,13 @@ int __connman_technology_remove_rfkill(unsigned int index, if (rfkill == NULL) return -ENXIO; - blocked = (rfkill->softblock || rfkill->hardblock) ? TRUE : FALSE; - g_hash_table_remove(technology->rfkill_list, &index); - if (blocked && - g_atomic_int_dec_and_test(&technology->blocked) == TRUE) { - technology_blocked(technology, FALSE); - technology->state = CONNMAN_TECHNOLOGY_STATE_OFFLINE; - state_changed(technology); - } + technology_put(technology); return 0; } -connman_bool_t __connman_technology_get_blocked(enum connman_service_type type) -{ - struct connman_technology *technology; - - technology = technology_find(type); - if (technology == NULL) - return FALSE; - - if (g_atomic_int_get(&technology->blocked)) - return TRUE; - - return FALSE; -} - static int technology_load(struct connman_technology *technology) { const char *ident = __connman_profile_active_ident(); |