X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Fpb-config%2Fpb-config.c;h=35008cc8c823afdf095fb2ffc319c0b828979b63;hp=aad3b9e5a44cf3f7838fe252e36a2b614a1d007f;hb=c14b12980885edd035322cd3bc87efff444c39b1;hpb=f611bde3f182e9a4befb48a0160d1831708aca67

diff --git a/lib/pb-config/pb-config.c b/lib/pb-config/pb-config.c
index aad3b9e..35008cc 100644
--- a/lib/pb-config/pb-config.c
+++ b/lib/pb-config/pb-config.c
@@ -1,109 +1,69 @@
 
+#include <string.h>
+
 #include <log/log.h>
+#include <types/types.h>
 #include <talloc/talloc.h>
 
 #include "pb-config.h"
 
-#include "storage.h"
-
-static struct config		*config;
-static struct config_storage	*storage;
-
-
-static void config_set_defaults(struct config *config)
-{
-	config->autoboot_enabled = true;
-	config->autoboot_timeout_sec = 10;
-	config->network.interfaces = NULL;
-	config->network.n_interfaces = 0;
-	config->network.dns_servers = NULL;
-	config->network.n_dns_servers = 0;
-}
-
-static void dump_config(struct config *config)
+static struct interface_config *config_copy_interface(struct config *ctx,
+		struct interface_config *src)
 {
-	int i;
-
-	pb_log("configuration:\n");
-
-	if (config->autoboot_enabled)
-		pb_log(" autoboot: enabled, %d sec\n",
-				config->autoboot_timeout_sec);
-	else
-		pb_log(" autoboot: disabled\n");
-
-	if (config->network.n_interfaces || config->network.n_dns_servers)
-		pb_log(" network configuration:\n");
-
-	for (i = 0; i < config->network.n_interfaces; i++) {
-		struct interface_config *ifconf =
-			config->network.interfaces[i];
-
-		pb_log("  interface %02x:%02x:%02x:%02x:%02x:%02x\n",
-				ifconf->hwaddr[0], ifconf->hwaddr[1],
-				ifconf->hwaddr[2], ifconf->hwaddr[3],
-				ifconf->hwaddr[4], ifconf->hwaddr[5]);
+	struct interface_config *dest = talloc(ctx, struct interface_config);
 
-		if (ifconf->ignore) {
-			pb_log("   ignore\n");
-			continue;
-		}
+	memcpy(dest->hwaddr, src->hwaddr, sizeof(src->hwaddr));
+	dest->ignore = src->ignore;
 
-		if (ifconf->method == CONFIG_METHOD_DHCP) {
-			pb_log("   dhcp\n");
+	if (dest->ignore)
+		return dest;
 
-		} else if (ifconf->method == CONFIG_METHOD_STATIC) {
-			pb_log("   static:\n");
-			pb_log("    ip:  %s\n", ifconf->static_config.address);
-			pb_log("    gw:  %s\n", ifconf->static_config.gateway);
+	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;
 	}
-	for (i = 0; i < config->network.n_dns_servers; i++)
-		pb_log("  dns server %s\n", config->network.dns_servers[i]);
+
+	return dest;
 }
 
-int config_init(void *ctx)
+struct config *config_copy(void *ctx, const struct config *src)
 {
-	config = talloc(ctx, struct config);
-	config_set_defaults(config);
+	struct config *dest;
+	unsigned int i;
 
-	storage = create_powerpc_nvram_storage(config);
+	dest = talloc(ctx, struct config);
+	dest->autoboot_enabled = src->autoboot_enabled;
+	dest->autoboot_timeout_sec = src->autoboot_timeout_sec;
 
-	storage->load(storage, config);
+	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);
 
-	dump_config(config);
+	for (i = 0; i < src->network.n_interfaces; i++)
+		dest->network.interfaces[i] = config_copy_interface(dest,
+				src->network.interfaces[i]);
 
-	return 0;
-}
+	for (i = 0; i < src->network.n_dns_servers; i++)
+		dest->network.dns_servers[i] = talloc_strdup(dest,
+				src->network.dns_servers[i]);
 
-/* A non-exported function to allow the test infrastructure to initialise
- * (and change) the configuration variables */
-struct parser_test;
-struct config __attribute__((unused)) *test_config_init(
-		struct parser_test *test);
-struct config *test_config_init(struct parser_test *test)
-{
-	config = talloc(test, struct config);
-	config_set_defaults(config);
-	return config;
-}
+	dest->n_boot_priorities = src->n_boot_priorities;
+	dest->boot_priorities = talloc_array(dest, struct boot_priority,
+			src->n_boot_priorities);
 
-const struct config *config_get(void)
-{
-	return config;
-}
+	for (i = 0; i < src->n_boot_priorities; i++)
+		dest->boot_priorities[i].type = src->boot_priorities[i].type;
 
-void config_set_autoboot(bool autoboot_enabled)
-{
-	config->autoboot_enabled = autoboot_enabled;
-
-	pb_log("set autoboot: %s\n",
-			config->autoboot_enabled ? "enabled" : "disabled");
-}
-
-int config_fini(void)
-{
-	talloc_free(config);
-	return 0;
+	return dest;
 }