X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-config.c;h=9cc6a29085ff3e4b21b14d3bb11ed4ec689e6763;hp=0b42e4c971d09576afd101899d22d07a46537590;hb=6e46a2e3a2d69e1982ed531ed69def8f9a5e8af1;hpb=66bf929fa97fabb70198455f9eec2e9ccf0661fa

diff --git a/ui/ncurses/nc-config.c b/ui/ncurses/nc-config.c
index 0b42e4c..9cc6a29 100644
--- a/ui/ncurses/nc-config.c
+++ b/ui/ncurses/nc-config.c
@@ -131,6 +131,8 @@ static int config_screen_post(struct nc_scr *scr)
 	struct config_screen *screen = config_screen_from_scr(scr);
 	widgetset_post(screen->widgetset);
 	nc_scr_frame_draw(scr);
+	redrawwin(scr->main_ncw);
+	wrefresh(screen->scr.main_ncw);
 	pad_refresh(screen);
 	return 0;
 }
@@ -150,13 +152,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);
@@ -202,15 +204,24 @@ static int screen_process_form(struct config_screen *screen)
 	}
 
 	if (net_conf_type == NET_CONF_TYPE_STATIC) {
+		char *ip, *mask, *gateway;
+
+		ip = widget_textbox_get_value(screen->widgets.ip_addr_f);
+		mask = widget_textbox_get_value(screen->widgets.ip_mask_f);
+		gateway = widget_textbox_get_value(screen->widgets.gateway_f);
+
+		if (!ip || !*ip || !mask || !*mask) {
+			screen->scr.frame.status =
+				"No IP / mask values are set";
+			nc_scr_frame_draw(&screen->scr);
+			talloc_free(config);
+			return -1;
+		}
+
 		iface->method = CONFIG_METHOD_STATIC;
 		iface->static_config.address = talloc_asprintf(iface, "%s/%s",
-				widget_textbox_get_value(
-					screen->widgets.ip_addr_f),
-				widget_textbox_get_value(
-					screen->widgets.ip_mask_f));
-		iface->static_config.gateway = talloc_strdup(iface,
-				widget_textbox_get_value(
-					screen->widgets.gateway_f));
+				ip, mask);
+		iface->static_config.gateway = talloc_strdup(iface, gateway);
 	}
 
 	str = widget_textbox_get_value(screen->widgets.dns_f);
@@ -250,8 +261,12 @@ static int screen_process_form(struct config_screen *screen)
 static void ok_click(void *arg)
 {
 	struct config_screen *screen = arg;
-	screen_process_form(screen);
-	screen->exit = true;
+	if (screen_process_form(screen))
+		/* errors are written to the status line, so we'll need
+		 * to refresh */
+		wrefresh(screen->scr.main_ncw);
+	else
+		screen->exit = true;
 }
 
 static void cancel_click(void *arg)
@@ -452,6 +467,8 @@ static void config_screen_setup_widgets(struct config_screen *screen,
 	screen->widgets.timeout_f = widget_new_textbox(set, 0, 0, 5, str);
 	screen->widgets.timeout_help_l = widget_new_label(set, 0, 0, "seconds");
 
+	widget_textbox_set_validator_integer(screen->widgets.timeout_f, 0, 999);
+
 	screen->widgets.network_l = widget_new_label(set, 0, 0, "Network");
 	screen->widgets.network_f = widget_new_select(set, 0, 0, 50);
 
@@ -508,15 +525,20 @@ static void config_screen_setup_widgets(struct config_screen *screen,
 	screen->widgets.ip_addr_l = widget_new_label(set, 0, 0, "IP/mask:");
 	screen->widgets.ip_addr_f = widget_new_textbox(set, 0, 0, 16, ip);
 	screen->widgets.ip_mask_l = widget_new_label(set, 0, 0, "/");
-	screen->widgets.ip_mask_f = widget_new_textbox(set, 0, 0, 3, mask);
+	screen->widgets.ip_mask_f = widget_new_textbox(set, 0, 0, 4, mask);
 	screen->widgets.ip_addr_mask_help_l =
 		widget_new_label(set, 0, 0, "(eg. 192.168.0.10 / 24)");
 
+	widget_textbox_set_validator_ipv4(screen->widgets.ip_addr_f);
+	widget_textbox_set_validator_integer(screen->widgets.ip_mask_f, 1, 31);
+
 	screen->widgets.gateway_l = widget_new_label(set, 0, 0, "Gateway:");
 	screen->widgets.gateway_f = widget_new_textbox(set, 0, 0, 16, gw);
 	screen->widgets.gateway_help_l =
 		widget_new_label(set, 0, 0, "(eg. 192.168.0.1)");
 
+	widget_textbox_set_validator_ipv4(screen->widgets.gateway_f);
+
 	str = talloc_strdup(screen, "");
 	for (i = 0; i < config->network.n_dns_servers; i++) {
 		str = talloc_asprintf_append(str, "%s%s",
@@ -529,6 +551,8 @@ static void config_screen_setup_widgets(struct config_screen *screen,
 	screen->widgets.dns_help_l =
 		widget_new_label(set, 0, 0, "(eg. 192.168.0.2)");
 
+	widget_textbox_set_validator_ipv4_multi(screen->widgets.dns_f);
+
 	screen->widgets.dns_dhcp_help_l = widget_new_label(set, 0, 0,
 			"(if not provided by DHCP server)");
 
@@ -558,8 +582,7 @@ static void config_screen_widget_focus(struct nc_widget *widget, void *arg)
 	pad_refresh(screen);
 }
 
-
-void config_screen_update(struct config_screen *screen,
+static void config_screen_draw(struct config_screen *screen,
 		const struct config *config,
 		const struct system_info *sysinfo)
 {
@@ -604,7 +627,13 @@ void config_screen_update(struct config_screen *screen,
 
 	if (repost)
 		widgetset_post(screen->widgetset);
+}
 
+void config_screen_update(struct config_screen *screen,
+		const struct config *config,
+		const struct system_info *sysinfo)
+{
+	config_screen_draw(screen, config, sysinfo);
 	pad_refresh(screen);
 }
 
@@ -644,9 +673,7 @@ struct config_screen *config_screen_init(struct cui *cui,
 
 	scrollok(screen->scr.sub_ncw, true);
 
-	config_screen_update(screen, config, sysinfo);
-
-	wrefresh(screen->scr.main_ncw);
+	config_screen_draw(screen, config, sysinfo);
 
 	return screen;
 }