X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=src%2Fodhcp6c.c;h=460f230fb3811cac66305ce6467455f40bd313bd;hb=1234ab04386fd63eafb19ecf245b730d6461e869;hp=100ed61b0cf40809de09c22a7f1144d2c52feb72;hpb=60c9e4d5a26f530e89ed6254e8c09380b50fac08;p=odhcp6c.git

diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index 100ed61..460f230 100644
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -14,6 +14,7 @@
 
 #include <time.h>
 #include <errno.h>
+#include <ctype.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -22,16 +23,27 @@
 #include <syslog.h>
 #include <signal.h>
 #include <string.h>
+#include <strings.h>
 #include <stdbool.h>
 
 #include <net/if.h>
 #include <sys/wait.h>
 #include <sys/syscall.h>
 #include <arpa/inet.h>
+#include <linux/if_addr.h>
 
 #include "odhcp6c.h"
 #include "ra.h"
 
+#ifdef EXT_BFD_PING
+#include "bfd.h"
+#endif
+
+#ifndef IN6_IS_ADDR_UNIQUELOCAL
+#define IN6_IS_ADDR_UNIQUELOCAL(a) \
+	((((__const uint32_t *) (a))[0] & htonl (0xfe000000)) \
+	 == htonl (0xfc000000))
+#endif
 
 static void sighandler(int signal);
 static int usage(void);
@@ -43,7 +55,7 @@ static volatile int do_signal = 0;
 static int urandom_fd = -1, allow_slaac_only = 0;
 static bool bound = false, release = true;
 static time_t last_update = 0;
-
+static char *ifname = NULL;
 
 int main(_unused int argc, char* const argv[])
 {
@@ -59,10 +71,14 @@ int main(_unused int argc, char* const argv[])
 	static struct in6_addr ifid = IN6ADDR_ANY_INIT;
 	int sol_timeout = 120;
 
+#ifdef EXT_BFD_PING
+	int bfd_interval = 0, bfd_loss = 3;
+#endif
+
 	bool help = false, daemonize = false;
 	int logopt = LOG_PID;
 	int c, request_pd = 0;
-	while ((c = getopt(argc, argv, "S::N:P:Fc:i:r:s:kt:hedp:")) != -1) {
+	while ((c = getopt(argc, argv, "S::N:P:FB:c:i:r:s:kt:hedp:")) != -1) {
 		switch (c) {
 		case 'S':
 			allow_slaac_only = (optarg) ? atoi(optarg) : -1;
@@ -96,6 +112,12 @@ 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) {
@@ -157,7 +179,7 @@ int main(_unused int argc, char* const argv[])
 	}
 
 	openlog("odhcp6c", logopt, LOG_DAEMON);
-	const char *ifname = argv[optind];
+	ifname = argv[optind];
 
 	if (help || !ifname)
 		return usage();
@@ -262,6 +284,10 @@ int main(_unused int argc, char* const argv[])
 		script_call("bound");
 		bound = true;
 		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 (do_signal == 0 || do_signal == SIGUSR1) {
 			// Renew Cycle
@@ -311,6 +337,10 @@ int main(_unused int argc, char* const argv[])
 				script_call("rebound");
 		}
 
+#ifdef EXT_BFD_PING
+		bfd_stop();
+#endif
+
 
 		size_t ia_pd_len, ia_na_len, server_id_len;
 		odhcp6c_get_state(STATE_IA_PD, &ia_pd_len);
@@ -342,6 +372,9 @@ static int usage(void)
 	"	-N <mode>	Mode for requesting addresses [try|force|none]\n"
 	"	-P <length>	Request IPv6-Prefix (0 = auto)\n"
 	"	-F		Force IPv6-Prefix\n"
+#ifdef EXT_BFD_PING
+	"	-B <interval>	Enable BFD ping check\n"
+#endif
 	"	-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"
@@ -391,10 +424,17 @@ bool odhcp6c_signal_process(void)
 		do_signal = 0;
 		bool ra_updated = ra_process();
 
+		if (ra_link_up())
+			do_signal = SIGUSR2;
+
 		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 do_signal != 0;
@@ -553,11 +593,64 @@ void odhcp6c_random(void *buf, size_t len)
 	read(urandom_fd, buf, len);
 }
 
+
 bool odhcp6c_is_bound(void)
 {
 	return bound;
 }
 
+
+bool odhcp6c_addr_in_scope(const struct in6_addr *addr)
+{
+	FILE *fd = fopen("/proc/net/if_inet6", "r");
+	int len;
+	char buf[256];
+
+	if (fd == NULL)
+		return false;
+
+	while (fgets(buf, sizeof(buf), fd)) {
+		struct in6_addr inet6_addr;
+		uint32_t flags, dummy;
+		unsigned int i;
+		char name[8], addr_buf[32];
+
+		len = strlen(buf);
+
+		if ((len <= 0) || buf[len - 1] != '\n')
+			return false;
+
+		buf[--len] = '\0';
+
+		if (sscanf(buf, "%s %x %x %x %x %s",
+				addr_buf, &dummy, &dummy, &dummy, &flags, name) != 6)
+			return false;
+
+		if (strcmp(name, ifname) ||
+			(flags & (IFA_F_DADFAILED | IFA_F_TENTATIVE | IFA_F_DEPRECATED)))
+			continue;
+
+		for (i = 0; i < sizeof(addr_buf); i++) {
+			if (!isxdigit(addr_buf[i]) || isupper(addr_buf[i]))
+				return false;
+		}
+
+		memset(&inet6_addr, 0, sizeof(inet6_addr));
+		for (i = 0; i < (sizeof(addr_buf) / 2); i++) {
+			unsigned char byte;
+			static const char hex[] = "0123456789abcdef";
+			byte = ((index(hex, addr_buf[i * 2]) - hex) << 4) |
+				(index(hex, addr_buf[i * 2 + 1]) - hex);
+			inet6_addr.s6_addr[i] = byte;
+		}
+
+		if ((IN6_IS_ADDR_LINKLOCAL(&inet6_addr) == IN6_IS_ADDR_LINKLOCAL(addr)) &&
+			(IN6_IS_ADDR_UNIQUELOCAL(&inet6_addr) == IN6_IS_ADDR_UNIQUELOCAL(addr)))
+			return true;
+	}
+	return false;
+}
+
 static void sighandler(int signal)
 {
 	if (signal == SIGCHLD)