coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-16 23:08:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

util/nvmutil: move mac address parsing to function

Browse Source
This commit is contained in:
Leah Rowe
2023-04-05 21:33:39 +01:00
parent 92132e8e18
commit 8e5a8145b2
1 changed files with 39 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/nvmutil/nvmutil.c
+39 -31
View File
@@ -35,6 +35,7 @@
void readGbeFile(int *fd, const char *path, int flags, void readGbeFile(int *fd, const char *path, int flags,
size_t nr); size_t nr);
void cmd_setmac(const char *strMac); void cmd_setmac(const char *strMac);
int parseMacAddress(const char *strMac, uint16_t *mac);
uint8_t hextonum(char chs); uint8_t hextonum(char chs);
uint8_t rhex(void); uint8_t rhex(void);
void cmd_dump(void); void cmd_dump(void);
@@ -182,26 +183,44 @@ readGbeFile(int *fd, const char *path, int flags, size_t nr)
void void
cmd_setmac(const char *strMac) cmd_setmac(const char *strMac)
{ {
int partnum, byte, nib; int i, partnum;
uint8_t o, val8; uint16_t mac[3] = {0, 0, 0};
uint16_t val16, mac[3] = {0, 0, 0};
uint64_t total; if (parseMacAddress(strMac, mac) == -1)
err(errno = ECANCELED, "Bad MAC address");
for (partnum = 0; partnum < 2; partnum++) {
if (!validChecksum(partnum))
continue;
for (i = 0; i < 3; i++)
setWord(i, partnum, mac[i]);
part = partnum;
cmd_setchecksum();
}
}
int
parseMacAddress(const char *strMac, uint16_t *mac)
{
int i, nib, byte;
uint8_t val8;
uint16_t val16;
uint64_t total = 0;
if (strnlen(strMac, 20) != 17) if (strnlen(strMac, 20) != 17)
goto invalid_mac_address; return -1;
for (o = 0; o < 16; o += 3) { for (i = 0; i < 16; i += 3) {
if (o != 15) if (i != 15)
if (strMac[o + 2] != ':') if (strMac[i + 2] != ':')
goto invalid_mac_address; return -1;
byte = o / 3; byte = i / 3;
for (total = 0, nib = 0; nib < 2; nib++, total += val8) { for (total = 0, nib = 0; nib < 2; nib++, total += val8) {
if ((val8 = hextonum(strMac[o + nib])) > 15) if ((val8 = hextonum(strMac[i + nib])) > 15)
goto invalid_mac_address; return -1;
if ((byte == 0) && (nib == 1)) { if ((byte == 0) && (nib == 1))
if (strMac[o + nib] == '?') if (strMac[i + nib] == '?')
val8 = (val8 & 0xE) | 2; val8 = (val8 & 0xE) | 2;
}
val16 = val8; val16 = val8;
if ((byte % 2) ^ 1) if ((byte % 2) ^ 1)
@@ -211,29 +230,18 @@ cmd_setmac(const char *strMac)
} }
} }
/* Disallow multicast and all-zero MAC addresses */
test = mac[0]; test = mac[0];
if (little_endian) if (little_endian)
byteswap((uint8_t *) &test); byteswap((uint8_t *) &test);
if (total == 0 || (((uint8_t *) &test)[0] & 1)) if (total == 0 || (((uint8_t *) &test)[0] & 1))
goto invalid_mac_address; return -1;
if (little_endian) if (little_endian)
for (o = 0; o < 3; o++) for (i = 0; i < 3; i++)
byteswap((uint8_t *) &mac[o]); byteswap((uint8_t *) &mac[i]);
for (partnum = 0; partnum < 2; partnum++) { return 0;
if (!validChecksum(partnum))
continue;
for (o = 0; o < 3; o++)
setWord(o, partnum, mac[o]);
part = partnum;
cmd_setchecksum();
}
return;
invalid_mac_address:
fprintf(stderr, "Bad MAC address\n");
errno = ECANCELED;
} }
uint8_t uint8_t