diff options
author | Patrik Flykt <patrik.flykt@linux.intel.com> | 2017-08-14 12:53:11 +0300 |
---|---|---|
committer | Patrik Flykt <patrik.flykt@linux.intel.com> | 2017-09-07 09:51:26 +0300 |
commit | e9c6da386849a6d262c1d605be911922f2cb7428 (patch) | |
tree | e5c98bd1841ec875315f03ebe78f7a7b13674e82 /src/libsystemd-network/sd-radv.c | |
parent | 88295a05dbb0c69de4bae77d80d0566b52ec1cac (diff) | |
download | systemd-e9c6da386849a6d262c1d605be911922f2cb7428.tar.gz systemd-e9c6da386849a6d262c1d605be911922f2cb7428.tar.bz2 systemd-e9c6da386849a6d262c1d605be911922f2cb7428.zip |
sd-radv: Add Router Advertisement DNS information
Add Router Advertisement Recursive DNS Server information as specified
in RFC 8106.
Diffstat (limited to 'src/libsystemd-network/sd-radv.c')
-rw-r--r-- | src/libsystemd-network/sd-radv.c | 48 |
1 files changed, 46 insertions, 2 deletions
diff --git a/src/libsystemd-network/sd-radv.c b/src/libsystemd-network/sd-radv.c index f23275a80c..70772b4f15 100644 --- a/src/libsystemd-network/sd-radv.c +++ b/src/libsystemd-network/sd-radv.c @@ -126,6 +126,8 @@ _public_ sd_radv *sd_radv_unref(sd_radv *ra) { sd_radv_prefix_unref(p); } + free(ra->rdnss); + radv_reset(ra); sd_radv_detach_event(ra); @@ -155,8 +157,8 @@ static int radv_send(sd_radv *ra, const struct in6_addr *dst, .nd_opt_mtu_type = ND_OPT_MTU, .nd_opt_mtu_len = 1, }; - /* Reserve iov space for RA header, linkaddr, MTU + N prefixes */ - struct iovec iov[3 + ra->n_prefixes]; + /* Reserve iov space for RA header, linkaddr, MTU, N prefixes, RDNSS */ + struct iovec iov[4 + ra->n_prefixes]; struct msghdr msg = { .msg_name = &dst_addr, .msg_namelen = sizeof(dst_addr), @@ -196,6 +198,12 @@ static int radv_send(sd_radv *ra, const struct in6_addr *dst, msg.msg_iovlen++; } + if (ra->rdnss) { + iov[msg.msg_iovlen].iov_base = ra->rdnss; + iov[msg.msg_iovlen].iov_len = ra->rdnss->length * 8; + msg.msg_iovlen++; + } + if (sendmsg(ra->fd, &msg, 0) < 0) return -errno; @@ -546,6 +554,42 @@ _public_ int sd_radv_add_prefix(sd_radv *ra, sd_radv_prefix *p) { return 0; } +_public_ int sd_radv_set_rdnss(sd_radv *ra, uint32_t lifetime, + const struct in6_addr *dns, size_t n_dns) { + _cleanup_free_ struct sd_radv_opt_dns *opt_rdnss = NULL; + size_t len; + + assert_return(ra, -EINVAL); + assert_return(n_dns < 128, -EINVAL); + + if (!dns || n_dns == 0) { + ra->rdnss = mfree(ra->rdnss); + ra->n_rdnss = 0; + + return 0; + } + + len = sizeof(struct sd_radv_opt_dns) + sizeof(struct in6_addr) * n_dns; + + opt_rdnss = malloc0(len); + if (!opt_rdnss) + return -ENOMEM; + + opt_rdnss->type = SD_RADV_OPT_RDNSS; + opt_rdnss->length = len / 8; + opt_rdnss->lifetime = htobe32(lifetime); + + memcpy(opt_rdnss + 1, dns, n_dns * sizeof(struct in6_addr)); + + free(ra->rdnss); + ra->rdnss = opt_rdnss; + opt_rdnss = NULL; + + ra->n_rdnss = n_dns; + + return 0; +} + _public_ int sd_radv_prefix_new(sd_radv_prefix **ret) { _cleanup_(sd_radv_prefix_unrefp) sd_radv_prefix *p = NULL; |