leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

common/env_flags.c: Add function to validate a MAC address

Browse Source 
The code that checks if a string has the format of a MAC address has been
moved to a separate function called eth_validate_ethaddr_str().

This has been done to allow other components (such as vsc9953 driver)
to validate a MAC address.

Signed-off-by: Codrin Ciubotariu <codrin.ciubotariu@freescale.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: York Sun <yorksun@freescale.com>
This commit is contained in:
Codrin Ciubotariu 2015-09-09 18:00:51 +03:00 committed by York Sun
parent 68c929da6b
commit 0118e83ba4
2 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
common/env_flags.c
View File

@ -187,6 +187,31 @@ static void skip_num(int hex, const char *value, const char **end,
*end = value; *end = value;
} }
#ifdef CONFIG_CMD_NET
int eth_validate_ethaddr_str(const char *addr)
{
const char *end;
const char *cur;
int i;
cur = addr;
for (i = 0; i < 6; i++) {
skip_num(1, cur, &end, 2);
if (cur == end)
return -1;
if (cur + 2 == end && is_hex_prefix(cur))
return -1;
if (i != 5 && *end != ':')
return -1;
if (i == 5 && *end != '\0')
return -1;
cur = end + 1;
}
return 0;
}
#endif
/* /*
* Based on the declared type enum, validate that the value string complies * Based on the declared type enum, validate that the value string complies
* with that format * with that format
@ -239,19 +264,8 @@ static int _env_flags_validate_type(const char *value,
} }
break; break;
case env_flags_vartype_macaddr: case env_flags_vartype_macaddr:
cur = value; if (eth_validate_ethaddr_str(value))
for (i = 0; i < 6; i++) { return -1;
skip_num(1, cur, &end, 2);
if (cur == end)
return -1;
if (cur + 2 == end && is_hex_prefix(cur))
return -1;
if (i != 5 && *end != ':')
return -1;
if (i == 5 && *end != '\0')
return -1;
cur = end + 1;
}
break; break;
#endif #endif
case env_flags_vartype_end: case env_flags_vartype_end:

7
include/env_flags.h
View File

@ -109,6 +109,13 @@ enum env_flags_varaccess env_flags_parse_varaccess(const char *flags);
*/ */
enum env_flags_varaccess env_flags_parse_varaccess_from_binflags(int binflags); enum env_flags_varaccess env_flags_parse_varaccess_from_binflags(int binflags);
#ifdef CONFIG_CMD_NET
/*
* Check if a string has the format of an Ethernet MAC address
*/
int eth_validate_ethaddr_str(const char *addr);
#endif
#ifdef USE_HOSTCC #ifdef USE_HOSTCC
/* /*
* Look up the type of a variable directly from the .flags var. * Look up the type of a variable directly from the .flags var.