device->disconnected = FALSE;
- __connman_service_indicate_configuration(service);
+ __connman_service_indicate_state(service,
+ CONNMAN_SERVICE_STATE_CONFIGURATION);
}
} else
connman_element_unregister_children(&device->element);
err = set_powered(device, powered);
if (err < 0 && err != -EINPROGRESS)
- return __connman_error_failed(msg);
+ return __connman_error_failed(msg, -err);
} else if (g_str_equal(name, "Policy") == TRUE) {
enum connman_device_policy policy;
const char *str;
err = set_policy(conn, device, policy);
if (err < 0)
- return __connman_error_failed(msg);
+ return __connman_error_failed(msg, -err);
} else if (g_str_equal(name, "Priority") == TRUE) {
connman_uint8_t priority;
network = connman_network_create("00_00_00_00_00_00", type);
if (network == NULL)
- return __connman_error_failed(msg);
+ return __connman_error_failed(msg, ENOMEM);
while (dbus_message_iter_get_arg_type(&array) == DBUS_TYPE_DICT_ENTRY) {
DBusMessageIter entry, value;
connman_network_unref(network);
if (err < 0)
- return __connman_error_failed(msg);
+ return __connman_error_failed(msg, -err);
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
return __connman_error_not_supported(msg);
if (device->powered == FALSE)
- return __connman_error_failed(msg);
+ return __connman_error_failed(msg, EINVAL);
err = device->driver->scan(device);
if (err < 0)
- return __connman_error_failed(msg);
+ return __connman_error_failed(msg, -err);
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
struct connman_network *network = NULL;
GHashTableIter iter;
gpointer key, value;
+ const char *name;
unsigned int count = 0;
DBG("device %p", device);
g_hash_table_iter_init(&iter, device->networks);
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++;
}
}
- if (connman_network_get_remember(value) == FALSE)
- continue;
-
if (network == NULL) {
network = value;
continue;
}
- old_priority = connman_network_get_uint8(network,
- CONNMAN_PROPERTY_ID_PRIORITY);
- new_priority = connman_network_get_uint8(value,
- CONNMAN_PROPERTY_ID_PRIORITY);
-
- if (new_priority != old_priority) {
- if (new_priority > old_priority)
- network = value;
- continue;
- }
-
old_strength = connman_network_get_uint8(network,
CONNMAN_PROPERTY_ID_STRENGTH);
new_strength = connman_network_get_uint8(value,
if (network != NULL) {
int err;
- err = connman_network_connect(network);
- if (err == 0 || err == -EINPROGRESS)
- return;
+ name = connman_network_get_string(value,
+ CONNMAN_PROPERTY_ID_NAME);
+ if (name != NULL) {
+ err = __connman_network_connect(network);
+ if (err == 0 || err == -EINPROGRESS)
+ return;
+ }
}
if (count > 0)
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;
{
const char *name;
+ if (device->network == network)
+ return;
+
+ if (device->network != NULL)
+ connman_network_unref(device->network);
+
if (network != NULL) {
name = connman_network_get_string(network,
CONNMAN_PROPERTY_ID_NAME);
+ g_free(device->last_network);
device->last_network = g_strdup(name);
- }
- device->network = network;
+ device->network = connman_network_ref(network);
+ } else {
+ g_free(device->last_network);
+ device->last_network = NULL;
+
+ device->network = NULL;
+ }
}
/**
static int device_load(struct connman_device *device)
{
GKeyFile *keyfile;
- gchar *pathname, *data = NULL;
+ gchar *pathname, *identifier, *data = NULL;
gsize length;
char *str;
int val;
DBG("device %p", device);
pathname = g_strdup_printf("%s/%s.conf", STORAGEDIR,
- device->element.name);
+ __connman_profile_active_ident());
if (pathname == NULL)
return -ENOMEM;
g_free(data);
- str = g_key_file_get_string(keyfile, "Configuration", "Policy", NULL);
+ identifier = g_strdup_printf("device_%s", device->element.name);
+ if (identifier == NULL)
+ goto done;
+
+ str = g_key_file_get_string(keyfile, identifier, "Policy", NULL);
if (str != NULL) {
device->policy = string2policy(str);
g_free(str);
}
- val = g_key_file_get_integer(keyfile, "Configuration",
- "Priority", NULL);
- if (val > 0)
- device->priority = val;
-
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:
- val = g_key_file_get_integer(keyfile, "Configuration",
+ val = g_key_file_get_integer(keyfile, identifier,
"ScanInterval", NULL);
if (val > 0)
device->scan_interval = val;
break;
}
-#if 0
- str = g_key_file_get_string(keyfile, "Configuration",
- "LastNetwork", NULL);
- if (str != NULL)
- device->last_network = str;
-#endif
-
+done:
g_key_file_free(keyfile);
+ g_free(identifier);
+
return 0;
}
static int device_save(struct connman_device *device)
{
GKeyFile *keyfile;
- gchar *pathname, *data = NULL;
+ gchar *pathname, *identifier = NULL, *data = NULL;
gsize length;
const char *str;
DBG("device %p", device);
pathname = g_strdup_printf("%s/%s.conf", STORAGEDIR,
- device->element.name);
+ __connman_profile_active_ident());
if (pathname == NULL)
return -ENOMEM;
g_free(data);
update:
+ identifier = g_strdup_printf("device_%s", device->element.name);
+ if (identifier == NULL)
+ goto done;
+
str = policy2string(device->policy);
if (str != NULL)
- g_key_file_set_string(keyfile, "Configuration", "Policy", str);
-
- if (device->priority > 0)
- g_key_file_set_integer(keyfile, "Configuration",
- "Priority", device->priority);
+ g_key_file_set_string(keyfile, identifier, "Policy", str);
switch (device->mode) {
case CONNMAN_DEVICE_MODE_UNKNOWN:
case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
if (device->scan_interval > 0)
- g_key_file_set_integer(keyfile, "Configuration",
+ g_key_file_set_integer(keyfile, identifier,
"ScanInterval", device->scan_interval);
break;
}
- 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);
if (g_file_set_contents(pathname, data, length, NULL) == FALSE)
g_key_file_free(keyfile);
+ g_free(identifier);
g_free(pathname);
- if (device->network != NULL)
- __connman_storage_save_network(device->network);
-
return 0;
}