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:
static gboolean technology_dbus_register(struct connman_technology *technology)
{
if (technology->dbus_registered == TRUE ||
- (technology->rfkill_driven &&
+ (technology->rfkill_driven == TRUE &&
technology->hardblocked == TRUE))
return TRUE;
technology->rfkill_driven = FALSE;
technology->softblocked = FALSE;
-
- if (type == CONNMAN_SERVICE_TYPE_ETHERNET)
- technology->hardblocked = FALSE;
- else
- technology->hardblocked = TRUE;
+ technology->hardblocked = FALSE;
technology->type = type;
technology->path = g_strdup_printf("%s/technology/%s",
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:
static void powered_changed(struct connman_technology *technology)
{
+ if (technology->dbus_registered == FALSE)
+ return;
+
if (technology->pending_reply != NULL) {
g_dbus_send_reply(connection,
technology->pending_reply, DBUS_TYPE_INVALID);
if (technology == NULL)
return -ENXIO;
+ if (technology->rfkill_driven == TRUE)
+ return 0;
+
return technology_enabled(technology);
}
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 (technology->rfkill_driven == TRUE)
+ return 0;
+
+ for (list = technology->device_list; list != NULL; list = list->next) {
+ struct connman_device *device = list->data;
+
+ if (connman_device_get_powered(device) == TRUE)
+ return 0;
+ }
+
return technology_disabled(technology);
}
static connman_bool_t technology_apply_rfkill_change(struct connman_technology *technology,
connman_bool_t softblock,
- connman_bool_t hardblock)
+ 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)
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)
goto softblock_change;
technology->hardblocked = hardblock;
-
- if (hardblock == TRUE) {
- DBG("%s is switched off.", get_name(technology->type));
- technology_disable(technology);
- technology_dbus_unregister(technology);
- } else {
- technology_enable(technology);
- technology_dbus_register(technology);
- }
+ hardblock_changed = 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;
}
/* If hardblocked, there is no need to handle softblocked state */
if (technology_apply_rfkill_change(technology,
- softblock, hardblock) == TRUE)
+ softblock, hardblock, TRUE) == TRUE)
return 0;
/*
technology->enable_persistent == TRUE)
return __connman_rfkill_block(type, FALSE);
else if (technology->softblocked == FALSE &&
- global_offlinemode == TRUE &&
- technology->enable_persistent == FALSE)
+ (global_offlinemode == TRUE ||
+ technology->enable_persistent == FALSE))
return __connman_rfkill_block(type, TRUE);
return 0;
/* If hardblocked, there is no need to handle softblocked state */
if (technology_apply_rfkill_change(technology,
- softblock, hardblock) == TRUE)
+ softblock, hardblock, FALSE) == TRUE)
return 0;
if (global_offlinemode == TRUE)
if (technology == NULL)
return -ENXIO;
+ technology_apply_rfkill_change(technology,
+ technology->softblocked, !technology->hardblocked, FALSE);
+
technology_put(technology);
return 0;