Revert "RA: fix on-link/off-link handling"

New behavior breaks source-restrictions of on-link routes.

This reverts commit 9817e4983c7d4e28f53b78d4fc6ea1eabed8affe.

diff --git a/src/ra.c b/src/ra.c
index 6132e455189b1ce0b527b0322c97166c42f600a9..560552fcbd5bb4149bb9f2df8043bd30394ee76a 100644 (file)
--- a/src/ra.c
+++ b/src/ra.c
@@ -356,18 +356,16 @@ bool ra_process(void)
                                                || entry.valid < entry.preferred)
                                        continue;
 
+                               if (pinfo->nd_opt_pi_flags_reserved & ND_OPT_PI_FLAG_ONLINK)
+                                       changed |= odhcp6c_update_entry_safe(STATE_RA_ROUTE, &entry, 7200);
+
                                if (!(pinfo->nd_opt_pi_flags_reserved & ND_OPT_PI_FLAG_AUTO) ||
-                                               pinfo->nd_opt_pi_prefix_len != 64) {
-                                       if (pinfo->nd_opt_pi_flags_reserved & ND_OPT_PI_FLAG_ONLINK)
-                                               changed |= odhcp6c_update_entry_safe(STATE_RA_ROUTE, &entry, 7200);
+                                               pinfo->nd_opt_pi_prefix_len != 64)
                                        continue;
-                               }
 
                                entry.target.s6_addr32[2] = lladdr.s6_addr32[2];
                                entry.target.s6_addr32[3] = lladdr.s6_addr32[3];
 
-                               if (!(pinfo->nd_opt_pi_flags_reserved & ND_OPT_PI_FLAG_ONLINK))
-                                       entry.length = 128;
                                changed |= odhcp6c_update_entry_safe(STATE_RA_PREFIX, &entry, 7200);
                        } else if (opt->type == ND_OPT_RECURSIVE_DNS && opt->len > 2) {
                                entry.router = from.sin6_addr;