SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ndisc-option: sort options in sent message

Browse Source 
To make the sent message reproducible.
This commit is contained in:
Yu Watanabe
2024-03-26 13:58:36 +00:00
committed by Luca Boccassi
parent d1b08f2460
commit 073f438365
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd-network/ndisc-option.c
+9 -3
View File
@@ -1177,11 +1177,17 @@ int ndisc_send(int fd, const struct sockaddr_in6 *dst, const struct icmp6_hdr *h
assert(dst);
assert(hdr);
size_t n;
_cleanup_free_ sd_ndisc_option **list = NULL;
r = set_dump_sorted(options, (void***) &list, &n);
if (r < 0)
return r;
struct iovec *iov = NULL;
size_t n_iov = 0;
CLEANUP_ARRAY(iov, n_iov, iovec_array_free);
iov = new(struct iovec, 1 + set_size(options));
iov = new(struct iovec, 1 + n);
if (!iov)
return -ENOMEM;
@@ -1196,9 +1202,9 @@ int ndisc_send(int fd, const struct sockaddr_in6 *dst, const struct icmp6_hdr *h
iov[n_iov++] = IOVEC_MAKE(TAKE_PTR(copy), hdr_size);
const sd_ndisc_option *option;
SET_FOREACH(option, options) {
FOREACH_ARRAY(p, list, n) {
_cleanup_free_ uint8_t *buf = NULL;
sd_ndisc_option *option = *p;
switch (option->type) {
case 0: