X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=src%2Fra.c;h=3e36f94692e14921cb9aa94132d032181cf654e1;hb=7c733630c49f1c8a7a43e701fa0b849ab9e473a5;hp=6132e455189b1ce0b527b0322c97166c42f600a9;hpb=9817e4983c7d4e28f53b78d4fc6ea1eabed8affe;p=odhcp6c.git

diff --git a/src/ra.c b/src/ra.c
index 6132e45..3e36f94 100644
--- a/src/ra.c
+++ b/src/ra.c
@@ -311,11 +311,13 @@ bool ra_process(void)
 			update_proc("conf", "hop_limit", adv->nd_ra_curhoplimit);
 
 		// Parse ND parameters
-		if (ntohl(adv->nd_ra_reachable) <= 3600000)
-			update_proc("neigh", "base_reachable_time_ms", ntohl(adv->nd_ra_reachable));
+		uint32_t reachable = ntohl(adv->nd_ra_reachable);
+		if (reachable > 0 && reachable <= 3600000)
+			update_proc("neigh", "base_reachable_time_ms", reachable);
 
-		if (ntohl(adv->nd_ra_retransmit) <= 60000)
-			update_proc("neigh", "retrans_time_ms", ntohl(adv->nd_ra_retransmit));
+		uint32_t retransmit = ntohl(adv->nd_ra_retransmit);
+		if (retransmit > 0 && retransmit <= 60000)
+			update_proc("neigh", "retrans_time_ms", retransmit);
 
 
 		// Evaluate options
@@ -356,18 +358,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;