struct connman_device {
struct connman_element element;
enum connman_device_type type;
+ enum connman_device_mode mode;
enum connman_device_policy policy;
gboolean powered;
gboolean carrier;
struct connman_device_driver *driver;
void *driver_data;
- GSList *networks;
+ GHashTable *networks;
};
+static const char *type2description(enum connman_device_type type)
+{
+ switch (type) {
+ case CONNMAN_DEVICE_TYPE_ETHERNET:
+ return "Ethernet";
+ case CONNMAN_DEVICE_TYPE_WIFI:
+ return "Wireless";
+ case CONNMAN_DEVICE_TYPE_WIMAX:
+ return "WiMAX";
+ case CONNMAN_DEVICE_TYPE_BLUETOOTH:
+ return "Bluetooth";
+ case CONNMAN_DEVICE_TYPE_HSO:
+ return "Cellular";
+ default:
+ return NULL;
+ }
+}
+
static const char *type2string(enum connman_device_type type)
{
switch (type) {
return "wifi";
case CONNMAN_DEVICE_TYPE_WIMAX:
return "wimax";
- case CONNMAN_DEVICE_TYPE_MODEM:
- return "modem";
case CONNMAN_DEVICE_TYPE_BLUETOOTH:
return "bluetooth";
+ case CONNMAN_DEVICE_TYPE_HSO:
+ return "cellular";
default:
return NULL;
}
switch (policy) {
case CONNMAN_DEVICE_POLICY_IGNORE:
return "ignore";
- case CONNMAN_DEVICE_POLICY_AUTO:
- return "auto";
case CONNMAN_DEVICE_POLICY_OFF:
return "off";
+ case CONNMAN_DEVICE_POLICY_AUTO:
+ return "auto";
+ case CONNMAN_DEVICE_POLICY_MANUAL:
+ return "manual";
default:
return NULL;
}
}
+static enum connman_device_policy string2policy(const char *policy)
+{
+ if (g_str_equal(policy, "ignore") == TRUE)
+ return CONNMAN_DEVICE_POLICY_IGNORE;
+ else if (g_str_equal(policy, "off") == TRUE)
+ return CONNMAN_DEVICE_POLICY_OFF;
+ else if (g_str_equal(policy, "auto") == TRUE)
+ return CONNMAN_DEVICE_POLICY_AUTO;
+ else if (g_str_equal(policy, "manual") == TRUE)
+ return CONNMAN_DEVICE_POLICY_MANUAL;
+ else
+ return CONNMAN_DEVICE_POLICY_UNKNOWN;
+}
+
static int set_powered(struct connman_device *device, gboolean powered)
{
struct connman_device_driver *driver = device->driver;
return err;
}
+static int set_policy(DBusConnection *connection,
+ struct connman_device *device,
+ enum connman_device_policy policy)
+{
+ DBusMessage *signal;
+ DBusMessageIter entry, value;
+ const char *str, *key = "Policy";
+ int err = 0;
+
+ DBG("device %p policy %d", device, policy);
+
+ if (device->policy == policy)
+ return 0;
+
+ switch (policy) {
+ case CONNMAN_DEVICE_POLICY_OFF:
+ if (device->powered == TRUE)
+ err = set_powered(device, FALSE);
+ break;
+ case CONNMAN_DEVICE_POLICY_AUTO:
+ case CONNMAN_DEVICE_POLICY_MANUAL:
+ if (device->powered == FALSE)
+ err = set_powered(device, TRUE);
+ break;
+ default:
+ break;
+ }
+
+ if (err < 0)
+ return err;
+
+ device->policy = policy;
+
+ signal = dbus_message_new_signal(device->element.path,
+ CONNMAN_DEVICE_INTERFACE, "PropertyChanged");
+ if (signal == NULL)
+ return 0;
+
+ dbus_message_iter_init_append(signal, &entry);
+
+ dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
+
+ str = policy2string(policy);
+
+ dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
+ DBUS_TYPE_STRING_AS_STRING, &value);
+ dbus_message_iter_append_basic(&value, DBUS_TYPE_STRING, &str);
+ dbus_message_iter_close_container(&entry, &value);
+
+ g_dbus_send_message(connection, signal);
+
+ return 0;
+}
+
+static void append_networks(struct connman_device *device,
+ DBusMessageIter *entry)
+{
+ DBusMessageIter value, iter;
+ const char *key = "Networks";
+
+ dbus_message_iter_append_basic(entry, DBUS_TYPE_STRING, &key);
+
+ dbus_message_iter_open_container(entry, DBUS_TYPE_VARIANT,
+ DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_OBJECT_PATH_AS_STRING,
+ &value);
+
+ dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY,
+ DBUS_TYPE_OBJECT_PATH_AS_STRING, &iter);
+ __connman_element_list((struct connman_element *) device,
+ CONNMAN_ELEMENT_TYPE_NETWORK, &iter);
+ dbus_message_iter_close_container(&value, &iter);
+
+ dbus_message_iter_close_container(entry, &value);
+}
+
static DBusMessage *get_properties(DBusConnection *conn,
DBusMessage *msg, void *data)
{
struct connman_device *device = data;
DBusMessage *reply;
- DBusMessageIter array, dict;
+ DBusMessageIter array, dict, entry;
const char *str;
DBG("conn %p", conn);
DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
+ str = type2description(device->type);
+ if (str != NULL && device->interface != NULL) {
+ char *name = g_strdup_printf("%s (%s)", str, device->interface);
+ if (name != NULL)
+ connman_dbus_dict_append_variant(&dict, "Name",
+ DBUS_TYPE_STRING, &name);
+ g_free(name);
+ }
+
str = type2string(device->type);
if (str != NULL)
connman_dbus_dict_append_variant(&dict, "Type",
connman_dbus_dict_append_variant(&dict, "Scanning",
DBUS_TYPE_BOOLEAN, &device->scanning);
+ if (device->mode != CONNMAN_DEVICE_MODE_NO_NETWORK) {
+ dbus_message_iter_open_container(&dict, DBUS_TYPE_DICT_ENTRY,
+ NULL, &entry);
+ append_networks(device, &entry);
+ dbus_message_iter_close_container(&dict, &entry);
+ }
+
dbus_message_iter_close_container(&array, &dict);
return reply;
err = set_powered(device, powered);
if (err < 0 && err != -EINPROGRESS)
return __connman_error_failed(msg);
+ } else if (g_str_equal(name, "Policy") == TRUE) {
+ enum connman_device_policy policy;
+ const char *str;
+ int err;
+
+ dbus_message_iter_get_basic(&value, &str);
+ policy = string2policy(str);
+ if (policy == CONNMAN_DEVICE_POLICY_UNKNOWN)
+ return __connman_error_invalid_arguments(msg);
+
+ err = set_policy(conn, device, policy);
+ if (err < 0)
+ return __connman_error_failed(msg);
}
__connman_element_store(&device->element);
static DBusMessage *propose_scan(DBusConnection *conn,
DBusMessage *msg, void *data)
{
+ struct connman_device *device = data;
+ int err;
+
DBG("conn %p", conn);
- return __connman_error_failed(msg);
+ if (device->mode == CONNMAN_DEVICE_MODE_NO_NETWORK)
+ return __connman_error_not_supported(msg);
+
+ if (!device->driver || !device->driver->scan)
+ return __connman_error_not_supported(msg);
+
+ err = device->driver->scan(device);
+ if (err < 0)
+ return __connman_error_failed(msg);
+
+ return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
static GDBusMethodTable device_methods[] = {
static DBusConnection *connection;
+static void append_devices(DBusMessageIter *entry)
+{
+ DBusMessageIter value, iter;
+ const char *key = "Devices";
+
+ dbus_message_iter_append_basic(entry, DBUS_TYPE_STRING, &key);
+
+ dbus_message_iter_open_container(entry, DBUS_TYPE_VARIANT,
+ DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_OBJECT_PATH_AS_STRING,
+ &value);
+
+ dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY,
+ DBUS_TYPE_OBJECT_PATH_AS_STRING, &iter);
+ __connman_element_list(NULL, CONNMAN_ELEMENT_TYPE_DEVICE, &iter);
+ dbus_message_iter_close_container(&value, &iter);
+
+ dbus_message_iter_close_container(entry, &value);
+}
+
+static void emit_devices_signal(void)
+{
+ DBusMessage *signal;
+ DBusMessageIter entry;
+
+ signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH,
+ CONNMAN_MANAGER_INTERFACE, "PropertyChanged");
+ if (signal == NULL)
+ return;
+
+ dbus_message_iter_init_append(signal, &entry);
+
+ append_devices(&entry);
+
+ g_dbus_send_message(connection, signal);
+}
+
static int register_interface(struct connman_element *element)
{
struct connman_device *device = element->device;
- g_dbus_unregister_interface(connection, element->path,
- CONNMAN_DEVICE_INTERFACE);
-
if (g_dbus_register_interface(connection, element->path,
CONNMAN_DEVICE_INTERFACE,
device_methods, device_signals,
return -EIO;
}
+ emit_devices_signal();
+
return 0;
}
static void unregister_interface(struct connman_element *element)
{
+ emit_devices_signal();
+
g_dbus_unregister_interface(connection, element->path,
CONNMAN_DEVICE_INTERFACE);
}
driver_list = g_slist_remove(driver_list, driver);
}
+static void unregister_network(gpointer data)
+{
+ struct connman_network *network = data;
+
+ DBG("network %p", network);
+
+ connman_element_unregister((struct connman_element *) network);
+
+ connman_network_unref(network);
+}
+
static void device_destruct(struct connman_element *element)
{
struct connman_device *device = element->device;
DBG("element %p name %s", element, element->name);
g_free(device->interface);
+
+ g_hash_table_destroy(device->networks);
}
/**
DBG("device %p", device);
+ device->element.refcount = 1;
+
device->element.name = g_strdup(node);
device->element.type = CONNMAN_ELEMENT_TYPE_DEVICE;
device->element.index = -1;
+ switch (type) {
+ case CONNMAN_DEVICE_TYPE_ETHERNET:
+ device->element.subtype = CONNMAN_ELEMENT_SUBTYPE_ETHERNET;
+ break;
+ default:
+ device->element.subtype = CONNMAN_ELEMENT_SUBTYPE_UNKNOWN;
+ break;
+ }
+
device->element.device = device;
device->element.destruct = device_destruct;
device->type = type;
+ device->mode = CONNMAN_DEVICE_MODE_NO_NETWORK;
device->policy = CONNMAN_DEVICE_POLICY_AUTO;
+ device->networks = g_hash_table_new_full(g_str_hash, g_str_equal,
+ g_free, unregister_network);
+
return device;
}
}
/**
+ * connman_device_set_policy:
+ * @device: device structure
+ * @policy: power and connection policy
+ *
+ * Change power and connection policy of device
+ */
+void connman_device_set_policy(struct connman_device *device,
+ enum connman_device_policy policy)
+{
+ device->policy = policy;
+}
+
+/**
+ * connman_device_set_mode:
+ * @device: device structure
+ * @mode: network mode
+ *
+ * Change network mode of device
+ */
+void connman_device_set_mode(struct connman_device *device,
+ enum connman_device_mode mode)
+{
+ device->mode = mode;
+}
+
+/**
* connman_device_set_powered:
* @device: device structure
* @powered: powered state
{
DBG("driver %p carrier %d", device, carrier);
- if (!device->driver)
- return -EINVAL;
-
- if (device->driver->scan)
+ if (device->mode != CONNMAN_DEVICE_MODE_NO_NETWORK)
return -EINVAL;
if (device->carrier == carrier)
DBG("driver %p scanning %d", device, scanning);
- if (!device->driver)
- return -EINVAL;
-
- if (!device->driver->scan)
+ if (!device->driver || !device->driver->scan)
return -EINVAL;
if (device->scanning == scanning)
}
/**
+ * connman_device_add_network:
+ * @device: device structure
+ * @network: network structure
+ *
+ * Add new network to the device
+ */
+int connman_device_add_network(struct connman_device *device,
+ struct connman_network *network)
+{
+ const char *identifier = connman_network_get_identifier(network);
+ int err;
+
+ DBG("device %p network %p", device, network);
+
+ if (device->mode == CONNMAN_DEVICE_MODE_NO_NETWORK)
+ return -EINVAL;
+
+ err = connman_element_register((struct connman_element *) network,
+ &device->element);
+ if (err < 0)
+ return err;
+
+ g_hash_table_insert(device->networks, g_strdup(identifier),
+ network);
+
+ return 0;
+}
+
+/**
+ * connman_device_get_network:
+ * @device: device structure
+ * @identifier: network identifier
+ *
+ * Get network for given identifier
+ */
+struct connman_network *connman_device_get_network(struct connman_device *device,
+ const char *identifier)
+{
+ DBG("device %p identifier %s", device, identifier);
+
+ return g_hash_table_lookup(device->networks, identifier);
+}
+
+/**
+ * connman_device_remove_network:
+ * @device: device structure
+ * @identifier: network identifier
+ *
+ * Remove network for given identifier
+ */
+int connman_device_remove_network(struct connman_device *device,
+ const char *identifier)
+{
+ DBG("device %p identifier %s", device, identifier);
+
+ g_hash_table_remove(device->networks, identifier);
+
+ return 0;
+}
+
+/**
* connman_device_register:
* @device: device structure
*
{
DBG("device %p", device);
- if (device->policy != CONNMAN_DEVICE_POLICY_AUTO)
+ if (device->policy == CONNMAN_DEVICE_POLICY_IGNORE ||
+ device->policy == CONNMAN_DEVICE_POLICY_OFF)
return;
if (device->powered == TRUE)
{
DBG("device %p", device);
- if (device->policy != CONNMAN_DEVICE_POLICY_AUTO)
+ if (device->policy == CONNMAN_DEVICE_POLICY_IGNORE)
return;
if (device->powered == FALSE)
if (device == NULL)
return -ENODEV;
- err = register_interface(element);
- if (err < 0)
- return err;
-
for (list = driver_list; list; list = list->next) {
struct connman_device_driver *driver = list->data;
if (driver->probe(device) == 0) {
device->driver = driver;
- device_enable(device);
break;
}
}
+ if (!device->driver)
+ return -ENODEV;
+
+ err = register_interface(element);
+ if (err < 0) {
+ if (device->driver->remove)
+ device->driver->remove(device);
+ return err;
+ }
+
+ device_enable(device);
+
return 0;
}
if (device == NULL)
return;
- unregister_interface(element);
+ if (!device->driver)
+ return;
- if (device->driver) {
- device_disable(device);
+ device_disable(device);
- if (device->driver->remove)
- device->driver->remove(device);
- }
+ unregister_interface(element);
+
+ if (device->driver->remove)
+ device->driver->remove(device);
}
static struct connman_driver device_driver = {
projects / connman / blobdiff