flimflam: add support for multiple profiles

src/connman.h

Index: src/connman.h
diff --git a/src/connman.h b/src/connman.h
index e0d76417a0c4e12b21cf19f672b39745f5f046f4..d9f5f6e7268dbaf871b25deaafb9b980f86dadeb 100644
--- a/src/connman.h
+++ b/src/connman.h
@@ -173,36 +173,40 @@ int __connman_resolver_selftest(void);
 int __connman_crypto_init(void);
 void __connman_crypto_cleanup(void);
 
-char *__connman_crypto_encrypt_keyvalue(const char *profile_name,
-    const char *key, const char *value);
-char *__connman_crypto_decrypt_keyvalue(const char *profile_name,
-    const char *key, const char *value);
+char *__connman_crypto_encrypt_keyvalue(const char *key, const char *value);
+char *__connman_crypto_decrypt_keyvalue(const char *key, const char *value);
 
 #include <connman/storage.h>
 
 int __connman_storage_init(void);
 void __connman_storage_cleanup(void);
 
-GKeyFile *__connman_storage_open(const char *ident);
-void __connman_storage_close(const char *ident,
+gboolean __connman_storage_exists(const struct connman_storage_ident *ident);
+GKeyFile *__connman_storage_open(const struct connman_storage_ident *ident);
+void __connman_storage_close(const struct connman_storage_ident *ident,
 					GKeyFile *keyfile, gboolean save);
-void __connman_storage_delete(const char *ident);
+void __connman_storage_delete(const struct connman_storage_ident *ident);
 
 void __connman_storage_set_encrypted_value(GKeyFile *keyfile,
-    const char *profile_name, const char *section, const char *key,
-    const char *value);
+    const char *section, const char *key, const char *value);
 char *__connman_storage_get_encrypted_value(GKeyFile *keyfile,
-    const char *profile_name, const char *section, const char *key);
+    const char *section, const char *key);
 
 int __connman_storage_init_profile(void);
 int __connman_storage_load_profile(struct connman_profile *profile);
 int __connman_storage_save_profile(struct connman_profile *profile);
-int __connman_storage_load_service(struct connman_service *service);
-int __connman_storage_save_service(struct connman_service *service);
-int __connman_storage_load_device(struct connman_device *device);
-int __connman_storage_save_device(struct connman_device *device);
-int __connman_storage_load_ipconfig(struct connman_ipconfig *ipconfig);
-int __connman_storage_save_ipconfig(const struct connman_ipconfig *ipconfig);
+int __connman_storage_load_service(struct connman_service *service,
+    const struct connman_storage_ident *profile_ident);
+int __connman_storage_save_service(struct connman_service *service,
+    const struct connman_storage_ident *profile_ident);
+int __connman_storage_load_device(struct connman_device *device,
+    const struct connman_storage_ident *profile_ident);
+int __connman_storage_save_device(struct connman_device *device,
+    const struct connman_storage_ident *profile_ident);
+int __connman_storage_load_ipconfig(struct connman_ipconfig *ipconfig,
+    const struct connman_storage_ident *profile_ident);
+int __connman_storage_save_ipconfig(const struct connman_ipconfig *ipconfig,
+    const struct connman_storage_ident *profile_ident);
 
 #include <connman/driver.h>
 
@@ -337,18 +341,32 @@ int __connman_network_activate_cellular_modem(struct connman_network *network,
 #include <connman/profile.h>
 
 int __connman_profile_init();
+int __connman_profile_push_batch(char **profiles);
 void __connman_profile_cleanup(void);
 
 connman_bool_t __connman_profile_get_offlinemode(void);
 int __connman_profile_set_offlinemode(connman_bool_t offlinemode);
 int __connman_profile_save_default(void);
 
+int __connman_profile_load_service(struct connman_service *service);
+int __connman_profile_save_service(struct connman_service *service);
+int __connman_profile_load_device(struct connman_device *device);
+int __connman_profile_save_device(struct connman_device *device);
+int __connman_profile_load_ipconfig(struct connman_ipconfig *ipconfig);
+int __connman_profile_save_ipconfig(const struct connman_ipconfig *ipconfig);
+
+int __connman_profile_append_hidden_ssids(GSList **hidden_ssids,
+    void (*append_hidden_ssids)(GKeyFile *keyfile, GSList **hidden_ssids));
+
 void __connman_profile_list(DBusMessageIter *iter, void *);
-const char *__connman_profile_active_ident(void);
+const struct connman_storage_ident *__connman_profile_active_ident(void);
 const char *__connman_profile_active_path(void);
 
 int __connman_profile_create(const char *name, const char **path);
-int __connman_profile_remove(const char *path);
+int __connman_profile_remove(const char *ident);
+int __connman_profile_push(const char *ident, const char *name,
+				const char **path);
+int __connman_profile_pop(const char *ident);
 
 void __connman_profile_changed(gboolean delayed);
 
@@ -422,6 +440,8 @@ int __connman_service_indicate_active(struct connman_service *service,
 
 connman_bool_t __connman_service_check_prepared(const struct connman_service *);
 
+void __connman_service_invalidate_profile(const struct connman_storage_ident *);
+
 enum connman_service_type connman_service_string2type(const char *str);
 void __connman_service_reset(struct connman_service *service);
 DBusMessage *__connman_get_wifi_service(DBusMessage *msg);
@@ -432,6 +452,7 @@ int __connman_service_disconnect(struct connman_service *service);
 struct connman_service *__connman_service_lookup(const char *identifier);
 int __connman_service_create_and_connect(DBusMessage *msg);
 void __connman_service_device_auto_connect(struct connman_device *);
+void __connman_service_auto_connect_any(void);
 void __connman_service_set_activation_state(struct connman_service *service,
 	enum connman_network_activation_state activation_state,
 	enum connman_element_error err);