dark/zerotiertspu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Windows build fixes for MAC changes (in tap driver), some comments and cleanup in MAC.hpp.

Browse source
This commit is contained in:
Adam Ierymenko 2014-05-23 16:21:57 -07:00
parent f939d0ee62
commit 2861229558
3 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
node/MAC.hpp
View file

@ -188,8 +188,7 @@ public:
throw()
{
uint64_t m = ((uint64_t)firstOctetForNetwork(nwid)) << 40;
uint64_t a = ztaddr.toInt();
m |= a; // a is 40 bits
m |= ztaddr.toInt(); // a is 40 bits
m ^= ((nwid >> 8) & 0xff) << 32;
m ^= ((nwid >> 16) & 0xff) << 24;
m ^= ((nwid >> 24) & 0xff) << 16;
@ -208,8 +207,8 @@ public:
inline Address toAddress(uint64_t nwid) const
throw()
{
uint64_t a = _m & 0xffffffffffULL;
a ^= ((nwid >> 8) & 0xff) << 32;
uint64_t a = _m & 0xffffffffffULL; // least significant 40 bits of MAC are formed from address
a ^= ((nwid >> 8) & 0xff) << 32; // ... XORed with bits 8-48 of the nwid in little-endian byte order, so unmask it
a ^= ((nwid >> 16) & 0xff) << 24;
a ^= ((nwid >> 24) & 0xff) << 16;
a ^= ((nwid >> 32) & 0xff) << 8;