summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorHans Dedecker <dedeckeh@gmail.com>2018-04-09 17:01:45 +0200
committerHans Dedecker <dedeckeh@gmail.com>2018-04-09 17:08:28 +0200
commit31f217fc9ddfaf9de04e2ee75fbbac421c0db4f2 (patch)
treea76edfb7e3edf4a3dc12bf5e4a29bfa02e5e8a52
parent96033e937c56a407d8ca9302c5901cd77366da29 (diff)
router: improve RFC7084 compliancy
Send Router Information Option as well for prefixes with length 64 in order to be compliant with L-3 in RFC7084: An IPv6 CE router must advertise itself as a router for the delegated prefixes using the "Route Information Option". Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
-rw-r--r--src/router.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/router.c b/src/router.c
index e62282b..e9919b2 100644
--- a/src/router.c
+++ b/src/router.c
@@ -519,10 +519,10 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
for (ssize_t i = 0; i < ipcnt; ++i) {
struct odhcpd_ipaddr *addr = &addrs[i];
- if (addr->dprefix > 64 || addr->dprefix == 0 || addr->valid <= (uint32_t)now ||
- (addr->dprefix == 64 && addr->prefix == 64)) {
+ if (addr->dprefix > 64 || addr->dprefix == 0 || addr->valid <= (uint32_t)now)
continue; // Address not suitable
- } else if (addr->dprefix > 32) {
+
+ if (addr->dprefix > 32) {
addr->addr.in6.s6_addr32[1] &= htonl(~((1U << (64 - addr->dprefix)) - 1));
} else if (addr->dprefix <= 32) {
addr->addr.in6.s6_addr32[0] &= htonl(~((1U << (32 - addr->dprefix)) - 1));