config: Read only wifi config

diff --git a/include/provision.h b/include/provision.h
index f154d4fb60eeb5ea5186fae49f42882e20986267..d6d7c72c9faf135f9e26e1c812d17826c26212d9 100644 (file)
--- a/include/provision.h
+++ b/include/provision.h
@@ -42,7 +42,7 @@ struct connman_config_entry {
        connman_bool_t hidden;
 };
 
-struct connman_config_entry **connman_config_get_entries(void);
+struct connman_config_entry **connman_config_get_entries(const char *type);
 void connman_config_free_entries(struct connman_config_entry **entries);
 
 #ifdef __cplusplus

diff --git a/plugins/wifi.c b/plugins/wifi.c
index 1e9d28c9991a9fd0bd97a886a722406d19847b5e..4b097fcad75f959f4150ed4d9bcb59c77703f0fe 100644 (file)
--- a/plugins/wifi.c
+++ b/plugins/wifi.c
@@ -424,7 +424,7 @@ static int get_hidden_connections(int max_ssids,
        /*
         * Check if there are any hidden AP that needs to be provisioned.
         */
-       entries = connman_config_get_entries();
+       entries = connman_config_get_entries("wifi");
        for (i = 0; entries && entries[i]; i++) {
                int len;
 

diff --git a/src/config.c b/src/config.c
index 686d8ceccd0f635f28fd1f5c6388547bc5e6d481..6321663e0bb47fe88c284dddbdc5a0673692c5b1 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -842,7 +842,7 @@ int __connman_config_provision_service_ident(struct connman_service *service,
        return ret;
 }
 
-struct connman_config_entry **connman_config_get_entries(void)
+struct connman_config_entry **connman_config_get_entries(const char *type)
 {
        GHashTableIter iter_file, iter_config;
        gpointer value, key;
@@ -866,6 +866,10 @@ struct connman_config_entry **connman_config_get_entries(void)
                                                        &value) == TRUE) {
                        struct connman_config_service *config = value;
 
+                       if (type != NULL &&
+                                       g_strcmp0(config->type, type) != 0)
+                               continue;
+
                        entries[i] = g_try_new0(struct connman_config_entry,
                                                1);
                        if (entries[i] == NULL)