summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2014-01-28 13:01:19 +0800
committerJeremy Kerr <jk@ozlabs.org>2014-01-30 21:59:10 +0800
commitdea7842fb28ff055b4e0f43a6a1fdaf3c4b5ba89 (patch)
tree4c17ee2b9250d04d028d0bf1ad996e91861f049a /lib
parentd239d484e3d34da52024f6e97e7046774d7b299d (diff)
downloadpetitboot-dea7842fb28ff055b4e0f43a6a1fdaf3c4b5ba89.zip
petitboot-dea7842fb28ff055b4e0f43a6a1fdaf3c4b5ba89.tar.gz
lib/pb-config: Add config_copy
At the moment, UIs have the config_set_defaults function to estabilish an initial configuration when performing an update. Rather than using the defaults, this change provides a config_copy() function, so that the updated configuration can be initialised from the current config. With this in place, the UI/server-common pb-config module can be reduced to just the one function. Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/pb-config/pb-config.c63
-rw-r--r--lib/pb-config/pb-config.h2
2 files changed, 65 insertions, 0 deletions
diff --git a/lib/pb-config/pb-config.c b/lib/pb-config/pb-config.c
index 915a01d..9f696d5 100644
--- a/lib/pb-config/pb-config.c
+++ b/lib/pb-config/pb-config.c
@@ -1,4 +1,6 @@
+#include <string.h>
+
#include <log/log.h>
#include <types/types.h>
#include <talloc/talloc.h>
@@ -29,6 +31,67 @@ void config_set_defaults(struct config *config)
}
+static struct interface_config *config_copy_interface(struct config *ctx,
+ struct interface_config *src)
+{
+ struct interface_config *dest = talloc(ctx, struct interface_config);
+
+ memcpy(dest->hwaddr, src->hwaddr, sizeof(src->hwaddr));
+ dest->ignore = src->ignore;
+
+ if (dest->ignore)
+ return dest;
+
+ dest->method = src->method;
+
+ switch (src->method) {
+ case CONFIG_METHOD_DHCP:
+ break;
+ case CONFIG_METHOD_STATIC:
+ dest->static_config.address =
+ talloc_strdup(dest, src->static_config.address);
+ dest->static_config.gateway =
+ talloc_strdup(dest, src->static_config.gateway);
+ break;
+ }
+
+ return dest;
+}
+
+struct config *config_copy(void *ctx, const struct config *src)
+{
+ struct config *dest;
+ unsigned int i;
+
+ dest = talloc(ctx, struct config);
+ dest->autoboot_enabled = src->autoboot_enabled;
+ dest->autoboot_timeout_sec = src->autoboot_timeout_sec;
+
+ dest->network.n_interfaces = src->network.n_interfaces;
+ dest->network.interfaces = talloc_array(dest, struct interface_config *,
+ dest->network.n_interfaces);
+ dest->network.n_dns_servers = src->network.n_dns_servers;
+ dest->network.dns_servers = talloc_array(dest, const char *,
+ dest->network.n_dns_servers);
+
+ for (i = 0; i < src->network.n_interfaces; i++)
+ dest->network.interfaces[i] = config_copy_interface(dest,
+ src->network.interfaces[i]);
+
+ for (i = 0; i < src->network.n_dns_servers; i++)
+ dest->network.dns_servers[i] = talloc_strdup(dest,
+ src->network.dns_servers[i]);
+
+ dest->n_boot_priorities = src->n_boot_priorities;
+ dest->boot_priorities = talloc_array(dest, struct boot_priority,
+ src->n_boot_priorities);
+
+ for (i = 0; i < src->n_boot_priorities; i++)
+ dest->boot_priorities[i].type = src->boot_priorities[i].type;
+
+ return dest;
+}
+
void dump_config(struct config *config);
void dump_config(struct config *config)
{
diff --git a/lib/pb-config/pb-config.h b/lib/pb-config/pb-config.h
index 1cfaca3..e430301 100644
--- a/lib/pb-config/pb-config.h
+++ b/lib/pb-config/pb-config.h
@@ -16,5 +16,7 @@ int config_fini(void);
/* for use by the storage backends */
void config_set_defaults(struct config *config);
+struct config *config_copy(void *ctx, const struct config *src);
+
#endif /* CONFIGURATION_H */
OpenPOWER on IntegriCloud