X-Git-Url: https://git.decadent.org.uk/gitweb/?p=odhcp6c.git;a=blobdiff_plain;f=src%2Fra.c;h=814a17decfe706dbde3da71d3749d9ff8dc7a594;hp=f1a5f7fdb5747d0160283adff8a2dc9c43db12b1;hb=a300c7335c5ad78fb053e7c73b45e95e1f3c2ad1;hpb=e69df66491b6d6d244c3274ae36f7b640bd07a5e

diff --git a/src/ra.c b/src/ra.c
index f1a5f7f..814a17d 100644
--- a/src/ra.c
+++ b/src/ra.c
@@ -1,3 +1,17 @@
+/**
+ * Copyright (C) 2012-2013 Steven Barth <steven@midlink.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License v2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
 #include <fcntl.h>
 #include <stdio.h>
 #include <signal.h>
@@ -125,7 +139,7 @@ static bool ra_deduplicate(const struct in6_addr *any, uint8_t length)
 {
 	struct odhcp6c_entry entry = {IN6ADDR_ANY_INIT, length, 0, *any, 0, 0};
 	struct odhcp6c_entry *x = odhcp6c_find_entry(STATE_RA_PREFIX, &entry);
-	if (x) {
+	if (x && IN6_ARE_ADDR_EQUAL(&x->target, any)) {
 		odhcp6c_random(&x->target.s6_addr32[2], 2 * sizeof(uint32_t));
 	} else if (odhcp6c_find_entry(STATE_IA_NA, &entry)) {
 		dhcpv6_request(DHCPV6_MSG_DECLINE);
@@ -157,7 +171,7 @@ bool ra_rtnl_process(void)
 			ssize_t alen = NLMSG_PAYLOAD(nh, sizeof(*ifa));
 			for (struct rtattr *rta = (struct rtattr*)&ifa[1]; RTA_OK(rta, alen);
 					rta = RTA_NEXT(rta, alen))
-				if (rta->rta_type == IFA_LOCAL && RTA_PAYLOAD(rta) >= sizeof(*addr))
+				if (rta->rta_type == IFA_ADDRESS && RTA_PAYLOAD(rta) >= sizeof(*addr))
 					addr = RTA_DATA(rta);
 
 			if (addr)
@@ -236,7 +250,7 @@ bool ra_process(void)
 				struct nd_opt_prefix_info *pinfo = (struct nd_opt_prefix_info*)opt;
 				entry.router = any;
 				entry.target = pinfo->nd_opt_pi_prefix;
-				entry.priority = 0;
+				entry.priority = 256;
 				entry.length = pinfo->nd_opt_pi_prefix_len;
 				entry.valid = ntohl(pinfo->nd_opt_pi_valid_time);
 				entry.preferred = ntohl(pinfo->nd_opt_pi_preferred_time);