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

diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index 798598f..a37de91 100644
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -32,9 +32,6 @@
 #include "odhcp6c.h"
 #include "ra.h"
 
-#ifdef EXT_BFD_PING
-#include "bfd.h"
-#endif
 
 
 static void sighandler(int signal);
@@ -69,17 +66,15 @@ 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;
 
-#ifdef EXT_BFD_PING
-	int bfd_interval = 0, bfd_loss = 3;
-#endif
 
 	bool help = false, daemonize = false;
 	int logopt = LOG_PID;
 	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;
@@ -141,12 +136,6 @@ int main(_unused int argc, char* const argv[])
 			ia_pd_mode = IA_MODE_FORCE;
 			break;
 
-#ifdef EXT_BFD_PING
-		case 'B':
-			bfd_interval = atoi(optarg);
-			break;
-#endif
-
 		case 'c':
 			l = script_unhexlify(&buf[4], sizeof(buf) - 4, optarg);
 			if (l > 0) {
@@ -223,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;
@@ -230,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)
@@ -258,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);
 		}
 	}
 
@@ -278,6 +270,7 @@ int main(_unused int argc, char* const argv[])
 
 	while (!signal_term) { // Main logic
 		odhcp6c_clear_state(STATE_SERVER_ID);
+		odhcp6c_clear_state(STATE_SERVER_ADDR);
 		odhcp6c_clear_state(STATE_IA_NA);
 		odhcp6c_clear_state(STATE_IA_PD);
 		odhcp6c_clear_state(STATE_SNTP_IP);
@@ -347,13 +340,9 @@ int main(_unused int argc, char* const argv[])
 			break;
 
 		case DHCPV6_STATEFUL:
-			script_call("bound");
 			bound = true;
+			script_call("bound");
 			syslog(LOG_NOTICE, "entering stateful-mode on %s", ifname);
-#ifdef EXT_BFD_PING
-			if (bfd_interval > 0)
-				bfd_start(ifname, bfd_loss, bfd_interval);
-#endif
 
 			while (!signal_usr2 && !signal_term) {
 				// Renew Cycle
@@ -372,16 +361,7 @@ int main(_unused int argc, char* const argv[])
 					break; // Other signal type
 
 				// Send renew as T1 expired
-				size_t ia_pd_len, ia_na_len;
-				odhcp6c_get_state(STATE_IA_PD, &ia_pd_len);
-				odhcp6c_get_state(STATE_IA_NA, &ia_na_len);
-
-				// If we have any IAs, send renew, otherwise request
-				if (ia_pd_len == 0 && ia_na_len == 0)
-					res = dhcpv6_request(DHCPV6_MSG_REQUEST);
-				else
-					res = dhcpv6_request(DHCPV6_MSG_RENEW);
-
+				res = dhcpv6_request(DHCPV6_MSG_RENEW);
 				odhcp6c_signal_process();
 				if (res > 0) { // Renew was succesfull
 					// Publish updates
@@ -390,6 +370,14 @@ int main(_unused int argc, char* const argv[])
 				}
 
 				odhcp6c_clear_state(STATE_SERVER_ID); // Remove binding
+				odhcp6c_clear_state(STATE_SERVER_ADDR);
+
+				size_t ia_pd_len, ia_na_len;
+				odhcp6c_get_state(STATE_IA_PD, &ia_pd_len);
+				odhcp6c_get_state(STATE_IA_NA, &ia_na_len);
+
+				if (ia_pd_len == 0 && ia_na_len == 0)
+					break;
 
 				// If we have IAs, try rebind otherwise restart
 				res = dhcpv6_request(DHCPV6_MSG_REBIND);
@@ -398,9 +386,6 @@ int main(_unused int argc, char* const argv[])
 				if (res > 0)
 					script_call("rebound");
 				else {
-#ifdef EXT_BFD_PING
-					bfd_stop();
-#endif
 					break;
 				}
 			}
@@ -410,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);
@@ -441,9 +428,7 @@ static int usage(void)
 	"	-P <length>	Request IPv6-Prefix (0 = auto)\n"
 	"	-F		Force IPv6-Prefix\n"
 	"	-V <class>	Set vendor-class option (base-16 encoded)\n"
-#ifdef EXT_BFD_PING
-	"	-B <interval>	Enable BFD ping check\n"
-#endif
+	"	-u <user-class> Set user-class option string\n"
 	"	-c <clientid>	Override client-ID (base-16 encoded)\n"
 	"	-i <iface-id>	Use a custom interface identifier for RA handling\n"
 	"	-r <options>	Options to be requested (comma-separated)\n"
@@ -453,12 +438,12 @@ static int usage(void)
 	"	-f		Don't send Client FQDN option\n"
 	"	-k		Don't send a RELEASE when stopping\n"
 	"	-t <seconds>	Maximum timeout for DHCPv6-SOLICIT (3600)\n"
-	"	-m <seconds>	Minimum time between accepting updates (60)\n"
+	"	-m <seconds>	Minimum time between accepting updates (30)\n"
 	"\nInvocation options:\n"
 	"	-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));
 	return 1;
@@ -470,7 +455,7 @@ uint64_t odhcp6c_get_milli_time(void)
 {
 	struct timespec t = {0, 0};
 	syscall(SYS_clock_gettime, CLOCK_MONOTONIC, &t);
-	return t.tv_sec * 1000 + t.tv_nsec / 1000000;
+	return ((uint64_t)t.tv_sec) * 1000 + ((uint64_t)t.tv_nsec) / 1000000;
 }
 
 
@@ -501,14 +486,8 @@ bool odhcp6c_signal_process(void)
 		if (ra_link_up())
 			signal_usr2 = true;
 
-		if (ra_updated && (bound || allow_slaac_only == 0))
+		if (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);
-
-#ifdef EXT_BFD_PING
-		bfd_receive();
-#endif
 	}
 
 	return signal_usr1 || signal_usr2 || signal_term;
@@ -588,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);
@@ -599,7 +579,8 @@ 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 &&
@@ -622,12 +603,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;