Add function for handling WiFi passphrases

[connman] / src / network.c

diff --git a/src/network.c b/src/network.c
index 1d7cc33..62dc422 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -154,6 +154,8 @@ static DBusMessage *set_property(DBusConnection *conn,
                network->wifi.passphrase = g_strdup(passphrase);
        }
 
+       __connman_storage_save_network(network);
+
        return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
 }
 
@@ -519,6 +521,9 @@ int connman_network_set_string(struct connman_network *network,
        } 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;
@@ -534,7 +539,7 @@ int connman_network_set_string(struct connman_network *network,
 const char *connman_network_get_string(struct connman_network *network,
                                                        const char *key)
 {
-       DBG("network %p key %s", network);
+       DBG("network %p key %s", network, key);
 
        if (g_str_equal(key, "Name") == TRUE)
                return network->name;
@@ -544,6 +549,8 @@ const char *connman_network_get_string(struct connman_network *network,
                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;
 }
@@ -594,6 +601,28 @@ int connman_network_set_blob(struct connman_network *network,
        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)
 {
@@ -710,15 +739,107 @@ static struct connman_driver network_driver = {
 
 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;
 }