enum connman_network_type type;
enum connman_network_protocol protocol;
connman_bool_t connected;
+ connman_bool_t remember;
connman_uint8_t strength;
char *identifier;
char *name;
- char *path;
+ char *node;
struct connman_network_driver *driver;
void *driver_data;
+ connman_bool_t registered;
+
struct connman_device *device;
struct {
DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
+ if (network->device) {
+ const char *path = connman_device_get_path(network->device);
+ if (path != NULL)
+ connman_dbus_dict_append_variant(&dict, "Device",
+ DBUS_TYPE_OBJECT_PATH, &path);
+ }
+
if (network->name != NULL)
connman_dbus_dict_append_variant(&dict, "Name",
DBUS_TYPE_STRING, &network->name);
connman_dbus_dict_append_variant(&dict, "Connected",
DBUS_TYPE_BOOLEAN, &network->connected);
+ connman_dbus_dict_append_variant(&dict, "Remember",
+ DBUS_TYPE_BOOLEAN, &network->remember);
+
if (network->strength > 0)
connman_dbus_dict_append_variant(&dict, "Strength",
DBUS_TYPE_BYTE, &network->strength);
static DBusMessage *set_property(DBusConnection *conn,
DBusMessage *msg, void *data)
{
+ struct connman_network *network = data;
DBusMessageIter iter, value;
const char *name;
if (__connman_security_check_privileges(msg) < 0)
return __connman_error_permission_denied(msg);
+ if (g_str_equal(name, "Remember") == TRUE) {
+ connman_bool_t remember;
+
+ dbus_message_iter_get_basic(&value, &remember);
+
+ if (network->remember == remember)
+ return __connman_error_invalid_arguments(msg);
+ } else if (g_str_equal(name, "WiFi.Passphrase") == TRUE) {
+ const char *passphrase;
+
+ dbus_message_iter_get_basic(&value, &passphrase);
+
+ g_free(network->wifi.passphrase);
+ network->wifi.passphrase = g_strdup(passphrase);
+ }
+
+ __connman_storage_save_network(network);
+
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
return -EIO;
}
+ network->registered = TRUE;
+
emit_networks_signal();
return 0;
static void unregister_interface(struct connman_element *element)
{
+ struct connman_network * network = element->network;
+
DBG("element %p name %s", element, element->name);
+ network->registered = FALSE;
+
emit_networks_signal();
g_dbus_unregister_interface(connection, element->path,
CONNMAN_NETWORK_INTERFACE);
}
+connman_bool_t __connman_network_has_driver(struct connman_network *network)
+{
+ if (network == NULL || network->driver == NULL)
+ return FALSE;
+
+ return network->registered;
+}
+
static GSList *driver_list = NULL;
static gint compare_priority(gconstpointer a, gconstpointer b)
g_free(network->wifi.security);
g_free(network->wifi.passphrase);
- g_free(network->path);
+ g_free(network->node);
g_free(network->name);
g_free(network->identifier);
}
}
/**
- * connman_network_set_path:
- * @network: network structure
- * @path: path name
- *
- * Set path name of network
- */
-void connman_network_set_path(struct connman_network *network, const char *path)
-{
- g_free(network->element.devpath);
- network->element.devpath = g_strdup(path);
-
- g_free(network->path);
- network->path = g_strdup(path);
-}
-
-/**
* connman_network_get_path:
* @network: network structure
*
*/
const char *connman_network_get_path(struct connman_network *network)
{
- return network->path;
+ return network->element.path;
}
/**
if (g_str_equal(key, "Name") == TRUE) {
g_free(network->name);
network->name = g_strdup(value);
+ } else if (g_str_equal(key, "Node") == TRUE) {
+ g_free(network->node);
+ network->node = g_strdup(value);
} else if (g_str_equal(key, "WiFi.Mode") == TRUE) {
g_free(network->wifi.mode);
network->wifi.mode = g_strdup(value);
} else if (g_str_equal(key, "WiFi.Security") == TRUE) {
g_free(network->wifi.security);
network->wifi.security = g_strdup(value);
+ } else if (g_str_equal(key, "WiFi.Passphrase") == TRUE) {
+ g_free(network->wifi.passphrase);
+ network->wifi.passphrase = g_strdup(value);
}
return 0;
}
/**
+ * connman_network_get_string:
+ * @network: network structure
+ * @key: unique identifier
+ *
+ * Get string value for specific key
+ */
+const char *connman_network_get_string(struct connman_network *network,
+ const char *key)
+{
+ DBG("network %p key %s", network, key);
+
+ if (g_str_equal(key, "Name") == TRUE)
+ return network->name;
+ else if (g_str_equal(key, "Node") == TRUE)
+ return network->node;
+ else if (g_str_equal(key, "WiFi.Mode") == TRUE)
+ return network->wifi.mode;
+ else if (g_str_equal(key, "WiFi.Security") == TRUE)
+ return network->wifi.security;
+ else if (g_str_equal(key, "WiFi.Passphrase") == TRUE)
+ return network->wifi.passphrase;
+
+ return NULL;
+}
+
+/**
* connman_network_set_uint8:
* @network: network structure
* @key: unique identifier
return 0;
}
+/**
+ * connman_network_get_blob:
+ * @network: network structure
+ * @key: unique identifier
+ * @size: pointer to blob size
+ *
+ * Get binary blob value for specific key
+ */
+const void *connman_network_get_blob(struct connman_network *network,
+ const char *key, unsigned int *size)
+{
+ DBG("network %p key %s", network, key);
+
+ if (g_str_equal(key, "WiFi.SSID") == TRUE) {
+ if (size != NULL)
+ *size = network->wifi.ssid_len;
+ return network->wifi.ssid;
+ }
+
+ return NULL;
+}
+
void __connman_network_set_device(struct connman_network *network,
struct connman_device *device)
{
static int network_load(struct connman_network *network)
{
+ GKeyFile *keyfile;
+ gchar *pathname, *data = NULL;
+ gsize length;
+ const char *name;
+
DBG("network %p", network);
+ name = connman_device_get_name(network->device);
+ if (name == NULL)
+ return -EINVAL;
+
+ pathname = g_strdup_printf("%s/%s.conf", STORAGEDIR, name);
+ 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);
+
+ network->remember = g_key_file_get_boolean(keyfile,
+ network->identifier, "Remember", NULL);
+
+ g_free(network->wifi.security);
+ network->wifi.security = g_key_file_get_string(keyfile,
+ network->identifier, "WiFi.Security", NULL);
+
+ g_free(network->wifi.passphrase);
+ network->wifi.passphrase = g_key_file_get_string(keyfile,
+ network->identifier, "WiFi.Passphrase", NULL);
+
+ g_key_file_free(keyfile);
+
return 0;
}
static int network_save(struct connman_network *network)
{
+ GKeyFile *keyfile;
+ gchar *pathname, *data = NULL;
+ gsize length;
+ const char *name;
+
DBG("network %p", network);
+ name = connman_device_get_name(network->device);
+ if (name == NULL)
+ return -EINVAL;
+
+ pathname = g_strdup_printf("%s/%s.conf", STORAGEDIR, name);
+ 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);
+
+update:
+ g_key_file_set_boolean(keyfile, network->identifier,
+ "Remember", network->remember);
+
+ if (network->wifi.security != NULL)
+ g_key_file_set_string(keyfile, network->identifier,
+ "WiFi.Security", network->wifi.security);
+
+ if (network->wifi.passphrase != NULL)
+ g_key_file_set_string(keyfile, network->identifier,
+ "WiFi.Passphrase", network->wifi.passphrase);
+
+ data = g_key_file_to_data(keyfile, &length, NULL);
+
+ g_file_set_contents(pathname, data, length, NULL);
+
+done:
+ g_free(data);
+
+ g_key_file_free(keyfile);
+
+ g_free(pathname);
+
return 0;
}
projects / connman / blobdiff