X-Git-Url: https://git.decadent.org.uk/gitweb/?p=odhcp6c.git;a=blobdiff_plain;f=src%2Fodhcp6c.c;h=b62b2222b8caad231f5aeae5c4596f5bbdb26742;hp=a37de913a7c722a2ed11e110428a0d93d5c57374;hb=19c64c524614ea7fdbcedcc50d6980f096ccadb9;hpb=722226c4f1d45c8bf4ac9189523738abcf7d648f

diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index a37de91..b62b222 100644
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -429,7 +429,7 @@ static int usage(void)
 	"	-F		Force IPv6-Prefix\n"
 	"	-V <class>	Set vendor-class option (base-16 encoded)\n"
 	"	-u <user-class> Set user-class option string\n"
-	"	-c <clientid>	Override client-ID (base-16 encoded)\n"
+	"	-c <clientid>	Override client-ID (base-16 encoded 16-bit type + value)\n"
 	"	-i <iface-id>	Use a custom interface identifier for RA handling\n"
 	"	-r <options>	Options to be requested (comma-separated)\n"
 	"	-R		Do not request any options except those specified with -r\n"
@@ -445,7 +445,7 @@ static int usage(void)
 	"	-e		Write logmessages to stderr\n"
 	"	-v		Increase logging verbosity\n"
 	"	-h		Show this help\n\n";
-	write(STDERR_FILENO, buf, sizeof(buf));
+	fputs(buf, stderr);
 	return 1;
 }
 
@@ -553,14 +553,15 @@ void* odhcp6c_get_state(enum odhcp6c_state state, size_t *len)
 }
 
 
-struct odhcp6c_entry* odhcp6c_find_entry(enum odhcp6c_state state, const struct odhcp6c_entry *new)
+static struct odhcp6c_entry* odhcp6c_find_entry(enum odhcp6c_state state, const struct odhcp6c_entry *new)
 {
-	size_t len, cmplen = offsetof(struct odhcp6c_entry, target) + new->length / 8;
-	struct odhcp6c_entry *start = odhcp6c_get_state(state, &len);
-	struct odhcp6c_entry *x = NULL;
+	size_t len, cmplen = offsetof(struct odhcp6c_entry, target) + ((new->length + 7) / 8);
+	uint8_t *start = odhcp6c_get_state(state, &len);
 
-	for (struct odhcp6c_entry *c = start; !x && c < &start[len/sizeof(*c)]; ++c)
-		if (!memcmp(c, new, cmplen))
+	for (struct odhcp6c_entry *c = (struct odhcp6c_entry*)start;
+			(uint8_t*)c < &start[len] && &c->auxtarget[c->auxlen] <= &start[len];
+			c = (struct odhcp6c_entry*)(&c->auxtarget[c->auxlen]))
+		if (!memcmp(c, new, cmplen) && !memcmp(c->auxtarget, new->auxtarget, new->auxlen))
 			return c;
 
 	return NULL;
@@ -572,7 +573,7 @@ bool odhcp6c_update_entry(enum odhcp6c_state state, struct odhcp6c_entry *new,
 {
 	size_t len;
 	struct odhcp6c_entry *x = odhcp6c_find_entry(state, new);
-	struct odhcp6c_entry *start = odhcp6c_get_state(state, &len);
+	uint8_t *start = odhcp6c_get_state(state, &len);
 
 	if (x && x->valid > new->valid && new->valid < safe)
 		new->valid = safe;
@@ -584,20 +585,18 @@ bool odhcp6c_update_entry(enum odhcp6c_state state, struct odhcp6c_entry *new,
 					new->valid - x->valid < min_update_interval &&
 					new->preferred >= x->preferred &&
 					new->preferred != UINT32_MAX &&
-					new->preferred - x->preferred < min_update_interval &&
-					x->class == new->class)
+					new->preferred - x->preferred < min_update_interval)
 				return false;
 			x->valid = new->valid;
 			x->preferred = new->preferred;
 			x->t1 = new->t1;
 			x->t2 = new->t2;
-			x->class = new->class;
 			x->iaid = new->iaid;
 		} else {
-			odhcp6c_add_state(state, new, sizeof(*new));
+			odhcp6c_add_state(state, new, sizeof(*new) + new->auxlen);
 		}
 	} else if (x) {
-		odhcp6c_remove_state(state, (x - start) * sizeof(*x), sizeof(*x));
+		odhcp6c_remove_state(state, ((uint8_t*)x) - start, sizeof(*x) + x->auxlen);
 	}
 	return true;
 }
@@ -606,8 +605,10 @@ bool odhcp6c_update_entry(enum odhcp6c_state state, struct odhcp6c_entry *new,
 static void odhcp6c_expire_list(enum odhcp6c_state state, uint32_t elapsed)
 {
 	size_t len;
-	struct odhcp6c_entry *start = odhcp6c_get_state(state, &len);
-	for (struct odhcp6c_entry *c = start; c < &start[len / sizeof(*c)]; ++c) {
+	uint8_t *start = odhcp6c_get_state(state, &len);
+	for (struct odhcp6c_entry *c = (struct odhcp6c_entry*)start;
+			(uint8_t*)c < &start[len] && &c->auxtarget[c->auxlen] <= &start[len];
+			c = (struct odhcp6c_entry*)(&c->auxtarget[c->auxlen])) {
 		if (c->t1 < elapsed)
 			c->t1 = 0;
 		else if (c->t1 != UINT32_MAX)
@@ -629,7 +630,7 @@ static void odhcp6c_expire_list(enum odhcp6c_state state, uint32_t elapsed)
 			c->valid -= elapsed;
 
 		if (!c->valid)
-			odhcp6c_remove_state(state, (c - start) * sizeof(*c), sizeof(*c));
+			odhcp6c_remove_state(state, ((uint8_t*)c) - start, sizeof(*c) + c->auxlen);
 	}
 }
 
@@ -643,6 +644,7 @@ void odhcp6c_expire(void)
 	odhcp6c_expire_list(STATE_RA_PREFIX, elapsed);
 	odhcp6c_expire_list(STATE_RA_ROUTE, elapsed);
 	odhcp6c_expire_list(STATE_RA_DNS, elapsed);
+	odhcp6c_expire_list(STATE_RA_SEARCH, elapsed);
 	odhcp6c_expire_list(STATE_IA_NA, elapsed);
 	odhcp6c_expire_list(STATE_IA_PD, elapsed);
 }
@@ -654,9 +656,9 @@ uint32_t odhcp6c_elapsed(void)
 }
 
 
-void odhcp6c_random(void *buf, size_t len)
+int odhcp6c_random(void *buf, size_t len)
 {
-	read(urandom_fd, buf, len);
+	return read(urandom_fd, buf, len);
 }
 
 bool odhcp6c_is_bound(void)