From: Steven Barth <steven@midlink.org>
Date: Tue, 29 Oct 2013 13:52:16 +0000 (+0100)
Subject: Fix RA spam filter logic
X-Git-Tag: debian/1.1+git20160131-1~116
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=6f0b2d5f806a73ae6464bc6904d0494d8204cd0d;p=odhcp6c.git

Fix RA spam filter logic
---

diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index 2063935..506239d 100644
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -466,7 +466,6 @@ bool odhcp6c_update_entry_safe(enum odhcp6c_state state, struct odhcp6c_entry *n
 	size_t len;
 	struct odhcp6c_entry *x = odhcp6c_find_entry(state, new);
 	struct odhcp6c_entry *start = odhcp6c_get_state(state, &len);
-	bool changed = true;
 
 	if (x && x->valid > new->valid && new->valid < safe)
 		new->valid = safe;
@@ -477,7 +476,7 @@ bool odhcp6c_update_entry_safe(enum odhcp6c_state state, struct odhcp6c_entry *n
 					new->preferred >= x->preferred &&
 					new->preferred - x->preferred < 60 &&
 					x->class == new->class)
-				changed = false;
+				return false;
 			x->valid = new->valid;
 			x->preferred = new->preferred;
 			x->t1 = new->t1;
@@ -489,7 +488,7 @@ bool odhcp6c_update_entry_safe(enum odhcp6c_state state, struct odhcp6c_entry *n
 	} else if (x) {
 		odhcp6c_remove_state(state, (x - start) * sizeof(*x), sizeof(*x));
 	}
-	return changed;
+	return true;
 }