Add support for storing interface settings

diff --git a/src/Makefile.am b/src/Makefile.am
index e207525..4da752e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,7 +6,8 @@ dbus_DATA = connman.conf
 sbin_PROGRAMS = connmand
 
 connmand_SOURCES = main.c connman.h manager.c plugin.c \
-                       iface.c iface-helper.c iface-inet.c rtnl.c dhcp.c
+                       iface.c iface-storage.c iface-helper.c \
+                                       iface-inet.c rtnl.c dhcp.c
 
 connmand_LDADD = @HAL_LIBS@ @GDBUS_LIBS@ @GMODULE_LIBS@
  

diff --git a/src/connman.h b/src/connman.h
index 98d8ea8..26931ff 100644 (file)
--- a/src/connman.h
+++ b/src/connman.h
@@ -58,6 +58,9 @@ void __connman_iface_list(DBusMessageIter *iter);
 int __connman_iface_create_identifier(struct connman_iface *iface);
 int __connman_iface_init_via_inet(struct connman_iface *iface);
 
+int __connman_iface_load(struct connman_iface *iface);
+int __connman_iface_store(struct connman_iface *iface);
+
 const char *__connman_iface_type2string(enum connman_iface_type type);
 const char *__connman_iface_state2string(enum connman_iface_state state);
 const char *__connman_iface_policy2string(enum connman_iface_policy policy);

