X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=src%2Fodhcp6c.c;h=d70546b366ed4c7ebd47c554922d9ea27cd6860c;hb=feec1ad5767b977ce47e6738930c99c22ba0ce9c;hp=f4f83f1efb846cbb2250c0827763b144d5ad365a;hpb=82e0235c10dda8b9baeb06b6383bec1f43bb61a2;p=odhcp6c.git

diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index f4f83f1..d70546b 100644
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2012 Steven Barth <steven@midlink.org>
+ * 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
@@ -40,14 +40,12 @@ static uint8_t *state_data[_STATE_MAX] = {NULL};
 static size_t state_len[_STATE_MAX] = {0};
 
 static volatile int do_signal = 0;
-static int urandom_fd = -1;
-static bool bound = false, allow_slaac_only = true, release = true;
+static int urandom_fd = -1, allow_slaac_only = 0;
+static bool bound = false, 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,11 +56,12 @@ 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, "S::N:P:c:r:s:khedp:")) != -1) {
 		switch (c) {
 		case 'S':
-			allow_slaac_only = false;
+			allow_slaac_only = (optarg) ? atoi(optarg) : -1;
 			break;
 
 		case 'N':
@@ -77,7 +76,9 @@ int main(_unused int argc, char* const argv[])
 			break;
 
 		case 'P':
-			allow_slaac_only = false;
+			if (allow_slaac_only >= 0 && allow_slaac_only < 10)
+				allow_slaac_only = 10;
+
 			request_pd = strtoul(optarg, NULL, 10);
 			if (request_pd == 0)
 				request_pd = -1;
@@ -116,6 +117,10 @@ int main(_unused int argc, char* const argv[])
 			release = false;
 			break;
 
+		case 'e':
+			logopt |= LOG_PERROR;
+			break;
+
 		case 'd':
 			daemonize = true;
 			break;
@@ -130,18 +135,12 @@ int main(_unused int argc, char* const argv[])
 		}
 	}
 
+	openlog("odhcp6c", logopt, LOG_DAEMON);
 	const char *ifname = argv[optind];
 
 	if (help || !ifname)
 		return usage();
 
-	if ((urandom_fd = open("/dev/urandom", O_CLOEXEC | O_RDONLY)) < 0 ||
-			init_dhcpv6(ifname, request_pd) || ra_init(ifname) ||
-			script_init(script, ifname)) {
-		syslog(LOG_ERR, "failed to initialize: %s", strerror(errno));
-		return 3;
-	}
-
 	signal(SIGIO, sighandler);
 	signal(SIGHUP, sighandler);
 	signal(SIGINT, sighandler);
@@ -150,6 +149,13 @@ int main(_unused int argc, char* const argv[])
 	signal(SIGUSR1, sighandler);
 	signal(SIGUSR2, sighandler);
 
+	if ((urandom_fd = open("/dev/urandom", O_CLOEXEC | O_RDONLY)) < 0 ||
+			init_dhcpv6(ifname, request_pd) || ra_init(ifname) ||
+			script_init(script, ifname)) {
+		syslog(LOG_ERR, "failed to initialize: %s", strerror(errno));
+		return 3;
+	}
+
 	if (daemonize) {
 		openlog("odhcp6c", LOG_PID, LOG_DAEMON); // Disable LOG_PERROR
 		if (daemon(0, 0)) {
@@ -303,7 +309,7 @@ static int usage(void)
 	const char buf[] =
 	"Usage: odhcp6c [options] <interface>\n"
 	"\nFeature options:\n"
-	"	-S		Don't allow SLAAC-only (implied by -P)\n"
+	"	-S <time>	Wait at least <time> sec for a DHCP-server (0)\n"
 	"	-N <mode>	Mode for requesting addresses [try|force|none]\n"
 	"	-P <length>	Request IPv6-Prefix (0 = auto)\n"
 	"	-c <clientid>	Override client-ID (base-16 encoded)\n"
@@ -313,6 +319,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));
@@ -350,12 +357,12 @@ bool odhcp6c_signal_process(void)
 {
 	if (do_signal == SIGIO) {
 		do_signal = 0;
-		bool updated = ra_process();
-		updated |= ra_rtnl_process();
-		if (updated && (bound || allow_slaac_only)) {
-			odhcp6c_expire();
-			script_call("ra-updated");
-		}
+		bool ra_updated = ra_process();
+
+		if (ra_rtnl_process() || (ra_updated && (bound || allow_slaac_only == 0)))
+			script_call("ra-updated"); // Immediate process urgent events
+		else if (ra_updated && !bound && allow_slaac_only > 0)
+			script_delay_call("ra-updated", allow_slaac_only);
 	}
 
 	return do_signal != 0;
@@ -463,7 +470,7 @@ void odhcp6c_expire(void)
 	static time_t last_update = 0;
 	time_t now = odhcp6c_get_milli_time() / 1000;
 
-	uint32_t elapsed = now - last_update;
+	uint32_t elapsed = (last_update > 0) ? now - last_update : 0;
 	last_update = now;
 
 	odhcp6c_expire_list(STATE_RA_PREFIX, elapsed);