X-Git-Url: https://git.decadent.org.uk/gitweb/?p=odhcp6c.git;a=blobdiff_plain;f=src%2Fodhcp6c.c;h=4c534c17b518a66d74688f9131123b2351c9ecc9;hp=61ffe9d832b25ae4fbae54f7fd450bdbc4214ba5;hb=e1540ec55e014e538a92a588675e4156a1bddabe;hpb=1d1e74031aac9b12ee892b1720a1a3d4f3025d98

diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index 61ffe9d..4c534c1 100644
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -66,6 +66,7 @@ int main(_unused int argc, char* const argv[])
 	int ia_pd_iaid_index = 0;
 	static struct in6_addr ifid = IN6ADDR_ANY_INIT;
 	int sol_timeout = DHCPV6_SOL_MAX_RT;
+	int verbosity = 0;
 
 
 	bool help = false, daemonize = false;
@@ -73,7 +74,7 @@ int main(_unused int argc, char* const argv[])
 	int c;
 	unsigned int client_options = DHCPV6_CLIENT_FQDN | DHCPV6_ACCEPT_RECONFIGURE;
 
-	while ((c = getopt(argc, argv, "S::N:V:P:FB:c:i:r:Ru:s:kt:m:hedp:fa")) != -1) {
+	while ((c = getopt(argc, argv, "S::N:V:P:FB:c:i:r:Ru:s:kt:m:hedp:fav")) != -1) {
 		switch (c) {
 		case 'S':
 			allow_slaac_only = (optarg) ? atoi(optarg) : -1;
@@ -211,6 +212,10 @@ int main(_unused int argc, char* const argv[])
 			client_options &= ~DHCPV6_ACCEPT_RECONFIGURE;
 			break;
 
+		case 'v':
+			++verbosity;
+			break;
+
 		default:
 			help = true;
 			break;
@@ -218,6 +223,9 @@ int main(_unused int argc, char* const argv[])
 	}
 
 	openlog("odhcp6c", logopt, LOG_DAEMON);
+	if (!verbosity)
+		setlogmask(LOG_UPTO(LOG_WARNING));
+
 	const char *ifname = argv[optind];
 
 	if (help || !ifname)
@@ -246,19 +254,15 @@ int main(_unused int argc, char* const argv[])
 			return 4;
 		}
 
-		char pidbuf[128];
 		if (!pidfile) {
-			snprintf(pidbuf, sizeof(pidbuf),
-					"/var/run/odhcp6c.%s.pid", ifname);
-			pidfile = pidbuf;
+			snprintf((char*)buf, sizeof(buf), "/var/run/odhcp6c.%s.pid", ifname);
+			pidfile = (char*)buf;
 		}
 
-		int fd = open(pidfile, O_WRONLY | O_CREAT, 0644);
-		if (fd >= 0) {
-			char buf[8];
-			int len = snprintf(buf, sizeof(buf), "%i\n", getpid());
-			write(fd, buf, len);
-			close(fd);
+		FILE *fp = fopen(pidfile, "w");
+		if (fp) {
+			fprintf(fp, "%i\n", getpid());
+			fclose(fp);
 		}
 	}
 
@@ -391,6 +395,8 @@ int main(_unused int argc, char* const argv[])
 			break;
 		}
 
+		odhcp6c_expire();
+
 		size_t ia_pd_len, ia_na_len, server_id_len;
 		odhcp6c_get_state(STATE_IA_PD, &ia_pd_len);
 		odhcp6c_get_state(STATE_IA_NA, &ia_na_len);
@@ -423,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"
@@ -437,9 +443,9 @@ static int usage(void)
 	"	-p <pidfile>	Set pidfile (/var/run/odhcp6c.pid)\n"
 	"	-d		Daemonize\n"
 	"	-e		Write logmessages to stderr\n"
-	//"	-v		Increase logging verbosity\n"
+	"	-v		Increase logging verbosity\n"
 	"	-h		Show this help\n\n";
-	write(STDERR_FILENO, buf, sizeof(buf));
+	fputs(buf, stderr);
 	return 1;
 }
 
@@ -547,9 +553,9 @@ 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;
+	size_t len, cmplen = offsetof(struct odhcp6c_entry, target) + ((new->length + 7) / 8);
 	struct odhcp6c_entry *start = odhcp6c_get_state(state, &len);
 	struct odhcp6c_entry *x = NULL;
 
@@ -561,7 +567,8 @@ struct odhcp6c_entry* odhcp6c_find_entry(enum odhcp6c_state state, const struct
 }
 
 
-bool odhcp6c_update_entry_safe(enum odhcp6c_state state, struct odhcp6c_entry *new, uint32_t safe)
+bool odhcp6c_update_entry(enum odhcp6c_state state, struct odhcp6c_entry *new,
+		uint32_t safe, bool filterexcess)
 {
 	size_t len;
 	struct odhcp6c_entry *x = odhcp6c_find_entry(state, new);
@@ -572,18 +579,17 @@ bool odhcp6c_update_entry_safe(enum odhcp6c_state state, struct odhcp6c_entry *n
 
 	if (new->valid > 0) {
 		if (x) {
-			if (new->valid >= x->valid && new->valid != UINT32_MAX &&
+			if (filterexcess && new->valid >= x->valid &&
+					new->valid != UINT32_MAX &&
 					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));
@@ -595,12 +601,6 @@ bool odhcp6c_update_entry_safe(enum odhcp6c_state state, struct odhcp6c_entry *n
 }
 
 
-bool odhcp6c_update_entry(enum odhcp6c_state state, struct odhcp6c_entry *new)
-{
-	return odhcp6c_update_entry_safe(state, new, 0);
-}
-
-
 static void odhcp6c_expire_list(enum odhcp6c_state state, uint32_t elapsed)
 {
 	size_t len;
@@ -652,9 +652,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)