diff --git a/src/iface-storage.c b/src/iface-storage.c
new file mode 100644 (file)
index 0000000..b7c84c3
--- /dev/null
+++ b/src/iface-storage.c
@@ -0,0 +1,192 @@
+/*
+ *
+ *  Connection Manager
+ *
+ *  Copyright (C) 2007  Intel Corporation. All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <errno.h>
+#include <arpa/inet.h>
+
+#include <glib.h>
+
+#include "connman.h"
+
+int __connman_iface_load(struct connman_iface *iface)
+{
+       GKeyFile *keyfile;
+       gchar *pathname, *str;
+
+       DBG("iface %p", iface);
+
+       if (iface->identifier == NULL)
+               return -EIO;
+
+       pathname = g_strdup_printf("%s/interfaces.conf", STORAGEDIR);
+       if (pathname == NULL)
+               return -ENOMEM;
+
+       keyfile = g_key_file_new();
+
+       if (g_key_file_load_from_file(keyfile, pathname, 0, NULL) == FALSE)
+               goto done;
+
+       if (g_key_file_has_group(keyfile, iface->identifier) == FALSE)
+               goto done;
+
+       str = g_key_file_get_string(keyfile, iface->identifier,
+                                                       "Policy", NULL);
+       if (str != NULL) {
+               iface->policy = __connman_iface_string2policy(str);
+               g_free(str);
+       }
+
+       str = g_key_file_get_string(keyfile, iface->identifier,
+                                                       "IPv4.Method", NULL);
+       if (str != NULL) {
+               iface->ipv4.method = __connman_ipv4_string2method(str);
+               g_free(str);
+       }
+
+       str = g_key_file_get_string(keyfile, iface->identifier,
+                                                       "IPv4.Address", NULL);
+       if (str != NULL) {
+               iface->ipv4.address.s_addr = inet_addr(str);
+               g_free(str);
+       }
+
+       str = g_key_file_get_string(keyfile, iface->identifier,
+                                                       "IPv4.Netmask", NULL);
+       if (str != NULL) {
+               iface->ipv4.netmask.s_addr = inet_addr(str);
+               g_free(str);
+       }
+
+       str = g_key_file_get_string(keyfile, iface->identifier,
+                                                       "IPv4.Gateway", NULL);
+       if (str != NULL) {
+               iface->ipv4.gateway.s_addr = inet_addr(str);
+               g_free(str);
+       }
+
+done:
+       g_key_file_free(keyfile);
+
+       g_free(pathname);
+
+       return 0;
+}
+
+static void do_update(GKeyFile *keyfile, struct connman_iface *iface)
+{
+       const char *str;
+       gchar *comment;
+
+       DBG("iface %p", iface);
+
+       comment = g_key_file_get_comment(keyfile,
+                                       iface->identifier, NULL, NULL);
+       if (comment == NULL || *comment == '\0') {
+               if (iface->device.product != NULL)
+                       g_key_file_set_comment(keyfile, iface->identifier,
+                                       NULL, iface->device.product, NULL);
+       }
+       g_free(comment);
+
+       str = __connman_iface_policy2string(iface->policy);
+       g_key_file_set_string(keyfile, iface->identifier, "Policy", str);
+
+       if (iface->ipv4.method != CONNMAN_IPV4_METHOD_UNKNOWN) {
+               str = __connman_ipv4_method2string(iface->ipv4.method);
+               g_key_file_set_string(keyfile, iface->identifier,
+                                                       "IPv4.Method", str);
+       } else
+               g_key_file_remove_key(keyfile, iface->identifier,
+                                                       "IPv4.Method", NULL);
+
+       if (iface->ipv4.address.s_addr != INADDR_ANY) {
+               str = inet_ntoa(iface->ipv4.address);
+               g_key_file_set_string(keyfile, iface->identifier,
+                                                       "IPv4.Address", str);
+       } else
+               g_key_file_remove_key(keyfile, iface->identifier,
+                                                       "IPv4.Address", NULL);
+
+       if (iface->ipv4.netmask.s_addr != INADDR_ANY) {
+               str = inet_ntoa(iface->ipv4.netmask);
+               g_key_file_set_string(keyfile, iface->identifier,
+                                                       "IPv4.Netmask", str);
+       } else
+               g_key_file_remove_key(keyfile, iface->identifier,
+                                                       "IPv4.Netmask", NULL);
+
+       if (iface->ipv4.gateway.s_addr != INADDR_ANY) {
+               str = inet_ntoa(iface->ipv4.gateway);
+               g_key_file_set_string(keyfile, iface->identifier,
+                                                       "IPv4.Gateway", str);
+       } else
+               g_key_file_remove_key(keyfile, iface->identifier,
+                                                       "IPv4.Gateway", NULL);
+}
+
+int __connman_iface_store(struct connman_iface *iface)
+{
+       GKeyFile *keyfile;
+       gchar *pathname, *data = NULL;
+       gsize length;
+
+       DBG("iface %p", iface);
+
+       if (iface->identifier == NULL)
+               return -EIO;
+
+       pathname = g_strdup_printf("%s/interfaces.conf", STORAGEDIR);
+       if (pathname == NULL)
+               return -ENOMEM;
+
+       keyfile = g_key_file_new();
+
+       if (g_file_get_contents(pathname, &data, &length, NULL) == FALSE)
+               goto done;
+
+       if (length > 0) {
+               if (g_key_file_load_from_data(keyfile, data, length,
+                               G_KEY_FILE_KEEP_COMMENTS, NULL) == FALSE)
+                       goto done;
+       }
+
+       g_free(data);
+
+       do_update(keyfile, iface);
+
+       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;
+}

diff --git a/src/iface.c b/src/iface.c
index c9d2595..df020a3 100644 (file)
--- a/src/iface.c
+++ b/src/iface.c
@@ -500,6 +500,7 @@ static DBusMessage *set_policy(DBusConnection *conn,
                path = dbus_message_get_path(msg);
 
                iface->policy = new_policy;
+               __connman_iface_store(iface);
 
                if (new_policy == CONNMAN_IFACE_POLICY_AUTO) {
                        if (iface->driver->activate)
@@ -642,6 +643,8 @@ static DBusMessage *set_ipv4(DBusConnection *conn,
        path = dbus_message_get_path(msg);
 
        if (changed == TRUE) {
+               __connman_iface_store(iface);
+
                signal = dbus_message_new_signal(path,
                                CONNMAN_IFACE_INTERFACE, "IPv4Changed");
                if (signal != NULL) {
@@ -831,6 +834,8 @@ static int probe_device(LibHalContext *ctx,
 
        __connman_iface_init_via_inet(iface);
 
+       __connman_iface_load(iface);
+
        iface->driver = driver;
 
        conn = libhal_ctx_get_dbus_connection(ctx);