Instead of opening link, ipv6, ipv6rs and ipv6ns sockets globally,

only open when the first link wanting this features needs it.
Hopefully fixes #263 and #264.

1 files changed, 8 insertions, 6 deletions

diff --git a/ipv6.c b/ipv6.c
index 03a8dc16..fc15883d 100644
--- a/ipv6.c
+++ b/ipv6.c
@@ -35,6 +35,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
+#include <unistd.h>
 
 #include "common.h"
 #include "dhcpcd.h"
@@ -66,14 +67,15 @@ ipv6_cleanup()
 int ipv6_init(void)
 {
 
-	routes = malloc(sizeof(*routes));
-	if (routes == NULL)
-		return -1;
-
-	TAILQ_INIT(routes);
+	if (routes == NULL) {
+		routes = malloc(sizeof(*routes));
+		if (routes == NULL) 
+			return -1;
+		TAILQ_INIT(routes);
 #ifdef DEBUG_MEMORY
-	atexit(ipv6_cleanup);
+		atexit(ipv6_cleanup);
 #endif
+	}
 	return 0;
 }