X-Git-Url: https://git.decadent.org.uk/gitweb/?p=odhcp6c.git;a=blobdiff_plain;f=src%2Fodhcp6c.c;h=64d363f46b9d21210d12c40fa72104a04848c5e0;hp=50404afe85ec519c326eeef6e0b862ebb4fda2e1;hb=4ad21618ad863b5f590ed00f2c7677605a98e39f;hpb=e8b07f018cbdf8f2a08f93af46904e7ffb9eb123

diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index 50404af..64d363f 100644
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -46,8 +46,6 @@ static bool bound = false, allow_slaac_only = true, release = true;
 
 int main(_unused int argc, char* const argv[])
 {
-	openlog("odhcp6c", LOG_PERROR | LOG_PID, LOG_DAEMON);
-
 	// Allocate ressources
 	const char *pidfile = NULL;
 	const char *script = "/usr/sbin/odhcp6c-update";
@@ -58,8 +56,9 @@ int main(_unused int argc, char* const argv[])
 	enum odhcp6c_ia_mode ia_na_mode = IA_MODE_TRY;
 
 	bool help = false, daemonize = false;
+	int logopt = LOG_PID;
 	int c, request_pd = 0;
-	while ((c = getopt(argc, argv, "SN:P:c:r:s:khdp:")) != -1) {
+	while ((c = getopt(argc, argv, "SN:P:c:r:s:khedp:")) != -1) {
 		switch (c) {
 		case 'S':
 			allow_slaac_only = false;
@@ -89,7 +88,7 @@ int main(_unused int argc, char* const argv[])
 				buf[0] = 0;
 				buf[1] = DHCPV6_OPT_CLIENTID;
 				buf[2] = 0;
-				buf[4] = l;
+				buf[3] = l;
 				odhcp6c_add_state(STATE_CLIENT_ID, buf, l + 4);
 			} else {
 				help = true;
@@ -116,6 +115,10 @@ int main(_unused int argc, char* const argv[])
 			release = false;
 			break;
 
+		case 'e':
+			logopt |= LOG_PERROR;
+			break;
+
 		case 'd':
 			daemonize = true;
 			break;
@@ -130,6 +133,7 @@ int main(_unused int argc, char* const argv[])
 		}
 	}
 
+	openlog("odhcp6c", logopt, LOG_DAEMON);
 	const char *ifname = argv[optind];
 
 	if (help || !ifname)
@@ -313,6 +317,7 @@ static int usage(void)
 	"\nInvocation options:\n"
 	"	-p <pidfile>	Set pidfile (/var/run/6relayd.pid)\n"
 	"	-d		Daemonize\n"
+	"	-e		Write logmessages to stderr\n"
 	//"	-v		Increase logging verbosity\n"
 	"	-h		Show this help\n\n";
 	write(STDERR_FILENO, buf, sizeof(buf));
@@ -422,6 +427,7 @@ void odhcp6c_update_entry_safe(enum odhcp6c_state state, struct odhcp6c_entry *n
 		if (x) {
 			x->valid = new->valid;
 			x->preferred = new->preferred;
+                        x->prefix_class = new->prefix_class;
 		} else {
 			odhcp6c_add_state(state, new, sizeof(*new));
 		}