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>

diff --git a/lib/pb-config/pb-config.c b/lib/pb-config/pb-config.c
index 915a01d47abaaab8a7929eef6f2abddc7e90d1fb..9f696d55704495e568328ac17e4202087cdd1ffb 100644 (file)
--- 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 1cfaca3b1a28332124b00cbd50b79587701c97c7..e430301f0381d509d6126b9a462bcc60723f2be1 100644 (file)
--- 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 */
 

diff --git a/ui/ncurses/nc-config.c b/ui/ncurses/nc-config.c
index 6b29a660d43a4b6afd6b04cc0a576e0931a8fbe8..74105f1f5c6d853e16e31f549f22c84f2520b419 100644 (file)
--- a/ui/ncurses/nc-config.c
+++ b/ui/ncurses/nc-config.c
@@ -150,13 +150,13 @@ struct nc_scr *config_screen_scr(struct config_screen *screen)
 static int screen_process_form(struct config_screen *screen)
 {
        const struct system_info *sysinfo = screen->cui->sysinfo;
-       struct config *config = talloc_zero(screen, struct config);
        enum net_conf_type net_conf_type;
        struct interface_config *iface;
+       struct config *config;
        char *str, *end;
        int rc;
 
-       config_set_defaults(config);
+       config = config_copy(screen, screen->cui->config);
 
        config->autoboot_enabled =
                widget_checkbox_get_value(screen->widgets.autoboot_f);
@@ -212,6 +212,7 @@ static int screen_process_form(struct config_screen *screen)
                        screen->scr.frame.status =
                                "No IP / mask values are set";
                        nc_scr_frame_draw(&screen->scr);
+                       talloc_free(config);
                        return -1;
                }