riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net_if: proper u/l-bit inversion for short addresses

Browse Source
This commit is contained in:
Cenk Gündoğan 2015-03-02 18:02:01 +01:00 committed by Joakim Gebart
parent 2aa031e7c7
commit d6242360da
2 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/net/link_layer/net_if/net_if.c
View File

@ -433,21 +433,8 @@ int net_if_get_eui64(net_if_eui64_t *eui64, int if_id, int force_generation)
* the local/universal bit to 1. */ * the local/universal bit to 1. */
eui64->uint32[0] = HTONL(0x020000ff); eui64->uint32[0] = HTONL(0x020000ff);
eui64->uint16[2] = HTONS(0xfe00); eui64->uint16[2] = HTONS(0xfe00);
if (sizeof(hwaddr) == 2) {
eui64->uint16[3] = HTONS(hwaddr); eui64->uint16[3] = HTONS(hwaddr);
} }
else if (sizeof(hwaddr) == 1) {
eui64->uint8[6] = 0;
eui64->uint8[7] = (uint8_t)hwaddr;
}
else {
DEBUG("Error on EUI-64 generation: do not know what to do with "
"hardware address of length %d\n", sizeof(hwaddr));
return 0;
}
}
return 1; return 1;
} }

8
sys/net/network_layer/sixlowpan/ip.c
View File

@ -690,15 +690,7 @@ ipv6_addr_t *ipv6_addr_set_by_eui64(ipv6_addr_t *out, int if_id,
if (net_if_get_eui64((net_if_eui64_t *) &out->uint8[8], if_id, if (net_if_get_eui64((net_if_eui64_t *) &out->uint8[8], if_id,
force_generation)) { force_generation)) {
#ifdef MODULE_SIXLOWPAN
if (!sixlowpan_lowpan_eui64_to_short_addr((net_if_eui64_t *)&out->uint8[8])) {
out->uint8[8] ^= 0x02; out->uint8[8] ^= 0x02;
}
#else
out->uint8[8] ^= 0x02;
#endif
return out; return out;
} }
else { else {