X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Fpb-config%2Fpb-config.c;h=2adc7b248d8b956569ff971464cf6e2bc74092e4;hp=40bc39fc516a36da4593899cbe762bd36d26162d;hb=e19c5fe83174de749843bb8486a0d12c25adcb82;hpb=9239fd1ec121fc6c6eda49ef5c2dab081a026785 diff --git a/lib/pb-config/pb-config.c b/lib/pb-config/pb-config.c index 40bc39f..2adc7b2 100644 --- a/lib/pb-config/pb-config.c +++ b/lib/pb-config/pb-config.c @@ -1,144 +1,77 @@ +#include + #include #include #include #include "pb-config.h" -#include "storage.h" - -void *config_ctx; -static struct config *config; -static struct config_storage *storage; - - -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; - - config->n_boot_priorities = 2; - config->boot_priorities = talloc_array(config, struct boot_priority, - config->n_boot_priorities); - config->boot_priorities[0].type = DEVICE_TYPE_NETWORK; - config->boot_priorities[1].type = DEVICE_TYPE_DISK; - -} - -void dump_config(struct config *config); -void dump_config(struct config *config) +static struct interface_config *config_copy_interface(struct config *ctx, + struct interface_config *src) { - unsigned int i; - - pb_log("configuration:\n"); + struct interface_config *dest = talloc(ctx, struct interface_config); - 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]); - - 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]); -} - -int config_init(void *ctx) -{ - config_ctx = talloc_new(ctx); - - config = talloc(config_ctx, struct config); - config_set_defaults(config); - - storage = create_powerpc_nvram_storage(config); - storage->load(storage, config); - - dump_config(config); - - return 0; + return dest; } -int config_set(struct config *newconfig) +struct config *config_copy(void *ctx, const struct config *src) { - int rc; - - if (!storage || !storage->save) - return -1; - - if (newconfig == config) - return 0; - - pb_log("new configuration data received\n"); - dump_config(config); + struct config *dest; + unsigned int i; - rc = storage->save(storage, config); + 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].priority = + src->boot_priorities[i].priority; + dest->boot_priorities[i].type = src->boot_priorities[i].type; + } - if (!rc) - config = talloc_steal(config_ctx, newconfig); + if (src->boot_device && strlen(src->boot_device)) + dest->boot_device = talloc_strdup(dest, src->boot_device); else - pb_log("error saving new configuration; changes lost\n"); - - return rc; -} - -/* 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; -} - -const struct config *config_get(void) -{ - return config; -} + dest->boot_device = NULL; -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_ctx); - return 0; + return dest; }