xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

9bootpxe: simplify

Browse source
This commit is contained in:
cinap_lenrek 2020-04-08 23:48:09 +02:00
parent abc5a66c56
commit 6041d2048c
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
sys/src/boot/efi/pxe.c
View file

@ -380,6 +380,20 @@ parsedhcp(EFI_PXE_BASE_CODE_DHCPV4_PACKET *dhcp)
}
/* DHCPv6 */
/*
* some UEFI implementations use random UUID based DUID instead of
* ethernet address, but use ethernet derived link-local addresses.
* so extract the MAC from our IPv6 address as a fallback.
*/
p = pxe->Mode->StationIp;
mymac[0] = p[8] ^ 2;
mymac[1] = p[9];
mymac[2] = p[10];
mymac[3] = p[13];
mymac[4] = p[14];
mymac[5] = p[15];
e = (uchar*)dhcp + sizeof(*dhcp);
p = (uchar*)dhcp + 4;
while(p+4 <= e){
@ -411,21 +425,6 @@ parsedhcp(EFI_PXE_BASE_CODE_DHCPV4_PACKET *dhcp)
}
p += len;
}
/*
* some UEFI implementations use random UUID based DUID instead of
* ethernet address, but use ethernet derived link-local addresses.
* so extract the MAC from our IPv6 address.
*/
if((mymac[0]|mymac[1]|mymac[2]|mymac[3]|mymac[4]|mymac[5]) == 0){
p = pxe->Mode->StationIp;
mymac[0] = p[8] ^ 2;
mymac[1] = p[9];
mymac[2] = p[10];
mymac[3] = p[13];
mymac[4] = p[14];
mymac[5] = p[15];
}
}
int