projects
/
systemd
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2a71d57
)
network: drop casting in memcpy()ing IPv6 address
author
Yu Watanabe
<watanabe.yu+github@gmail.com>
Thu, 18 Jun 2020 06:35:27 +0000
(15:35 +0900)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 18 Jun 2020 13:50:00 +0000
(15:50 +0200)
Follow-up for #16067.
src/network/networkd-ndisc.c
patch
|
blob
|
history
diff --git
a/src/network/networkd-ndisc.c
b/src/network/networkd-ndisc.c
index 6de8428e1e2fed81e255a53f25db891b0e8e3bbb..19a655b2d7af1398792ce5827f00136878e75587 100644
(file)
--- a/
src/network/networkd-ndisc.c
+++ b/
src/network/networkd-ndisc.c
@@
-77,7
+77,7
@@
static int make_stableprivate_address(Link *link, const struct in6_addr *prefix,
rid = htole64(siphash24_finalize(&state));
memcpy(addr->s6_addr, prefix->s6_addr, l);
- memcpy(
(uint8_t *) &
addr->s6_addr + l, &rid, 16 - l);
+ memcpy(addr->s6_addr + l, &rid, 16 - l);
return 0;
}
@@
-299,7
+299,7
@@
static int ndisc_router_generate_addresses(Link *link, unsigned prefixlen, uint3
}
}
} else if (j->address_generation_type == IPV6_TOKEN_ADDRESS_GENERATION_STATIC) {
- memcpy(
((uint8_t *)&new_address->in_addr.in6) + 8, ((uint8_t *) &j->prefix)
+ 8, 8);
+ memcpy(
new_address->in_addr.in6.s6_addr + 8, j->prefix.s6_addr
+ 8, 8);
have_address = true;
}