*
* Connection Manager
*
- * Copyright (C) 2007-2009 Intel Corporation. All rights reserved.
+ * Copyright (C) 2007-2010 Intel Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
#include "connman.h"
+static DBusConnection *connection = NULL;
+
struct connman_device {
struct connman_element element;
enum connman_device_type type;
enum connman_device_mode mode;
- enum connman_device_policy policy;
- connman_bool_t secondary;
+ connman_bool_t offlinemode;
+ connman_bool_t blocked;
connman_bool_t powered;
- connman_bool_t carrier;
+ connman_bool_t powered_pending;
+ connman_bool_t powered_persistent;
connman_bool_t scanning;
connman_bool_t disconnected;
- connman_uint8_t priority;
+ connman_bool_t reconnect;
connman_uint16_t scan_interval;
char *name;
char *node;
char *address;
char *interface;
+ char *control;
char *ident;
+ int phyindex;
unsigned int connections;
guint scan_timeout;
char *last_network;
struct connman_network *network;
GHashTable *networks;
+
+ DBusMessage *pending;
+ guint timeout;
};
static gboolean device_scan_trigger(gpointer user_data)
return TRUE;
}
+static void clear_scan_trigger(struct connman_device *device)
+{
+ if (device->scan_timeout > 0) {
+ g_source_remove(device->scan_timeout);
+ device->scan_timeout = 0;
+ }
+}
+
+static void reset_scan_trigger(struct connman_device *device)
+{
+ clear_scan_trigger(device);
+
+ if (device->scan_interval > 0) {
+ guint interval = device->scan_interval;
+ device->scan_timeout = g_timeout_add_seconds(interval,
+ device_scan_trigger, device);
+ }
+}
+
+static void force_scan_trigger(struct connman_device *device)
+{
+ clear_scan_trigger(device);
+
+ device->scan_timeout = g_timeout_add_seconds(5,
+ device_scan_trigger, device);
+}
+
+void connman_device_schedule_scan(struct connman_device *device)
+{
+ reset_scan_trigger(device);
+}
+
static const char *type2description(enum connman_device_type type)
{
switch (type) {
return "Bluetooth";
case CONNMAN_DEVICE_TYPE_GPS:
return "GPS";
+ case CONNMAN_DEVICE_TYPE_CELLULAR:
+ case CONNMAN_DEVICE_TYPE_MBM:
case CONNMAN_DEVICE_TYPE_HSO:
- case CONNMAN_DEVICE_TYPE_NOZOMI:
- case CONNMAN_DEVICE_TYPE_HUAWEI:
- case CONNMAN_DEVICE_TYPE_NOVATEL:
return "Cellular";
}
return "bluetooth";
case CONNMAN_DEVICE_TYPE_GPS:
return "gps";
+ case CONNMAN_DEVICE_TYPE_CELLULAR:
+ case CONNMAN_DEVICE_TYPE_MBM:
case CONNMAN_DEVICE_TYPE_HSO:
- case CONNMAN_DEVICE_TYPE_HUAWEI:
- case CONNMAN_DEVICE_TYPE_NOZOMI:
- case CONNMAN_DEVICE_TYPE_NOVATEL:
return "cellular";
}
return NULL;
}
-static const char *policy2string(enum connman_device_policy policy)
+enum connman_service_type __connman_device_get_service_type(struct connman_device *device)
{
- switch (policy) {
- case CONNMAN_DEVICE_POLICY_UNKNOWN:
+ enum connman_device_type type = connman_device_get_type(device);
+
+ switch (type) {
+ case CONNMAN_DEVICE_TYPE_UNKNOWN:
+ case CONNMAN_DEVICE_TYPE_VENDOR:
+ case CONNMAN_DEVICE_TYPE_GPS:
break;
- case CONNMAN_DEVICE_POLICY_IGNORE:
- return "ignore";
- case CONNMAN_DEVICE_POLICY_OFF:
- return "off";
- case CONNMAN_DEVICE_POLICY_AUTO:
- return "auto";
- case CONNMAN_DEVICE_POLICY_MANUAL:
- return "manual";
+ case CONNMAN_DEVICE_TYPE_ETHERNET:
+ return CONNMAN_SERVICE_TYPE_ETHERNET;
+ case CONNMAN_DEVICE_TYPE_WIFI:
+ return CONNMAN_SERVICE_TYPE_WIFI;
+ case CONNMAN_DEVICE_TYPE_WIMAX:
+ return CONNMAN_SERVICE_TYPE_WIMAX;
+ case CONNMAN_DEVICE_TYPE_BLUETOOTH:
+ return CONNMAN_SERVICE_TYPE_BLUETOOTH;
+ case CONNMAN_DEVICE_TYPE_CELLULAR:
+ case CONNMAN_DEVICE_TYPE_MBM:
+ case CONNMAN_DEVICE_TYPE_HSO:
+ return CONNMAN_SERVICE_TYPE_CELLULAR;
}
- 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;
+ return CONNMAN_SERVICE_TYPE_UNKNOWN;
}
-static int set_carrier(struct connman_device *device, connman_bool_t carrier)
+static void powered_changed(struct connman_device *device)
{
- struct connman_service *service;
-
- service = __connman_service_lookup_from_device(device);
- __connman_service_set_carrier(service, carrier);
-
- if (carrier == TRUE) {
- enum connman_element_type type = CONNMAN_ELEMENT_TYPE_UNKNOWN;
- struct connman_element *element;
-
- device->disconnected = TRUE;
-
- switch (device->policy) {
- case CONNMAN_DEVICE_POLICY_UNKNOWN:
- case CONNMAN_DEVICE_POLICY_IGNORE:
- case CONNMAN_DEVICE_POLICY_OFF:
- case CONNMAN_DEVICE_POLICY_MANUAL:
- return 0;
- case CONNMAN_DEVICE_POLICY_AUTO:
- break;
- }
-
- 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 = type;
- element->index = device->element.index;
-
- if (connman_element_register(element,
- &device->element) < 0)
- connman_element_unref(element);
-
- device->disconnected = FALSE;
-
- __connman_service_indicate_state(service,
- CONNMAN_SERVICE_STATE_CONFIGURATION);
- }
- } else
- connman_element_unregister_children(&device->element);
-
- return 0;
+ connman_dbus_property_changed_basic(device->element.path,
+ CONNMAN_DEVICE_INTERFACE, "Powered",
+ DBUS_TYPE_BOOLEAN, &device->powered);
}
static int set_powered(struct connman_device *device, connman_bool_t powered)
{
struct connman_device_driver *driver = device->driver;
+ enum connman_service_type type;
int err;
DBG("device %p powered %d", device, powered);
+ if (device->powered_pending == powered)
+ return -EALREADY;
+
if (!driver)
return -EINVAL;
+ type = __connman_device_get_service_type(device);
+
if (powered == TRUE) {
if (driver->enable) {
+ device->powered_pending = powered;
+
err = driver->enable(device);
- __connman_notifier_device_type_increase(device->type);
+ if (err == 0)
+ __connman_notifier_enable(type);
} else
err = -EINVAL;
} else {
- g_hash_table_remove_all(device->networks);
+ device->powered_pending = powered;
+
+ device->reconnect = FALSE;
+
+ clear_scan_trigger(device);
- set_carrier(device, FALSE);
+ g_hash_table_remove_all(device->networks);
if (driver->disable) {
err = driver->disable(device);
- __connman_notifier_device_type_decrease(device->type);
+ if (err == 0)
+ __connman_notifier_disable(type);
} else
err = -EINVAL;
}
- 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;
+ if (err == 0) {
+ device->powered = powered;
- switch (policy) {
- case CONNMAN_DEVICE_POLICY_UNKNOWN:
- return -EINVAL;
- case CONNMAN_DEVICE_POLICY_IGNORE:
- break;
- 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);
- else
- err = set_carrier(device, device->carrier);
- break;
+ if (device->registered == TRUE)
+ powered_changed(device);
}
- 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 err;
+}
- return 0;
+void __connman_device_list(DBusMessageIter *iter, void *user_data)
+{
+ __connman_element_list(NULL, CONNMAN_ELEMENT_TYPE_DEVICE, iter);
}
static void append_path(gpointer key, gpointer value, gpointer user_data)
&element->path);
}
-static void append_networks(struct connman_device *device,
- DBusMessageIter *entry)
+static void append_networks(DBusMessageIter *iter, void *user_data)
{
- 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);
- g_hash_table_foreach(device->networks, append_path, &iter);
- dbus_message_iter_close_container(&value, &iter);
+ struct connman_device *device = user_data;
- dbus_message_iter_close_container(entry, &value);
+ g_hash_table_foreach(device->networks, append_path, iter);
}
static DBusMessage *get_properties(DBusConnection *conn,
{
struct connman_device *device = data;
DBusMessage *reply;
- DBusMessageIter array, dict, entry;
+ DBusMessageIter array, dict;
const char *str;
DBG("conn %p", conn);
dbus_message_iter_init_append(reply, &array);
- dbus_message_iter_open_container(&array, DBUS_TYPE_ARRAY,
- DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING
- DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
- DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
+ connman_dbus_dict_open(&array, &dict);
if (device->name != NULL)
- connman_dbus_dict_append_variant(&dict, "Name",
+ connman_dbus_dict_append_basic(&dict, "Name",
DBUS_TYPE_STRING, &device->name);
str = type2string(device->type);
if (str != NULL)
- connman_dbus_dict_append_variant(&dict, "Type",
+ connman_dbus_dict_append_basic(&dict, "Type",
DBUS_TYPE_STRING, &str);
if (device->address != NULL)
- connman_dbus_dict_append_variant(&dict, "Address",
+ connman_dbus_dict_append_basic(&dict, "Address",
DBUS_TYPE_STRING, &device->address);
if (device->interface != NULL)
- connman_dbus_dict_append_variant(&dict, "Interface",
+ connman_dbus_dict_append_basic(&dict, "Interface",
DBUS_TYPE_STRING, &device->interface);
- str = policy2string(device->policy);
- if (str != NULL)
- connman_dbus_dict_append_variant(&dict, "Policy",
- DBUS_TYPE_STRING, &str);
-
- if (device->priority > 0)
- connman_dbus_dict_append_variant(&dict, "Priority",
- DBUS_TYPE_BYTE, &device->priority);
-
- connman_dbus_dict_append_variant(&dict, "Powered",
+ connman_dbus_dict_append_basic(&dict, "Powered",
DBUS_TYPE_BOOLEAN, &device->powered);
if (device->driver && device->driver->scan)
- connman_dbus_dict_append_variant(&dict, "Scanning",
+ connman_dbus_dict_append_basic(&dict, "Scanning",
DBUS_TYPE_BOOLEAN, &device->scanning);
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:
if (device->scan_interval > 0)
- connman_dbus_dict_append_variant(&dict, "ScanInterval",
+ connman_dbus_dict_append_basic(&dict, "ScanInterval",
DBUS_TYPE_UINT16, &device->scan_interval);
- dbus_message_iter_open_container(&dict, DBUS_TYPE_DICT_ENTRY,
- NULL, &entry);
- append_networks(device, &entry);
- dbus_message_iter_close_container(&dict, &entry);
+ connman_dbus_dict_append_array(&dict, "Networks",
+ DBUS_TYPE_OBJECT_PATH, append_networks, device);
break;
}
- dbus_message_iter_close_container(&array, &dict);
+ connman_dbus_dict_close(&array, &dict);
return reply;
}
+static gboolean powered_timeout(gpointer user_data)
+{
+ struct connman_device *device = user_data;
+
+ DBG("device %p", device);
+
+ device->timeout = 0;
+
+ if (device->pending != NULL) {
+ DBusMessage *reply;
+
+ reply = __connman_error_operation_timeout(device->pending);
+ if (reply != NULL)
+ g_dbus_send_message(connection, reply);
+
+ dbus_message_unref(device->pending);
+ device->pending = NULL;
+ }
+
+ return FALSE;
+}
+
static DBusMessage *set_property(DBusConnection *conn,
DBusMessage *msg, void *data)
{
dbus_message_iter_get_basic(&value, &powered);
- if (device->powered == powered)
- return __connman_error_invalid_arguments(msg);
+ device->powered_persistent = powered;
- err = set_powered(device, powered);
- if (err < 0 && err != -EINPROGRESS)
- return __connman_error_failed(msg, -err);
- } else if (g_str_equal(name, "Policy") == TRUE) {
- enum connman_device_policy policy;
- const char *str;
- int err;
+ __connman_storage_save_device(device);
- if (type != DBUS_TYPE_STRING)
- return __connman_error_invalid_arguments(msg);
+ if (device->powered == powered)
+ return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
- dbus_message_iter_get_basic(&value, &str);
- policy = string2policy(str);
- if (policy == CONNMAN_DEVICE_POLICY_UNKNOWN)
- return __connman_error_invalid_arguments(msg);
+ if (device->pending != NULL)
+ return __connman_error_in_progress(msg);
- err = set_policy(conn, device, policy);
- if (err < 0)
- return __connman_error_failed(msg, -err);
- } else if (g_str_equal(name, "Priority") == TRUE) {
- connman_uint8_t priority;
+ err = set_powered(device, powered);
+ if (err < 0) {
+ if (err != -EINPROGRESS)
+ return __connman_error_failed(msg, -err);
- if (type != DBUS_TYPE_BYTE)
- return __connman_error_invalid_arguments(msg);
+ device->pending = dbus_message_ref(msg);
- dbus_message_iter_get_basic(&value, &priority);
+ device->timeout = g_timeout_add_seconds(15,
+ powered_timeout, device);
- device->priority = priority;
+ return NULL;
+ }
} else if (g_str_equal(name, "ScanInterval") == TRUE) {
connman_uint16_t interval;
switch (device->mode) {
case CONNMAN_DEVICE_MODE_UNKNOWN:
- case CONNMAN_DEVICE_MODE_TRANSPORT_IP:
- return __connman_error_invalid_arguments(msg);
case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
break;
dbus_message_iter_get_basic(&value, &interval);
- device->scan_interval = interval;
+ if (device->scan_interval != interval) {
+ device->scan_interval = interval;
- if (device->scan_timeout > 0) {
- g_source_remove(device->scan_timeout);
- device->scan_timeout = 0;
- }
+ __connman_storage_save_device(device);
- if (device->scan_interval > 0) {
- guint interval = device->scan_interval;
- device->scan_timeout = g_timeout_add_seconds(interval,
- device_scan_trigger, device);
- }
- } 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;
+ reset_scan_trigger(device);
}
- }
-
- __connman_storage_save_device(device);
-
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
-}
-
-static DBusMessage *join_network(DBusConnection *conn,
- DBusMessage *msg, void *data)
-{
- struct connman_device *device = data;
- struct connman_network *network;
- enum connman_network_type type;
- DBusMessageIter iter, array;
- int err, index;
-
- DBG("conn %p", conn);
-
- if (__connman_security_check_privilege(msg,
- CONNMAN_SECURITY_PRIVILEGE_MODIFY) < 0)
- return __connman_error_permission_denied(msg);
-
- if (!device->driver || !device->driver->join)
- return __connman_error_not_supported(msg);
-
- dbus_message_iter_init(msg, &iter);
- dbus_message_iter_recurse(&iter, &array);
-
- switch (device->type) {
- case CONNMAN_DEVICE_TYPE_WIFI:
- type = CONNMAN_NETWORK_TYPE_WIFI;
- break;
- default:
- return __connman_error_not_supported(msg);
- }
-
- network = connman_network_create("00_00_00_00_00_00", type);
- if (network == NULL)
- return __connman_error_failed(msg, ENOMEM);
-
- while (dbus_message_iter_get_arg_type(&array) == DBUS_TYPE_DICT_ENTRY) {
- DBusMessageIter entry, value;
- const char *key, *str;
-
- dbus_message_iter_recurse(&array, &entry);
- dbus_message_iter_get_basic(&entry, &key);
-
- dbus_message_iter_next(&entry);
- dbus_message_iter_recurse(&entry, &value);
-
- switch (dbus_message_iter_get_arg_type(&value)) {
- case DBUS_TYPE_STRING:
- dbus_message_iter_get_basic(&value, &str);
- if (g_str_equal(key, "WiFi.SSID") == TRUE)
- connman_network_set_blob(network, key,
- str, strlen(str));
- else
- connman_network_set_string(network, key, str);
- break;
- }
-
- dbus_message_iter_next(&array);
- }
-
- index = connman_device_get_index(device);
- connman_network_set_index(network, index);
-
- connman_network_set_protocol(network, CONNMAN_NETWORK_PROTOCOL_IP);
-
- err = device->driver->join(device, network);
-
- connman_network_unref(network);
-
- if (err < 0)
- return __connman_error_failed(msg, -err);
+ } else
+ return __connman_error_invalid_property(msg);
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
-static DBusMessage *create_network(DBusConnection *conn,
- DBusMessage *msg, void *data)
-{
- DBG("conn %p", conn);
-
- if (__connman_security_check_privilege(msg,
- CONNMAN_SECURITY_PRIVILEGE_MODIFY) < 0)
- return __connman_error_permission_denied(msg);
-
- return __connman_error_invalid_arguments(msg);
-}
-
-static DBusMessage *remove_network(DBusConnection *conn,
- DBusMessage *msg, void *data)
-{
- DBG("conn %p", conn);
-
- if (__connman_security_check_privilege(msg,
- CONNMAN_SECURITY_PRIVILEGE_MODIFY) < 0)
- return __connman_error_permission_denied(msg);
-
- return __connman_error_invalid_arguments(msg);
-}
-
static DBusMessage *propose_scan(DBusConnection *conn,
DBusMessage *msg, void *data)
{
switch (device->mode) {
case CONNMAN_DEVICE_MODE_UNKNOWN:
- case CONNMAN_DEVICE_MODE_TRANSPORT_IP:
return __connman_error_not_supported(msg);
case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
break;
}
- if (!device->driver || !device->driver->scan)
- return __connman_error_not_supported(msg);
-
- if (device->powered == FALSE)
- return __connman_error_failed(msg, EINVAL);
-
- err = device->driver->scan(device);
+ err = __connman_device_scan(device);
if (err < 0)
return __connman_error_failed(msg, -err);
static GDBusMethodTable device_methods[] = {
{ "GetProperties", "", "a{sv}", get_properties },
- { "SetProperty", "sv", "", set_property },
- { "JoinNetwork", "a{sv}", "", join_network },
- { "CreateNetwork", "a{sv}", "o", create_network },
- { "RemoveNetwork", "o", "", remove_network },
+ { "SetProperty", "sv", "", set_property,
+ G_DBUS_METHOD_FLAG_ASYNC },
{ "ProposeScan", "", "", propose_scan },
{ },
};
{ },
};
-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;
device->registered = TRUE;
- emit_devices_signal();
-
return 0;
}
device->registered = FALSE;
- emit_devices_signal();
-
g_dbus_unregister_interface(connection, element->path,
CONNMAN_DEVICE_INTERFACE);
}
-static void device_enable(struct connman_device *device)
-{
- DBG("device %p", device);
-
- if (device->policy == CONNMAN_DEVICE_POLICY_IGNORE ||
- device->policy == CONNMAN_DEVICE_POLICY_OFF)
- return;
-
- if (device->powered == TRUE)
- return;
-
- if (device->driver->enable) {
- device->driver->enable(device);
- __connman_notifier_device_type_increase(device->type);
- }
-}
-
-static void device_disable(struct connman_device *device)
-{
- DBG("device %p", device);
-
- if (device->policy == CONNMAN_DEVICE_POLICY_IGNORE)
- return;
-
- if (device->powered == FALSE)
- return;
-
- g_hash_table_remove_all(device->networks);
-
- if (device->driver->disable) {
- device->driver->disable(device);
- __connman_notifier_device_type_decrease(device->type);
- }
-}
-
static int setup_device(struct connman_device *device)
{
+ enum connman_service_type type;
int err;
DBG("device %p", device);
return err;
}
+ __connman_technology_add_device(device);
+
+ type = __connman_device_get_service_type(device);
+ __connman_notifier_register(type);
+
switch (device->mode) {
case CONNMAN_DEVICE_MODE_UNKNOWN:
case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
break;
- case CONNMAN_DEVICE_MODE_TRANSPORT_IP:
- if (device->secondary == FALSE)
- __connman_profile_add_device(device);
- break;
}
- device_enable(device);
+ if (__connman_udev_get_blocked(device->phyindex) == TRUE)
+ return 0;
+
+ if (device->offlinemode == FALSE &&
+ device->powered_persistent == TRUE)
+ __connman_device_enable(device);
return 0;
}
static void remove_device(struct connman_device *device)
{
+ enum connman_service_type type;
+
DBG("device %p", device);
- device_disable(device);
+ __connman_device_disable(device);
switch (device->mode) {
case CONNMAN_DEVICE_MODE_UNKNOWN:
case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
break;
- case CONNMAN_DEVICE_MODE_TRANSPORT_IP:
- if (device->secondary == FALSE)
- __connman_profile_remove_device(device);
- break;
}
+ type = __connman_device_get_service_type(device);
+ __connman_notifier_unregister(type);
+
+ __connman_technology_remove_device(device);
+
unregister_interface(&device->element);
if (device->driver->remove)
DBG("element %p name %s", element, element->name);
+ if (device->timeout > 0) {
+ g_source_remove(device->timeout);
+ device->timeout = 0;
+ }
+
+ clear_scan_trigger(device);
+
+ if (device->pending != NULL) {
+ dbus_message_unref(device->pending);
+ device->pending = NULL;
+ }
+
g_free(device->ident);
g_free(device->node);
g_free(device->name);
g_free(device->address);
+ g_free(device->control);
g_free(device->interface);
g_free(device->last_network);
connman_element_set_string(&device->element,
CONNMAN_PROPERTY_ID_TYPE, str);
- device->element.ipv4.method = CONNMAN_IPV4_METHOD_DHCP;
+ device->element.ipv4.method = CONNMAN_IPCONFIG_METHOD_DHCP;
- device->type = type;
- device->name = g_strdup(type2description(device->type));
- device->mode = CONNMAN_DEVICE_MODE_UNKNOWN;
- device->policy = CONNMAN_DEVICE_POLICY_AUTO;
- device->secondary = FALSE;
+ device->type = type;
+ device->name = g_strdup(type2description(device->type));
+ device->mode = CONNMAN_DEVICE_MODE_UNKNOWN;
+
+ device->powered_persistent = TRUE;
+
+ device->phyindex = -1;
switch (type) {
case CONNMAN_DEVICE_TYPE_UNKNOWN:
case CONNMAN_DEVICE_TYPE_VENDOR:
- device->priority = 0;
device->scan_interval = 0;
break;
case CONNMAN_DEVICE_TYPE_ETHERNET:
case CONNMAN_DEVICE_TYPE_WIFI:
- device->priority = 100;
device->scan_interval = 300;
break;
case CONNMAN_DEVICE_TYPE_WIMAX:
- device->priority = 20;
device->scan_interval = 0;
break;
case CONNMAN_DEVICE_TYPE_BLUETOOTH:
- device->priority = 50;
device->scan_interval = 0;
break;
case CONNMAN_DEVICE_TYPE_GPS:
- device->priority = 0;
device->scan_interval = 0;
break;
+ case CONNMAN_DEVICE_TYPE_CELLULAR:
+ case CONNMAN_DEVICE_TYPE_MBM:
case CONNMAN_DEVICE_TYPE_HSO:
- case CONNMAN_DEVICE_TYPE_NOZOMI:
- case CONNMAN_DEVICE_TYPE_HUAWEI:
- case CONNMAN_DEVICE_TYPE_NOVATEL:
- device->priority = 60;
device->scan_interval = 0;
break;
}
return device->element.index;
}
+int __connman_device_get_phyindex(struct connman_device *device)
+{
+ return device->phyindex;
+}
+
+void __connman_device_set_phyindex(struct connman_device *device,
+ int phyindex)
+{
+ device->phyindex = phyindex;
+}
+
/**
* connman_device_set_interface:
* @device: device structure
* @interface: interface name
+ * @control: control interface
*
* Set interface name of device
*/
void connman_device_set_interface(struct connman_device *device,
- const char *interface)
+ const char *interface, const char *control)
{
g_free(device->element.devname);
device->element.devname = g_strdup(interface);
g_free(device->interface);
device->interface = g_strdup(interface);
+ g_free(device->control);
+ device->control = g_strdup(control);
+
if (device->name == NULL) {
const char *str = type2description(device->type);
if (str != NULL && device->interface != NULL)
}
}
-/**
- * connman_device_get_interface:
- * @device: device structure
- *
- * Get interface name of device
- */
-const char *connman_device_get_interface(struct connman_device *device)
+const char *connman_device_get_control(struct connman_device *device)
{
- return device->interface;
+ return device->control;
}
/**
}
/**
- * 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
}
/**
- * connman_device_set_secondary:
- * @device: device structure
- * @secondary: secondary value
- *
- * Change secondary value of device
- */
-void connman_device_set_secondary(struct connman_device *device,
- connman_bool_t secondary)
-{
- device->secondary = secondary;
-}
-
-/**
- * connman_device_get_secondary:
- * @device: device structure
- *
- * Get secondary value of device
- */
-connman_bool_t connman_device_get_secondary(struct connman_device *device)
-{
- return device->secondary;
-}
-
-/**
* connman_device_set_powered:
* @device: device structure
* @powered: powered state
int connman_device_set_powered(struct connman_device *device,
connman_bool_t powered)
{
- DBusMessage *signal;
- DBusMessageIter entry, value;
- const char *key = "Powered";
+ enum connman_service_type type;
DBG("driver %p powered %d", device, powered);
+ if (device->timeout > 0) {
+ g_source_remove(device->timeout);
+ device->timeout = 0;
+ }
+
+ if (device->pending != NULL) {
+ g_dbus_send_reply(connection, device->pending,
+ DBUS_TYPE_INVALID);
+
+ dbus_message_unref(device->pending);
+ device->pending = NULL;
+ }
+
if (device->powered == powered)
return -EALREADY;
device->powered = powered;
+ device->powered_pending = powered;
+
+ type = __connman_device_get_service_type(device);
+
+ if (device->powered == TRUE)
+ __connman_notifier_enable(type);
+ else
+ __connman_notifier_disable(type);
if (device->registered == FALSE)
return 0;
- signal = dbus_message_new_signal(device->element.path,
- CONNMAN_DEVICE_INTERFACE, "PropertyChanged");
- if (signal == NULL)
+ powered_changed(device);
+
+ if (powered == FALSE)
return 0;
- dbus_message_iter_init_append(signal, &entry);
+ reset_scan_trigger(device);
- dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
+ if (device->driver->scan)
+ device->driver->scan(device);
- dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
- DBUS_TYPE_BOOLEAN_AS_STRING, &value);
- dbus_message_iter_append_basic(&value, DBUS_TYPE_BOOLEAN, &powered);
- dbus_message_iter_close_container(&entry, &value);
+ return 0;
+}
- g_dbus_send_message(connection, signal);
+int __connman_device_set_blocked(struct connman_device *device,
+ connman_bool_t blocked)
+{
+ connman_bool_t powered;
- if (powered == FALSE)
- return 0;
+ DBG("device %p blocked %d", device, blocked);
+
+ device->blocked = blocked;
- if (device->policy != CONNMAN_DEVICE_POLICY_AUTO)
+ if (device->offlinemode == TRUE)
return 0;
- if (device->scan_timeout > 0) {
- g_source_remove(device->scan_timeout);
- device->scan_timeout = 0;
- }
+ connman_info("%s {rfkill} blocked %d", device->interface, blocked);
- if (device->scan_interval > 0) {
- guint interval = device->scan_interval;
- device->scan_timeout = g_timeout_add_seconds(interval,
- device_scan_trigger, device);
- }
+ if (blocked == FALSE)
+ powered = device->powered_persistent;
+ else
+ powered = FALSE;
- if (device->driver->scan)
- device->driver->scan(device);
+ return set_powered(device, powered);
+}
- return 0;
+int __connman_device_scan(struct connman_device *device)
+{
+ if (!device->driver || !device->driver->scan)
+ return -EOPNOTSUPP;
+
+ if (device->powered == FALSE)
+ return -ENOLINK;
+
+ reset_scan_trigger(device);
+
+ return device->driver->scan(device);
}
-/**
- * connman_device_set_carrier:
- * @device: device structure
- * @carrier: carrier state
- *
- * Change carrier state of device (only for device without scanning)
- */
-int connman_device_set_carrier(struct connman_device *device,
- connman_bool_t carrier)
+int __connman_device_enable(struct connman_device *device)
{
- DBG("driver %p carrier %d", device, carrier);
+ enum connman_service_type type;
+ int err;
- switch (device->mode) {
- case CONNMAN_DEVICE_MODE_UNKNOWN:
- case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
- case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
- return -EINVAL;
- case CONNMAN_DEVICE_MODE_TRANSPORT_IP:
- break;
- }
+ DBG("device %p", device);
+
+ if (!device->driver || !device->driver->enable)
+ return -EOPNOTSUPP;
- if (device->carrier == carrier)
+ if (device->powered_pending == TRUE)
return -EALREADY;
- device->carrier = carrier;
+ device->powered_pending = TRUE;
+
+ err = device->driver->enable(device);
+ if (err < 0)
+ return err;
+
+ device->powered = TRUE;
- return set_carrier(device, device->carrier);
+ type = __connman_device_get_service_type(device);
+ __connman_notifier_enable(type);
+
+ return 0;
}
-int __connman_device_connect(struct connman_device *device)
+int __connman_device_enable_persistent(struct connman_device *device)
{
DBG("device %p", device);
- if (device->disconnected == FALSE)
- return -EINVAL;
+ device->powered_persistent = TRUE;
- return 0;
+ __connman_storage_save_device(device);
+
+ return __connman_device_enable(device);
}
-int __connman_device_disconnect(struct connman_device *device)
+int __connman_device_disable(struct connman_device *device)
{
- GHashTableIter iter;
- gpointer key, value;
+ enum connman_service_type type;
+ int err;
DBG("device %p", device);
- connman_device_set_disconnected(device, TRUE);
+ if (!device->driver || !device->driver->disable)
+ return -EOPNOTSUPP;
- g_hash_table_iter_init(&iter, device->networks);
+ if (device->powered == FALSE)
+ return -ENOLINK;
- while (g_hash_table_iter_next(&iter, &key, &value) == TRUE) {
- struct connman_network *network = value;
+ if (device->powered_pending == FALSE)
+ return -EALREADY;
- if (connman_network_get_connected(network) == TRUE)
- __connman_network_disconnect(network);
- }
+ device->powered_pending = FALSE;
+
+ device->reconnect = FALSE;
+
+ clear_scan_trigger(device);
+
+ g_hash_table_remove_all(device->networks);
+
+ err = device->driver->disable(device);
+ if (err < 0)
+ return err;
+
+ device->powered = FALSE;
+
+ type = __connman_device_get_service_type(device);
+ __connman_notifier_disable(type);
return 0;
}
-static void connect_known_network(struct connman_device *device)
+int __connman_device_disable_persistent(struct connman_device *device)
+{
+ DBG("device %p", device);
+
+ device->powered_persistent = FALSE;
+
+ __connman_storage_save_device(device);
+
+ return __connman_device_disable(device);
+}
+
+int __connman_device_disconnect(struct connman_device *device)
{
- struct connman_network *network = NULL;
GHashTableIter iter;
gpointer key, value;
- unsigned int count = 0;
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) {
- connman_uint8_t old_strength, new_strength;
- const char *name;
-
- count++;
-
- if (connman_network_get_available(value) == FALSE)
- continue;
-
- name = connman_network_get_string(value,
- CONNMAN_PROPERTY_ID_NAME);
- if (name != NULL && device->last_network != NULL) {
- if (g_str_equal(name, device->last_network) == TRUE) {
- network = value;
- break;
- }
- }
+ struct connman_network *network = value;
- if (network == NULL) {
- network = value;
+ if (__connman_network_get_connecting(network) == TRUE) {
+ /*
+ * Skip network in the process of connecting.
+ * This is a workaround for WiFi networks serviced
+ * by the supplicant plugin that hold a reference
+ * to the network. If we disconnect the network
+ * here then the referenced object will not be
+ * registered and usage (like launching DHCP client)
+ * will fail. There is nothing to be gained by
+ * removing the network here anyway.
+ */
+ connman_warn("Skipping disconnect of %s",
+ connman_network_get_identifier(network));
continue;
}
- old_strength = connman_network_get_uint8(network,
- CONNMAN_PROPERTY_ID_STRENGTH);
- new_strength = connman_network_get_uint8(value,
- CONNMAN_PROPERTY_ID_STRENGTH);
-
- if (new_strength > old_strength)
- network = value;
+ __connman_network_disconnect(network);
}
- if (network != NULL) {
- int err;
-
- err = connman_network_connect(network);
- if (err == 0 || err == -EINPROGRESS)
- return;
- }
-
- if (count > 0)
- return;
-
- if (device->driver && device->driver->scan)
- device->driver->scan(device);
+ return 0;
}
static void mark_network_unavailable(gpointer key, gpointer value,
return TRUE;
}
+void __connman_device_cleanup_networks(struct connman_device *device)
+{
+ g_hash_table_foreach_remove(device->networks,
+ remove_unavailable_network, NULL);
+}
+
+static void scanning_changed(struct connman_device *device)
+{
+ connman_dbus_property_changed_basic(device->element.path,
+ CONNMAN_DEVICE_INTERFACE, "Scanning",
+ DBUS_TYPE_BOOLEAN, &device->scanning);
+}
+
+static void mark_network_available(gpointer key, gpointer value,
+ gpointer user_data)
+{
+ struct connman_network *network = value;
+
+ connman_network_set_available(network, TRUE);
+}
+
+void connman_device_cleanup_scanning(struct connman_device *device)
+{
+ device->scanning = FALSE;
+
+ scanning_changed(device);
+
+ g_hash_table_foreach(device->networks,
+ mark_network_available, NULL);
+}
+
/**
* connman_device_set_scanning:
* @device: device structure
int connman_device_set_scanning(struct connman_device *device,
connman_bool_t scanning)
{
- DBusMessage *signal;
- DBusMessageIter entry, value;
- const char *key = "Scanning";
-
- DBG("driver %p scanning %d", device, scanning);
+ DBG("device %p scanning %d", device, scanning);
if (!device->driver || !device->driver->scan)
return -EINVAL;
device->scanning = scanning;
- 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);
-
- dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
- DBUS_TYPE_BOOLEAN_AS_STRING, &value);
- dbus_message_iter_append_basic(&value, DBUS_TYPE_BOOLEAN, &scanning);
- dbus_message_iter_close_container(&entry, &value);
-
- g_dbus_send_message(connection, signal);
+ scanning_changed(device);
if (scanning == TRUE) {
- if (device->scan_timeout > 0) {
- g_source_remove(device->scan_timeout);
- device->scan_timeout = 0;
- }
-
- if (device->scan_interval > 0) {
- guint interval = device->scan_interval;
- device->scan_timeout = g_timeout_add_seconds(interval,
- device_scan_trigger, device);
- }
+ reset_scan_trigger(device);
g_hash_table_foreach(device->networks,
mark_network_unavailable, NULL);
+
return 0;
}
- g_hash_table_foreach_remove(device->networks,
- remove_unavailable_network, NULL);
+ __connman_device_cleanup_networks(device);
if (device->connections > 0)
return 0;
if (device->disconnected == TRUE)
return 0;
- if (device->policy != CONNMAN_DEVICE_POLICY_AUTO)
- return 0;
-
- connect_known_network(device);
+ __connman_service_auto_connect();
return 0;
}
int connman_device_set_disconnected(struct connman_device *device,
connman_bool_t disconnected)
{
- DBG("driver %p disconnected %d", device, disconnected);
+ DBG("device %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:
device->disconnected = disconnected;
+ if (disconnected == TRUE)
+ force_scan_trigger(device);
+
return 0;
}
/**
+ * connman_device_get_disconnected:
+ * @device: device structure
+ *
+ * Get device disconnected state
+ */
+connman_bool_t connman_device_get_disconnected(struct connman_device *device)
+{
+ return device->disconnected;
+}
+
+/**
* connman_device_set_string:
* @device: device structure
* @key: unique identifier
if (device == NULL)
return;
+ device->offlinemode = offlinemode;
+
powered = (offlinemode == TRUE) ? FALSE : TRUE;
if (device->powered == powered)
return;
+ if (device->powered_persistent == FALSE)
+ powered = FALSE;
+
set_powered(device, powered);
}
__connman_element_foreach(NULL, CONNMAN_ELEMENT_TYPE_DEVICE,
set_offlinemode, GUINT_TO_POINTER(offlinemode));
- __connman_notifier_offline_mode(offlinemode);
+ __connman_notifier_offlinemode(offlinemode);
return 0;
}
DBG("device %p network %p", device, network);
+ if (identifier == NULL)
+ return -EINVAL;
+
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:
__connman_network_set_device(network, device);
- __connman_storage_load_network(network);
-
err = connman_element_register((struct connman_element *) network,
&device->element);
if (err < 0) {
return 0;
}
+void connman_device_remove_all_networks(struct connman_device *device)
+{
+ g_hash_table_remove_all(device->networks);
+}
+
void __connman_device_set_network(struct connman_device *device,
struct connman_network *network)
{
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 = connman_network_ref(network);
+ } else {
+ g_free(device->last_network);
+ device->last_network = NULL;
+
+ device->network = NULL;
}
+}
- device->network = network;
+void __connman_device_set_reconnect(struct connman_device *device,
+ connman_bool_t reconnect)
+{
+ device->reconnect = reconnect;
+}
+
+connman_bool_t __connman_device_get_reconnect(
+ struct connman_device *device)
+{
+ return device->reconnect;
}
/**
{
__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;
- }
+ device->offlinemode = __connman_profile_get_offlinemode();
return connman_element_register(&device->element, NULL);
}
static int device_load(struct connman_device *device)
{
+ const char *ident = __connman_profile_active_ident();
GKeyFile *keyfile;
- gchar *pathname, *identifier, *data = NULL;
- gsize length;
- char *str;
+ GError *error = NULL;
+ gchar *identifier;
+ connman_bool_t powered;
int val;
DBG("device %p", device);
- pathname = g_strdup_printf("%s/%s.conf", STORAGEDIR,
- __connman_profile_active_ident());
- if (pathname == NULL)
- return -ENOMEM;
-
- keyfile = g_key_file_new();
-
- if (g_file_get_contents(pathname, &data, &length, NULL) == FALSE) {
- g_free(pathname);
- return -ENOENT;
- }
-
- g_free(pathname);
-
- if (g_key_file_load_from_data(keyfile, data, length,
- 0, NULL) == FALSE) {
- g_free(data);
- return -EILSEQ;
- }
-
- g_free(data);
+ keyfile = __connman_storage_open_profile(ident);
+ if (keyfile == NULL)
+ return 0;
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);
- }
+ powered = g_key_file_get_boolean(keyfile, identifier,
+ "Powered", &error);
+ if (error == NULL)
+ device->powered_persistent = powered;
+ g_clear_error(&error);
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, identifier,
- "ScanInterval", NULL);
- if (val > 0)
+ "ScanInterval", &error);
+ if (error == NULL && val > 0)
device->scan_interval = val;
+ g_clear_error(&error);
break;
}
done:
- g_key_file_free(keyfile);
-
g_free(identifier);
+ __connman_storage_close_profile(ident, keyfile, FALSE);
+
return 0;
}
static int device_save(struct connman_device *device)
{
+ const char *ident = __connman_profile_active_ident();
GKeyFile *keyfile;
- gchar *pathname, *identifier = NULL, *data = NULL;
- gsize length;
- const char *str;
+ gchar *identifier;
DBG("device %p", device);
- pathname = g_strdup_printf("%s/%s.conf", STORAGEDIR,
- __connman_profile_active_ident());
- if (pathname == NULL)
- return -ENOMEM;
-
- keyfile = g_key_file_new();
-
- if (g_file_get_contents(pathname, &data, &length, NULL) == FALSE)
- goto update;
-
- if (length > 0) {
- if (g_key_file_load_from_data(keyfile, data, length,
- 0, NULL) == FALSE)
- goto done;
- }
-
- g_free(data);
+ keyfile = __connman_storage_open_profile(ident);
+ if (keyfile == NULL)
+ return 0;
-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, identifier, "Policy", str);
+ g_key_file_set_boolean(keyfile, identifier,
+ "Powered", device->powered_persistent);
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:
break;
}
- data = g_key_file_to_data(keyfile, &length, NULL);
-
- if (g_file_set_contents(pathname, data, length, NULL) == FALSE)
- connman_error("Failed to store device information");
-
done:
- g_free(data);
-
- g_key_file_free(keyfile);
-
g_free(identifier);
- g_free(pathname);
+
+ __connman_storage_close_profile(ident, keyfile, TRUE);
return 0;
}
projects / framework / connectivity / connman.git / blobdiff