static GSList *technology_list = NULL;
+/*
+ * List of devices with no technology associated with them either because of
+ * no compiled in support or the driver is not yet loaded.
+*/
+static GSList *techless_device_list = NULL;
+static GHashTable *rfkill_list;
+
static connman_bool_t global_offlinemode;
struct connman_rfkill {
connman_bool_t hardblock;
};
-enum connman_technology_state {
- CONNMAN_TECHNOLOGY_STATE_UNKNOWN = 0,
- CONNMAN_TECHNOLOGY_STATE_OFFLINE = 1,
- CONNMAN_TECHNOLOGY_STATE_ENABLED = 2,
- CONNMAN_TECHNOLOGY_STATE_CONNECTED = 3,
-};
-
struct connman_technology {
int refcount;
enum connman_service_type type;
- enum connman_technology_state state;
char *path;
- GHashTable *rfkill_list;
GSList *device_list;
int enabled;
char *regdom;
DBusMessage *pending_reply;
guint pending_timeout;
+
+ GSList *scan_pending;
};
static GSList *driver_list = NULL;
return driver2->priority - driver1->priority;
}
+static void rfkill_check(gpointer key, gpointer value, gpointer user_data)
+{
+ struct connman_rfkill *rfkill = value;
+ enum connman_service_type type = GPOINTER_TO_INT(user_data);
+
+ /* Calling _technology_rfkill_add will update the tech. */
+ if (rfkill->type == type)
+ __connman_technology_add_rfkill(rfkill->index, type,
+ rfkill->softblock, rfkill->hardblock);
+}
+
/**
* connman_technology_driver_register:
* @driver: Technology driver definition
*/
int connman_technology_driver_register(struct connman_technology_driver *driver)
{
+ GSList *list;
+ struct connman_device *device;
+ enum connman_service_type type;
+
DBG("Registering %s driver", driver->name);
driver_list = g_slist_insert_sorted(driver_list, driver,
compare_priority);
+ if (techless_device_list == NULL)
+ goto check_rfkill;
+
+ /*
+ * Check for technology less devices if this driver
+ * can service any of them.
+ */
+ for (list = techless_device_list; list; list = list->next) {
+ device = list->data;
+
+ type = __connman_device_get_service_type(device);
+ if (type != driver->type)
+ continue;
+
+ techless_device_list = g_slist_remove(techless_device_list,
+ device);
+
+ __connman_technology_add_device(device);
+ }
+
+check_rfkill:
+ /* Check for orphaned rfkill switches. */
+ g_hash_table_foreach(rfkill_list, rfkill_check,
+ GINT_TO_POINTER(driver->type));
+
return 0;
}
g_free(rfkill);
}
-static const char *state2string(enum connman_technology_state state)
-{
- switch (state) {
- case CONNMAN_TECHNOLOGY_STATE_UNKNOWN:
- break;
- case CONNMAN_TECHNOLOGY_STATE_OFFLINE:
- return "offline";
- case CONNMAN_TECHNOLOGY_STATE_ENABLED:
- return "enabled";
- case CONNMAN_TECHNOLOGY_STATE_CONNECTED:
- return "connected";
- }
-
- return NULL;
-}
-
-static void state_changed(struct connman_technology *technology)
-{
- const char *str;
-
- str = state2string(technology->state);
- if (str == NULL)
- return;
-
- connman_dbus_property_changed_basic(technology->path,
- CONNMAN_TECHNOLOGY_INTERFACE, "State",
- DBUS_TYPE_STRING, &str);
-}
-
static const char *get_name(enum connman_service_type type)
{
switch (type) {
connman_dbus_dict_open(iter, &dict);
- str = state2string(technology->state);
- if (str != NULL)
- connman_dbus_dict_append_basic(&dict, "State",
- DBUS_TYPE_STRING, &str);
-
str = get_name(technology->type);
if (str != NULL)
connman_dbus_dict_append_basic(&dict, "Name",
if (dbus_message_iter_init(msg, &iter) == FALSE)
return __connman_error_invalid_arguments(msg);
+ if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING)
+ return __connman_error_invalid_arguments(msg);
+
dbus_message_iter_get_basic(&iter, &name);
dbus_message_iter_next(&iter);
+
+ if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_VARIANT)
+ return __connman_error_invalid_arguments(msg);
+
dbus_message_iter_recurse(&iter, &value);
type = dbus_message_iter_get_arg_type(&value);
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
-static GDBusMethodTable technology_methods[] = {
- { "GetProperties", "", "a{sv}", get_properties },
- { "SetProperty", "sv", "", set_property },
- { },
-};
-
-static GDBusSignalTable technology_signals[] = {
- { "PropertyChanged", "sv" },
- { },
-};
-
static struct connman_technology *technology_find(enum connman_service_type type)
{
GSList *list;
return NULL;
}
+static void reply_scan_pending(struct connman_technology *technology, int err)
+{
+ DBusMessage *reply;
+
+ DBG("technology %p err %d", technology, err);
+
+ while (technology->scan_pending != NULL) {
+ DBusMessage *msg = technology->scan_pending->data;
+
+ DBG("reply to %s", dbus_message_get_sender(msg));
+
+ if (err == 0)
+ reply = g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+ else
+ reply = __connman_error_failed(msg, -err);
+ g_dbus_send_message(connection, reply);
+ dbus_message_unref(msg);
+
+ technology->scan_pending =
+ g_slist_delete_link(technology->scan_pending,
+ technology->scan_pending);
+ }
+}
+
+void __connman_technology_scan_started(struct connman_device *device)
+{
+ DBG("device %p", device);
+}
+
+void __connman_technology_scan_stopped(struct connman_device *device)
+{
+ int count = 0;
+ struct connman_technology *technology;
+ enum connman_service_type type;
+ GSList *list;
+
+ type = __connman_device_get_service_type(device);
+ technology = technology_find(type);
+
+ DBG("technology %p device %p", technology, device);
+
+ if (technology == NULL)
+ return;
+
+ for (list = technology->device_list; list != NULL; list = list->next) {
+ struct connman_device *other_device = list->data;
+
+ if (device == other_device)
+ continue;
+
+ if (__connman_device_get_service_type(other_device) != type)
+ continue;
+
+ if (__connman_device_scanning(other_device))
+ count += 1;
+ }
+
+ if (count == 0)
+ reply_scan_pending(technology, 0);
+}
+
+static DBusMessage *scan(DBusConnection *conn, DBusMessage *msg, void *data)
+{
+ struct connman_technology *technology = data;
+ int err;
+
+ DBG ("technology %p request from %s", technology,
+ dbus_message_get_sender(msg));
+
+ dbus_message_ref(msg);
+ technology->scan_pending =
+ g_slist_prepend(technology->scan_pending, msg);
+
+ err = __connman_device_request_scan(technology->type);
+ if (err < 0)
+ reply_scan_pending(technology, err);
+
+ return NULL;
+}
+
+static GDBusMethodTable technology_methods[] = {
+ { "GetProperties", "", "a{sv}", get_properties },
+ { "SetProperty", "sv", "", set_property },
+ { "Scan", "", "", scan,
+ G_DBUS_METHOD_FLAG_ASYNC },
+ { },
+};
+
+static GDBusSignalTable technology_signals[] = {
+ { "PropertyChanged", "sv" },
+ { },
+};
+
static struct connman_technology *technology_get(enum connman_service_type type)
{
struct connman_technology *technology;
return NULL;
technology = technology_find(type);
- if (technology != NULL)
+ if (technology != NULL) {
+ __sync_fetch_and_add(&technology->refcount, 1);
return technology;
+ }
/* First check if we have a driver for this technology type */
for (list = driver_list; list; list = list->next) {
technology->path = g_strdup_printf("%s/technology/%s",
CONNMAN_PATH, str);
- technology->rfkill_list = g_hash_table_new_full(g_int_hash, g_int_equal,
- NULL, free_rfkill);
technology->device_list = NULL;
technology->pending_reply = NULL;
- technology->state = CONNMAN_TECHNOLOGY_STATE_OFFLINE;
load_state(technology);
{
DBG("technology %p", technology);
- if (__sync_fetch_and_sub(&technology->refcount, 1) != 1)
+ if (__sync_sub_and_fetch(&technology->refcount, 1) > 0)
return;
+ reply_scan_pending(technology, -EINTR);
+
if (technology->driver) {
technology->driver->remove(technology);
technology->driver = NULL;
CONNMAN_TECHNOLOGY_INTERFACE);
g_slist_free(technology->device_list);
- g_hash_table_destroy(technology->rfkill_list);
g_free(technology->path);
g_free(technology->regdom);
type = __connman_device_get_service_type(device);
technology = technology_get(type);
- if (technology == NULL)
+ if (technology == NULL) {
+ /*
+ * Since no driver can be found for this device at the moment we
+ * add it to the techless device list.
+ */
+ techless_device_list = g_slist_prepend(techless_device_list,
+ device);
+
return -ENXIO;
+ }
- if (technology->enable_persistent && !global_offlinemode)
- __connman_device_enable(device);
+ if (technology->enable_persistent && !global_offlinemode) {
+ int err = __connman_device_enable(device);
+ /*
+ * connman_technology_add_device() calls __connman_device_enable()
+ * but since the device is already enabled, the calls does not
+ * propagate through to connman_technology_enabled via
+ * connman_device_set_powered.
+ */
+ if (err == -EALREADY)
+ __connman_technology_enabled(type);
+ }
/* if technology persistent state is offline */
if (!technology->enable_persistent)
__connman_device_disable(device);
type = __connman_device_get_service_type(device);
technology = technology_find(type);
- if (technology == NULL)
+ if (technology == NULL) {
+ techless_device_list = g_slist_remove(techless_device_list,
+ device);
return -ENXIO;
+ }
+
+ if (__connman_device_scanning(device))
+ __connman_technology_scan_stopped(device);
technology->device_list = g_slist_remove(technology->device_list,
device);
- if (technology->device_list == NULL) {
- technology->state = CONNMAN_TECHNOLOGY_STATE_OFFLINE;
- state_changed(technology);
- }
+ technology_put(technology);
return 0;
}
if (technology == NULL)
return -ENXIO;
- if (__sync_fetch_and_add(&technology->enabled, 1) == 0) {
- technology->state = CONNMAN_TECHNOLOGY_STATE_ENABLED;
- state_changed(technology);
+ if (__sync_fetch_and_add(&technology->enabled, 1) == 0)
powered_changed(technology);
- }
if (technology->pending_reply != NULL) {
g_dbus_send_reply(connection, technology->pending_reply, DBUS_TYPE_INVALID);
technology->pending_timeout = 0;
}
- if (__sync_fetch_and_sub(&technology->enabled, 1) != 1)
- return 0;
-
- technology->state = CONNMAN_TECHNOLOGY_STATE_OFFLINE;
- state_changed(technology);
- powered_changed(technology);
+ if (__sync_fetch_and_sub(&technology->enabled, 1) == 1)
+ powered_changed(technology);
return 0;
}
DBG("index %u type %d soft %u hard %u", index, type,
softblock, hardblock);
- technology = technology_get(type);
- if (technology == NULL)
- return -ENXIO;
+ rfkill = g_hash_table_lookup(rfkill_list, &index);
+ if (rfkill != NULL)
+ goto done;
rfkill = g_try_new0(struct connman_rfkill, 1);
if (rfkill == NULL)
rfkill->softblock = softblock;
rfkill->hardblock = hardblock;
- g_hash_table_replace(technology->rfkill_list, &rfkill->index, rfkill);
+ g_hash_table_insert(rfkill_list, &rfkill->index, rfkill);
+
+done:
+ technology = technology_get(type);
+ /* If there is no driver for this type, ignore it. */
+ if (technology == NULL)
+ return -ENXIO;
if (hardblock) {
DBG("%s is switched off.", get_name(type));
DBG("index %u soft %u hard %u", index, softblock, hardblock);
- technology = technology_find(type);
- if (technology == NULL)
- return -ENXIO;
-
- rfkill = g_hash_table_lookup(technology->rfkill_list, &index);
+ rfkill = g_hash_table_lookup(rfkill_list, &index);
if (rfkill == NULL)
return -ENXIO;
return 0;
}
+ technology = technology_find(type);
+ /* If there is no driver for this type, ignore it. */
+ if (technology == NULL)
+ return -ENXIO;
+
if (!global_offlinemode) {
if (technology->enable_persistent && softblock)
return __connman_rfkill_block(type, FALSE);
DBG("index %u", index);
- technology = technology_find(type);
- if (technology == NULL)
- return -ENXIO;
-
- rfkill = g_hash_table_lookup(technology->rfkill_list, &index);
+ rfkill = g_hash_table_lookup(rfkill_list, &index);
if (rfkill == NULL)
return -ENXIO;
- g_hash_table_remove(technology->rfkill_list, &index);
+ g_hash_table_remove(rfkill_list, &index);
+
+ technology = technology_find(type);
+ if (technology == NULL)
+ return -ENXIO;
technology_put(technology);
connection = connman_dbus_get_connection();
+ rfkill_list = g_hash_table_new_full(g_int_hash, g_int_equal,
+ NULL, free_rfkill);
+
global_offlinemode = connman_technology_load_offlinemode();
return 0;
{
DBG("");
+ g_hash_table_destroy(rfkill_list);
+
dbus_connection_unref(connection);
}
projects / platform / upstream / connman.git / blobdiff