From 2b41985dde73e71daad90c36fa5d06c199da3ae1 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Thu, 8 Aug 2013 13:54:19 +0800 Subject: config: Split interface configuration from network configuration This change moves the interface configuration into its own 'struct interface_config'. We also remove the _config suffix from the network and interface members. Signed-off-by: Jeremy Kerr --- lib/pb-config/pb-config.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'lib/pb-config/pb-config.c') diff --git a/lib/pb-config/pb-config.c b/lib/pb-config/pb-config.c index 6398a69..5cd303b 100644 --- a/lib/pb-config/pb-config.c +++ b/lib/pb-config/pb-config.c @@ -13,8 +13,8 @@ static struct config_storage *storage; static void config_set_defaults(struct config *config) { config->autoboot_enabled = true; - config->network_configs = NULL; - config->n_network_configs = 0; + config->network.interfaces = NULL; + config->network.n_interfaces = 0; } static void dump_config(struct config *config) @@ -29,27 +29,27 @@ static void dump_config(struct config *config) if (config->n_network_configs > 0) pb_log(" network configuration:\n"); - for (i = 0; i < config->n_network_configs; i++) { - struct network_config *netconf = config->network_configs[i]; + 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", - netconf->hwaddr[0], netconf->hwaddr[1], - netconf->hwaddr[2], netconf->hwaddr[3], - netconf->hwaddr[4], netconf->hwaddr[5]); + ifconf->hwaddr[0], ifconf->hwaddr[1], + ifconf->hwaddr[2], ifconf->hwaddr[3], + ifconf->hwaddr[4], ifconf->hwaddr[5]); - if (netconf->ignore) { + if (ifconf->ignore) { pb_log(" ignore\n"); continue; } - if (netconf->method == CONFIG_METHOD_DHCP) { + if (ifconf->method == CONFIG_METHOD_DHCP) { pb_log(" dhcp\n"); - } else if (netconf->method == CONFIG_METHOD_STATIC) { + } else if (ifconf->method == CONFIG_METHOD_STATIC) { pb_log(" static:\n"); - pb_log(" ip: %s\n", netconf->static_config.address); - pb_log(" gw: %s\n", netconf->static_config.gateway); - pb_log(" dns: %s\n", netconf->static_config.dns); + pb_log(" ip: %s\n", ifconf->static_config.address); + pb_log(" gw: %s\n", ifconf->static_config.gateway); } } -- cgit v1.2.1