mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-31 14:25:41 +00:00
Code Issues Releases Wiki Activity

allow hardware addresses tobe up to 16 bytes independent of the hardware type

Browse Source
This commit is contained in:
Ted Lemon
1996-06-27 19:02:34 +00:00
parent f8141e67df
commit 6589fcfe7d
2 changed files with 42 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
confpars.c
View File

@@ -702,22 +702,38 @@ struct hardware parse_hardware_addr (cfile, bc)
int token; int token;
int hlen; int hlen;
struct hardware rv; struct hardware rv;
unsigned char *t;
token = next_token (&val, cfile); token = next_token (&val, cfile);
switch (token) { switch (token) {
case ETHERNET: case ETHERNET:
rv.htype = ARPHRD_ETHER; rv.htype = ARPHRD_ETHER;
hlen = 6;
parse_numeric_aggregate (cfile, bc,
(unsigned char *)&rv.haddr [0], &hlen,
COLON, 16, 8);
rv.hlen = hlen;
break; break;
default: default:
parse_warn ("expecting a network hardware type"); parse_warn ("expecting a network hardware type");
skip_to_semi (cfile); skip_to_semi (cfile);
longjmp (jdref (bc), 1); longjmp (jdref (bc), 1);
} }
/* Parse the hardware address information. Technically,
it would make a lot of sense to restrict the length of the
data we'll accept here to the length of a particular hardware
address type. Unfortunately, there are some broken clients
out there that put bogus data in the chaddr buffer, and we accept
that data in the lease file rather than simply failing on such
clients. Yuck. */
hlen = 0;
t = parse_numeric_aggregate (cfile, bc,
(unsigned char *)0, &hlen,
COLON, 16, 8);
if (hlen > sizeof rv.haddr) {
free (t);
parse_warn ("hardware address too long");
longjmp (jdref (bc), 1);
}
rv.hlen = hlen;
memcpy ((unsigned char *)&rv.haddr [0], t, rv.hlen);
free (t);
return rv; return rv;
} }

26
server/confpars.c
View File

@@ -702,22 +702,38 @@ struct hardware parse_hardware_addr (cfile, bc)
int token; int token;
int hlen; int hlen;
struct hardware rv; struct hardware rv;
unsigned char *t;
token = next_token (&val, cfile); token = next_token (&val, cfile);
switch (token) { switch (token) {
case ETHERNET: case ETHERNET:
rv.htype = ARPHRD_ETHER; rv.htype = ARPHRD_ETHER;
hlen = 6;
parse_numeric_aggregate (cfile, bc,
(unsigned char *)&rv.haddr [0], &hlen,
COLON, 16, 8);
rv.hlen = hlen;
break; break;
default: default:
parse_warn ("expecting a network hardware type"); parse_warn ("expecting a network hardware type");
skip_to_semi (cfile); skip_to_semi (cfile);
longjmp (jdref (bc), 1); longjmp (jdref (bc), 1);
} }
/* Parse the hardware address information. Technically,
it would make a lot of sense to restrict the length of the
data we'll accept here to the length of a particular hardware
address type. Unfortunately, there are some broken clients
out there that put bogus data in the chaddr buffer, and we accept
that data in the lease file rather than simply failing on such
clients. Yuck. */
hlen = 0;
t = parse_numeric_aggregate (cfile, bc,
(unsigned char *)0, &hlen,
COLON, 16, 8);
if (hlen > sizeof rv.haddr) {
free (t);
parse_warn ("hardware address too long");
longjmp (jdref (bc), 1);
}
rv.hlen = hlen;
memcpy ((unsigned char *)&rv.haddr [0], t, rv.hlen);
free (t);
return rv; return rv;
} }