[PATCH v5 08/16] storage: Add function to load provider configuration file

[Jukka Rissanen]

---
 Makefile.am   |  4 ++++
 src/connman.h |  1 +
 src/storage.c | 16 ++++++++++++++++
 3 files changed, 21 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index 26081d8..2490f9e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -152,6 +152,7 @@ plugindir = $(libdir)/connman/plugins
 scriptdir = $(libdir)/connman/scripts
 
 storagedir = $(localstatedir)/lib/connman
+vpn_storagedir = $(localstatedir)/lib/connman-vpn
 
 configdir = ${sysconfdir}/connman
 
@@ -176,6 +177,7 @@ AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @XTABLES_CFLAGS@ \
                                -DPLUGINDIR=\""$(build_plugindir)"\" \
                                -DSCRIPTDIR=\""$(build_scriptdir)"\" \
                                -DSTORAGEDIR=\""$(storagedir)\"" \
+                               -DVPN_STORAGEDIR=\""$(vpn_storagedir)\"" \
                                -DCONFIGDIR=\""$(configdir)\""
 
 if VPN
@@ -191,6 +193,7 @@ src_connmand_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ 
@XTABLES_CFLAGS@ \
                                -DPLUGINDIR=\""$(build_plugindir)"\" \
                                -DSCRIPTDIR=\""$(build_scriptdir)"\" \
                                -DSTORAGEDIR=\""$(storagedir)\"" \
+                               -DVPN_STORAGEDIR=\""$(vpn_storagedir)\"" \
                                -DCONFIGDIR=\""$(configdir)\"" \
                                -I$(builddir)/src
 
@@ -205,6 +208,7 @@ vpn_connman_vpnd_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ \
                                -DPLUGINDIR=\""$(build_vpn_plugindir)"\" \
                                -DSCRIPTDIR=\""$(build_scriptdir)"\" \
                                -DSTORAGEDIR=\""$(storagedir)\"" \
+                               -DVPN_STORAGEDIR=\""$(vpn_storagedir)\"" \
                                -DCONFIGDIR=\""$(configdir)\"" \
                                -I$(builddir)/vpn
 
diff --git a/src/connman.h b/src/connman.h
index 95e5c8a..49eafd3 100644
--- a/src/connman.h
+++ b/src/connman.h
@@ -206,6 +206,7 @@ int __connman_storage_save_global(GKeyFile *keyfile);
 void __connman_storage_delete_global(void);
 
 GKeyFile *__connman_storage_load_config(const char *ident);
+GKeyFile *__connman_storage_load_provider_config(const char *ident);
 
 GKeyFile *__connman_storage_open_service(const char *ident);
 int __connman_storage_save_service(GKeyFile *keyfile, const char *ident);
diff --git a/src/storage.c b/src/storage.c
index 47822da..1ceafb9 100644
--- a/src/storage.c
+++ b/src/storage.c
@@ -147,6 +147,22 @@ GKeyFile *__connman_storage_load_config(const char *ident)
        return keyfile;
 }
 
+GKeyFile *__connman_storage_load_provider_config(const char *ident)
+{
+       gchar *pathname;
+       GKeyFile *keyfile = NULL;
+
+       pathname = g_strdup_printf("%s/%s.config", VPN_STORAGEDIR, ident);
+       if (pathname == NULL)
+               return NULL;
+
+       keyfile = storage_load(pathname);
+
+       g_free(pathname);
+
+       return keyfile;
+}
+
 GKeyFile *__connman_storage_open_service(const char *service_id)
 {
        gchar *pathname;
-- 
1.7.11.4

_______________________________________________
connman mailing list
connman@connman.net
http://lists.connman.net/listinfo/connman