sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

dhcp: add copy_only_if_valid support 

This will allow to only update a var if recive a valid data.
This is need for hostname.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2012-08-15 15:38:38 +08:00 committed by Sascha Hauer
parent 91b563613e
commit d166d74211
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/dhcp.c
View File

@ -110,6 +110,7 @@ struct dhcp_opt {
unsigned char option;
/* request automatically the option when creating the DHCP request */
bool optional;
bool copy_only_if_valid;
const char *barebox_var_name;
const char *barebox_dhcp_global;
void (*handle)(struct dhcp_opt *opt, unsigned char *data, int tlen);
@ -153,6 +154,9 @@ static void env_str_handle(struct dhcp_opt *opt, unsigned char *popt, int optlen
memcpy(tmp, popt, optlen);
tmp[optlen] = 0;
if (opt->copy_only_if_valid && !strlen(tmp))
return;
if (opt->barebox_var_name)
setenv(opt->barebox_var_name, tmp);
if (opt->barebox_dhcp_global)
@ -208,6 +212,7 @@ struct dhcp_opt dhcp_options[] = {
.barebox_var_name = "net.nameserver",
}, {
.option = 12,
.copy_only_if_valid = 1,
.handle = env_str_handle,
.barebox_var_name = "global.hostname",
}, {
@ -647,7 +652,7 @@ static void dhcp_reset_env(void)
for (i = 0; i < ARRAY_SIZE(dhcp_options); i++) {
opt = &dhcp_options[i];
if (!opt->barebox_var_name)
if (!opt->barebox_var_name || opt->copy_only_if_valid)
continue;
setenv(opt->barebox_var_name,"");