connman_bool_t powered;
connman_bool_t carrier;
connman_bool_t scanning;
+ connman_bool_t disconnected;
connman_uint8_t priority;
char *name;
char *node;
connman_bool_t registered;
+ char *last_network;
+ struct connman_network *network;
GHashTable *networks;
};
switch (device->mode) {
case CONNMAN_DEVICE_MODE_UNKNOWN:
+ break;
case CONNMAN_DEVICE_MODE_TRANSPORT_IP:
+ __connman_element_append_ipv4(&device->element, &dict);
break;
case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
struct connman_device *device = data;
DBusMessageIter iter, value;
const char *name;
+ int type;
DBG("conn %p", conn);
CONNMAN_SECURITY_PRIVILEGE_MODIFY) < 0)
return __connman_error_permission_denied(msg);
+ type = dbus_message_iter_get_arg_type(&value);
+
if (g_str_equal(name, "Powered") == TRUE) {
connman_bool_t powered;
int err;
+ if (type != DBUS_TYPE_BOOLEAN)
+ return __connman_error_invalid_arguments(msg);
+
dbus_message_iter_get_basic(&value, &powered);
if (device->powered == powered)
const char *str;
int err;
+ if (type != DBUS_TYPE_STRING)
+ return __connman_error_invalid_arguments(msg);
+
dbus_message_iter_get_basic(&value, &str);
policy = string2policy(str);
if (policy == CONNMAN_DEVICE_POLICY_UNKNOWN)
} else if (g_str_equal(name, "Priority") == TRUE) {
connman_uint8_t priority;
+ if (type != DBUS_TYPE_BYTE)
+ return __connman_error_invalid_arguments(msg);
+
dbus_message_iter_get_basic(&value, &priority);
device->priority = priority;
+ } else if (g_str_has_prefix(name, "IPv4") == TRUE) {
+ switch (device->mode) {
+ case CONNMAN_DEVICE_MODE_UNKNOWN:
+ case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
+ case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
+ return __connman_error_invalid_arguments(msg);
+ case CONNMAN_DEVICE_MODE_TRANSPORT_IP:
+ __connman_element_set_ipv4(&device->element,
+ name, &value);
+ break;
+ }
}
__connman_storage_save_device(device);
g_free(device->name);
g_free(device->interface);
+ g_free(device->last_network);
+
g_hash_table_destroy(device->networks);
device->networks = NULL;
}
DBG("device %p", device);
- device->element.refcount = 1;
+ __connman_element_initialize(&device->element);
device->element.name = g_strdup(node);
device->element.type = CONNMAN_ELEMENT_TYPE_DEVICE;
- device->element.index = -1;
device->element.device = device;
device->element.destruct = device_destruct;
str = type2string(type);
if (str != NULL)
- connman_element_add_static_property(&device->element,
+ connman_element_set_static_property(&device->element,
"Type", DBUS_TYPE_STRING, &str);
+ device->element.ipv4.method = CONNMAN_IPV4_METHOD_DHCP;
+
device->type = type;
device->mode = CONNMAN_DEVICE_MODE_UNKNOWN;
device->policy = CONNMAN_DEVICE_POLICY_AUTO;
}
/**
+ * connman_device_get_mode:
+ * @device: device structure
+ *
+ * Get network mode of device
+ */
+enum connman_device_mode connman_device_get_mode(struct connman_device *device)
+{
+ return device->mode;
+}
+
+/**
* connman_device_set_powered:
* @device: device structure
* @powered: powered state
device->carrier = carrier;
if (carrier == TRUE) {
+ enum connman_element_type type = CONNMAN_ELEMENT_TYPE_UNKNOWN;
struct connman_element *element;
+ switch (device->element.ipv4.method) {
+ case CONNMAN_IPV4_METHOD_UNKNOWN:
+ case CONNMAN_IPV4_METHOD_OFF:
+ return 0;
+ case CONNMAN_IPV4_METHOD_STATIC:
+ type = CONNMAN_ELEMENT_TYPE_IPV4;
+ break;
+ case CONNMAN_IPV4_METHOD_DHCP:
+ type = CONNMAN_ELEMENT_TYPE_DHCP;
+ break;
+ }
+
element = connman_element_create(NULL);
if (element != NULL) {
- element->type = CONNMAN_ELEMENT_TYPE_DHCP;
+ element->type = type;
element->index = device->element.index;
if (connman_element_register(element,
return 0;
}
+void __connman_device_disconnect(struct connman_device *device)
+{
+ GHashTableIter iter;
+ gpointer key, value;
+
+ DBG("device %p", device);
+
+ connman_device_set_disconnected(device, TRUE);
+
+ g_hash_table_iter_init(&iter, device->networks);
+
+ while (g_hash_table_iter_next(&iter, &key, &value) == TRUE) {
+ struct connman_network *network = value;
+
+ if (connman_network_get_connected(network) == TRUE)
+ __connman_network_disconnect(network);
+ }
+}
+
static void connect_known_network(struct connman_device *device)
{
struct connman_network *network = NULL;
while (g_hash_table_iter_next(&iter, &key, &value) == TRUE) {
connman_uint8_t old_priority, new_priority;
connman_uint8_t old_strength, new_strength;
+ const char *name;
count++;
+ name = connman_network_get_string(value, "Name");
+ if (name != NULL && device->last_network != NULL) {
+ if (g_str_equal(name, device->last_network) == TRUE) {
+ network = value;
+ break;
+ }
+ }
+
if (connman_network_get_remember(value) == FALSE)
continue;
}
old_strength = connman_network_get_uint8(network, "Strength");
- old_strength = connman_network_get_uint8(value, "Strength");
+ new_strength = connman_network_get_uint8(value, "Strength");
if (new_strength > old_strength)
network = value;
device->driver->scan(device);
}
+static void mark_network_unavailable(gpointer key, gpointer value,
+ gpointer user_data)
+{
+ struct connman_network *network = value;
+
+ if (connman_network_get_connected(network) == TRUE)
+ return;
+
+ connman_network_set_available(network, FALSE);
+}
+
+static gboolean remove_unavailable_network(gpointer key, gpointer value,
+ gpointer user_data)
+{
+ struct connman_network *network = value;
+
+ if (connman_network_get_connected(network) == TRUE)
+ return FALSE;
+
+ if (connman_network_get_remember(network) == TRUE)
+ return FALSE;
+
+ if (connman_network_get_available(network) == TRUE)
+ return FALSE;
+
+ return TRUE;
+}
+
/**
* connman_device_set_scanning:
* @device: device structure
g_dbus_send_message(connection, signal);
- if (scanning == TRUE)
+ if (scanning == TRUE) {
+ g_hash_table_foreach(device->networks,
+ mark_network_unavailable, NULL);
return 0;
+ }
+
+ g_hash_table_foreach_remove(device->networks,
+ remove_unavailable_network, NULL);
if (device->connections > 0)
return 0;
+ if (device->disconnected == TRUE)
+ return 0;
+
if (device->policy != CONNMAN_DEVICE_POLICY_AUTO)
return 0;
}
/**
+ * connman_device_set_disconnected:
+ * @device: device structure
+ * @disconnected: disconnected state
+ *
+ * Change disconnected state of device (only for device with networks)
+ */
+int connman_device_set_disconnected(struct connman_device *device,
+ connman_bool_t disconnected)
+{
+ DBG("driver %p disconnected %d", device, disconnected);
+
+ switch (device->mode) {
+ case CONNMAN_DEVICE_MODE_UNKNOWN:
+ case CONNMAN_DEVICE_MODE_TRANSPORT_IP:
+ return -EINVAL;
+ case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
+ case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
+ break;
+ }
+
+ if (device->disconnected == disconnected)
+ return -EALREADY;
+
+ device->disconnected = disconnected;
+
+ return 0;
+}
+
+/**
* connman_device_set_string:
* @device: device structure
* @key: unique identifier
return NULL;
}
-static void set_flightmode(struct connman_element *element, gpointer user_data)
+static void set_offlinemode(struct connman_element *element, gpointer user_data)
{
struct connman_device *device = element->device;
- connman_bool_t flightmode = GPOINTER_TO_UINT(user_data);
+ connman_bool_t offlinemode = GPOINTER_TO_UINT(user_data);
connman_bool_t powered;
DBG("element %p name %s", element, element->name);
if (device == NULL)
return;
- powered = (flightmode == TRUE) ? FALSE : TRUE;
+ powered = (offlinemode == TRUE) ? FALSE : TRUE;
if (device->powered == powered)
return;
set_powered(device, powered);
}
-int __connman_device_set_flightmode(connman_bool_t flightmode)
+int __connman_device_set_offlinemode(connman_bool_t offlinemode)
{
- DBG("flightmode %d", flightmode);
+ DBG("offlinmode %d", offlinemode);
__connman_element_foreach(NULL, CONNMAN_ELEMENT_TYPE_DEVICE,
- set_flightmode, GUINT_TO_POINTER(flightmode));
+ set_offlinemode, GUINT_TO_POINTER(offlinemode));
return 0;
}
return 0;
}
+void __connman_device_set_network(struct connman_device *device,
+ struct connman_network *network)
+{
+ const char *name;
+
+ if (network != NULL) {
+ name = connman_network_get_string(network, "Name");
+ device->last_network = g_strdup(name);
+ }
+
+ device->network = network;
+}
+
/**
* connman_device_register:
* @device: device structure
{
__connman_storage_load_device(device);
+ switch (device->mode) {
+ case CONNMAN_DEVICE_MODE_UNKNOWN:
+ case CONNMAN_DEVICE_MODE_TRANSPORT_IP:
+ break;
+ case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
+ case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
+ __connman_storage_init_network(device);
+ break;
+ }
+
return connman_element_register(&device->element, NULL);
}
if (val > 0)
device->priority = val;
+ str = g_key_file_get_string(keyfile, "Configuration",
+ "LastNetwork", NULL);
+ if (str != NULL)
+ device->last_network = str;
+
g_key_file_free(keyfile);
return 0;
g_key_file_set_integer(keyfile, "Configuration",
"Priority", device->priority);
+ if (device->last_network != NULL)
+ g_key_file_set_string(keyfile, "Configuration",
+ "LastNetwork", device->last_network);
+
data = g_key_file_to_data(keyfile, &length, NULL);
g_file_set_contents(pathname, data, length, NULL);
g_free(pathname);
+ if (device->network != NULL)
+ __connman_storage_save_network(device->network);
+
return 0;
}
projects / connman / blobdiff