enum connman_service_type type;
char *path;
GSList *device_list;
- int enabled;
+ connman_bool_t enabled;
char *regdom;
connman_bool_t connected;
GSList *scan_pending;
+ connman_bool_t rfkill_driven;
+ connman_bool_t softblocked;
connman_bool_t hardblocked;
+ connman_bool_t dbus_registered;
};
static GSList *driver_list = NULL;
technology->driver->set_tethering == NULL)
return -EOPNOTSUPP;
+ __sync_synchronize();
+ if (technology->enabled == FALSE)
+ return -EACCES;
+
bridge = __connman_tethering_get_bridge();
if (bridge == NULL)
return -EOPNOTSUPP;
return "Wired";
case CONNMAN_SERVICE_TYPE_WIFI:
return "WiFi";
- case CONNMAN_SERVICE_TYPE_WIMAX:
- return "WiMAX";
case CONNMAN_SERVICE_TYPE_BLUETOOTH:
return "Bluetooth";
case CONNMAN_SERVICE_TYPE_CELLULAR:
{
DBusMessageIter dict;
const char *str;
- connman_bool_t powered;
connman_dbus_dict_open(iter, &dict);
DBUS_TYPE_STRING, &str);
__sync_synchronize();
- if (technology->enabled > 0)
- powered = TRUE;
- else
- powered = FALSE;
connman_dbus_dict_append_basic(&dict, "Powered",
- DBUS_TYPE_BOOLEAN, &powered);
+ DBUS_TYPE_BOOLEAN,
+ &technology->enabled);
connman_dbus_dict_append_basic(&dict, "Connected",
DBUS_TYPE_BOOLEAN,
if (technology->tethering_ident != NULL)
connman_dbus_dict_append_basic(&dict, "TetheringIdentifier",
- DBUS_TYPE_STRING,
- &technology->tethering_ident);
+ DBUS_TYPE_STRING,
+ &technology->tethering_ident);
if (technology->tethering_passphrase != NULL)
connman_dbus_dict_append_basic(&dict, "TetheringPassphrase",
- DBUS_TYPE_STRING,
- &technology->tethering_passphrase);
+ DBUS_TYPE_STRING,
+ &technology->tethering_passphrase);
connman_dbus_dict_close(iter, &dict);
}
for (list = technology_list; list; list = list->next) {
struct connman_technology *technology = list->data;
- if (technology->path == NULL)
+ if (technology->path == NULL ||
+ (technology->rfkill_driven == TRUE &&
+ technology->hardblocked == TRUE))
continue;
dbus_message_iter_open_container(array, DBUS_TYPE_STRUCT,
return FALSE;
}
-static int technology_enable(struct connman_technology *technology,
- connman_bool_t hardblock)
+static int technology_affect_devices(struct connman_technology *technology,
+ connman_bool_t enable_device)
{
GSList *list;
int err = 0;
- DBG("technology %p enable", technology);
+ for (list = technology->device_list; list; list = list->next) {
+ struct connman_device *device = list->data;
- __sync_synchronize();
- if (technology->enabled > 0) {
- err = -EALREADY;
- goto done;
+ if (enable_device == TRUE)
+ err = __connman_device_enable(device);
+ else
+ err = __connman_device_disable(device);
}
- if (technology->pending_reply != NULL) {
- err = -EBUSY;
- goto done;
- }
+ return err;
+}
- if (hardblock == TRUE && technology->enable_persistent == FALSE)
- goto done;
+static int technology_enable(struct connman_technology *technology)
+{
+ DBG("technology %p enable", technology);
- __connman_rfkill_block(technology->type, FALSE);
+ __sync_synchronize();
+ if (technology->enabled == TRUE)
+ return -EALREADY;
- for (list = technology->device_list; list; list = list->next) {
- struct connman_device *device = list->data;
+ if (technology->pending_reply != NULL)
+ return -EBUSY;
- err = __connman_device_enable(device);
- }
+ if (technology->rfkill_driven == TRUE)
+ return __connman_rfkill_block(technology->type, FALSE);
-done:
- return err;
+ return technology_affect_devices(technology, TRUE);
}
-static int technology_disable(struct connman_technology *technology,
- connman_bool_t hardblock)
+static int technology_disable(struct connman_technology *technology)
{
- GSList *list;
- int err = 0;
-
DBG("technology %p disable", technology);
__sync_synchronize();
- if (technology->enabled == 0) {
- err = -EALREADY;
- goto done;
- }
+ if (technology->enabled == FALSE)
+ return -EALREADY;
- if (technology->pending_reply != NULL) {
- err = -EBUSY;
- goto done;
- }
+ if (technology->pending_reply != NULL)
+ return -EBUSY;
if (technology->tethering == TRUE)
set_tethering(technology, FALSE);
- if (hardblock == FALSE)
- __connman_rfkill_block(technology->type, TRUE);
-
- for (list = technology->device_list; list; list = list->next) {
- struct connman_device *device = list->data;
-
- err = __connman_device_disable(device);
- }
+ if (technology->rfkill_driven == TRUE)
+ return __connman_rfkill_block(technology->type, TRUE);
-done:
- return err;
+ return technology_affect_devices(technology, FALSE);
}
static DBusMessage *set_powered(struct connman_technology *technology,
DBusMessage *reply = NULL;
int err = 0;
- if (technology->hardblocked == TRUE) {
+ if (technology->rfkill_driven && technology->hardblocked == TRUE) {
err = -EACCES;
goto make_reply;
}
if (powered == TRUE)
- err = technology_enable(technology, FALSE);
+ err = technology_enable(technology);
else
- err = technology_disable(technology, FALSE);
+ err = technology_disable(technology);
if (err != -EBUSY) {
technology->enable_persistent = powered;
{ },
};
+static gboolean technology_dbus_register(struct connman_technology *technology)
+{
+ if (technology->dbus_registered == TRUE ||
+ (technology->rfkill_driven == TRUE &&
+ technology->hardblocked == TRUE))
+ return TRUE;
+
+ if (g_dbus_register_interface(connection, technology->path,
+ CONNMAN_TECHNOLOGY_INTERFACE,
+ technology_methods, technology_signals,
+ NULL, technology, NULL) == FALSE) {
+ connman_error("Failed to register %s", technology->path);
+ return FALSE;
+ }
+
+ technology_added_signal(technology);
+ technology->dbus_registered = TRUE;
+
+ return TRUE;
+}
+
static struct connman_technology *technology_get(enum connman_service_type type)
{
struct connman_technology *technology;
technology->refcount = 1;
- if (type == CONNMAN_SERVICE_TYPE_ETHERNET)
- technology->hardblocked = FALSE;
- else
- technology->hardblocked = TRUE;
+ technology->rfkill_driven = FALSE;
+ technology->softblocked = FALSE;
+ technology->hardblocked = FALSE;
technology->type = type;
technology->path = g_strdup_printf("%s/technology/%s",
technology_load(technology);
- if (g_dbus_register_interface(connection, technology->path,
- CONNMAN_TECHNOLOGY_INTERFACE,
- technology_methods, technology_signals,
- NULL, technology, NULL) == FALSE) {
- connman_error("Failed to register %s", technology->path);
+ if (technology_dbus_register(technology) == FALSE) {
g_free(technology);
return NULL;
}
technology_list = g_slist_prepend(technology_list, technology);
- technology_added_signal(technology);
-
technology->driver = driver;
err = driver->probe(technology);
if (err != 0)
return technology;
}
+static void technology_dbus_unregister(struct connman_technology *technology)
+{
+ if (technology->dbus_registered == FALSE)
+ return;
+
+ technology_removed_signal(technology);
+ g_dbus_unregister_interface(connection, technology->path,
+ CONNMAN_TECHNOLOGY_INTERFACE);
+
+ technology->dbus_registered = FALSE;
+}
+
static void technology_put(struct connman_technology *technology)
{
DBG("technology %p", technology);
technology_list = g_slist_remove(technology_list, technology);
- technology_removed_signal(technology);
-
- g_dbus_unregister_interface(connection, technology->path,
- CONNMAN_TECHNOLOGY_INTERFACE);
+ technology_dbus_unregister(technology);
g_slist_free(technology->device_list);
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_GPS:
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_GPS:
return -ENXIO;
}
- if (technology->enable_persistent &&
- global_offlinemode == FALSE &&
- technology->hardblocked == FALSE) {
+ __sync_synchronize();
+ if (technology->rfkill_driven == TRUE) {
+ if (technology->enabled == TRUE)
+ __connman_device_enable(device);
+ else
+ __connman_device_disable(device);
+
+ goto done;
+ }
+
+ if (technology->enable_persistent == TRUE &&
+ global_offlinemode == FALSE) {
int err = __connman_device_enable(device);
/*
* connman_technology_add_device() calls __connman_device_enable()
if (err == -EALREADY)
__connman_technology_enabled(type);
}
- /* if technology persistent state is offline or hardblocked */
- if (technology->enable_persistent == FALSE ||
- technology->hardblocked == TRUE)
+ /* if technology persistent state is offline */
+ if (technology->enable_persistent == FALSE)
__connman_device_disable(device);
+done:
technology->device_list = g_slist_prepend(technology->device_list,
device);
static void powered_changed(struct connman_technology *technology)
{
- connman_bool_t powered;
+ if (technology->dbus_registered == FALSE)
+ return;
- __sync_synchronize();
- if (technology->enabled >0)
- powered = TRUE;
- else
- powered = FALSE;
+ if (technology->pending_reply != NULL) {
+ g_dbus_send_reply(connection,
+ technology->pending_reply, DBUS_TYPE_INVALID);
+ dbus_message_unref(technology->pending_reply);
+ technology->pending_reply = NULL;
+ g_source_remove(technology->pending_timeout);
+ technology->pending_timeout = 0;
+ }
+
+ __sync_synchronize();
connman_dbus_property_changed_basic(technology->path,
CONNMAN_TECHNOLOGY_INTERFACE, "Powered",
- DBUS_TYPE_BOOLEAN, &powered);
+ DBUS_TYPE_BOOLEAN, &technology->enabled);
+}
+
+static int technology_enabled(struct connman_technology *technology)
+{
+ __sync_synchronize();
+ if (technology->enabled == TRUE)
+ return -EALREADY;
+
+ technology->enabled = TRUE;
+
+ powered_changed(technology);
+
+ return 0;
}
int __connman_technology_enabled(enum connman_service_type type)
if (technology == NULL)
return -ENXIO;
- if (__sync_fetch_and_add(&technology->enabled, 1) != 0)
+ if (technology->rfkill_driven == TRUE)
+ return 0;
+
+ return technology_enabled(technology);
+}
+
+static int technology_disabled(struct connman_technology *technology)
+{
+ __sync_synchronize();
+ if (technology->enabled == FALSE)
return -EALREADY;
- powered_changed(technology);
+ technology->enabled = FALSE;
- if (technology->pending_reply != NULL) {
- g_dbus_send_reply(connection, technology->pending_reply, DBUS_TYPE_INVALID);
- dbus_message_unref(technology->pending_reply);
- g_source_remove(technology->pending_timeout);
- technology->pending_reply = NULL;
- technology->pending_timeout = 0;
- }
+ powered_changed(technology);
return 0;
}
int __connman_technology_disabled(enum connman_service_type type)
{
struct connman_technology *technology;
+ GSList *list;
technology = technology_find(type);
if (technology == NULL)
return -ENXIO;
- if (__sync_fetch_and_sub(&technology->enabled, 1) != 1)
- return -EINPROGRESS;
+ if (technology->rfkill_driven == TRUE)
+ return 0;
- if (technology->pending_reply != NULL) {
- g_dbus_send_reply(connection, technology->pending_reply, DBUS_TYPE_INVALID);
- dbus_message_unref(technology->pending_reply);
- g_source_remove(technology->pending_timeout);
- technology->pending_reply = NULL;
- technology->pending_timeout = 0;
- }
+ for (list = technology->device_list; list != NULL; list = list->next) {
+ struct connman_device *device = list->data;
- powered_changed(technology);
+ if (connman_device_get_powered(device) == TRUE)
+ return 0;
+ }
- return 0;
+ return technology_disabled(technology);
}
int __connman_technology_set_offlinemode(connman_bool_t offlinemode)
struct connman_technology *technology = list->data;
if (offlinemode)
- err = technology_disable(technology, FALSE);
+ err = technology_disable(technology);
if (!offlinemode && technology->enable_persistent)
- err = technology_enable(technology, FALSE);
+ err = technology_enable(technology);
}
if (err == 0 || err == -EINPROGRESS || err == -EALREADY) {
DBUS_TYPE_BOOLEAN, &connected);
}
-static void technology_apply_hardblock_change(struct connman_technology *technology,
- connman_bool_t hardblock)
+static connman_bool_t technology_apply_rfkill_change(struct connman_technology *technology,
+ connman_bool_t softblock,
+ connman_bool_t hardblock,
+ connman_bool_t new_rfkill)
{
+ gboolean hardblock_changed = FALSE;
gboolean apply = TRUE;
GList *start, *list;
+ DBG("technology %p --> %d/%d vs %d/%d",
+ technology, softblock, hardblock,
+ technology->softblocked, technology->hardblocked);
+
if (technology->hardblocked == hardblock)
- return;
+ goto softblock_change;
- start = g_hash_table_get_values(rfkill_list);
- for (list = start; list != NULL; list = list->next) {
- struct connman_rfkill *rfkill = list->data;
+ if (!(new_rfkill == TRUE && hardblock == FALSE)) {
+ start = g_hash_table_get_values(rfkill_list);
- if (rfkill->type != technology->type)
- continue;
+ for (list = start; list != NULL; list = list->next) {
+ struct connman_rfkill *rfkill = list->data;
- if (rfkill->hardblock != hardblock)
- apply = FALSE;
- }
+ if (rfkill->type != technology->type)
+ continue;
- g_list_free(start);
+ if (rfkill->hardblock != hardblock)
+ apply = FALSE;
+ }
+
+ g_list_free(start);
+ }
if (apply == FALSE)
- return;
+ goto softblock_change;
technology->hardblocked = hardblock;
+ hardblock_changed = TRUE;
- if (hardblock == TRUE) {
- DBG("%s is switched off.", get_name(technology->type));
- technology_disable(technology, TRUE);
- } else
- technology_enable(technology, TRUE);
+softblock_change:
+ if (apply == FALSE && technology->softblocked != softblock)
+ apply = TRUE;
+
+ if (apply == FALSE)
+ return technology->hardblocked;
+
+ technology->softblocked = softblock;
+
+ if (technology->hardblocked == TRUE ||
+ technology->softblocked == TRUE) {
+ if (technology_disabled(technology) != -EALREADY)
+ technology_affect_devices(technology, FALSE);
+ } else if (technology->hardblocked == FALSE &&
+ technology->softblocked == FALSE) {
+ if (technology_enabled(technology) != -EALREADY)
+ technology_affect_devices(technology, TRUE);
+ }
+ if (hardblock_changed == TRUE) {
+ if (technology->hardblocked == TRUE) {
+ DBG("%s is switched off.", get_name(technology->type));
+ technology_dbus_unregister(technology);
+ } else
+ technology_dbus_register(technology);
+ }
+
+ return technology->hardblocked;
}
int __connman_technology_add_rfkill(unsigned int index,
if (technology == NULL)
return -ENXIO;
- technology_apply_hardblock_change(technology, hardblock);
+ technology->rfkill_driven = TRUE;
+
+ /* If hardblocked, there is no need to handle softblocked state */
+ if (technology_apply_rfkill_change(technology,
+ softblock, hardblock, TRUE) == TRUE)
+ return 0;
/*
- * 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.
+ * Depending on softblocked state we unblock/block according to
+ * offlinemode and persistente state.
*/
- if (global_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);
- }
+ if (technology->softblocked == TRUE &&
+ global_offlinemode == FALSE &&
+ technology->enable_persistent == TRUE)
+ return __connman_rfkill_block(type, FALSE);
+ else if (technology->softblocked == FALSE &&
+ (global_offlinemode == TRUE ||
+ technology->enable_persistent == FALSE))
+ return __connman_rfkill_block(type, TRUE);
return 0;
}
return -ENXIO;
if (rfkill->softblock == softblock &&
- rfkill->hardblock == hardblock)
+ rfkill->hardblock == hardblock)
return 0;
rfkill->softblock = softblock;
if (technology == NULL)
return -ENXIO;
- technology_apply_hardblock_change(technology, hardblock);
+ /* If hardblocked, there is no need to handle softblocked state */
+ if (technology_apply_rfkill_change(technology,
+ softblock, hardblock, FALSE) == TRUE)
+ return 0;
- if (!global_offlinemode) {
- if (technology->enable_persistent && softblock)
- return __connman_rfkill_block(type, FALSE);
- if (!technology->enable_persistent && !softblock)
- return __connman_rfkill_block(type, TRUE);
- }
+ if (global_offlinemode == TRUE)
+ return 0;
+
+ /*
+ * Depending on softblocked state we unblock/block according to
+ * persistent state.
+ */
+ if (technology->softblocked == TRUE &&
+ technology->enable_persistent == TRUE)
+ return __connman_rfkill_block(type, FALSE);
+ else if (technology->softblocked == FALSE &&
+ technology->enable_persistent == FALSE)
+ return __connman_rfkill_block(type, TRUE);
return 0;
}
if (technology == NULL)
return -ENXIO;
+ technology_apply_rfkill_change(technology,
+ technology->softblocked, !technology->hardblocked, FALSE);
+
technology_put(technology);
return 0;
projects / platform / upstream / connman.git / blobdiff