X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_setup.c;h=488cb7c649c44bf81d9ff456cfba173a4f69a215;hb=4c30004cb6dc23616d7295b0ce631f066e7f1f82;hp=0e424eef5594dc0db10148c68f8c158b6e3c9be3;hpb=f5bb64b36ae0807cdd3f241f81a8e933065437f6;p=tinc

diff --git a/src/net_setup.c b/src/net_setup.c
index 0e424eef..488cb7c6 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -1,7 +1,7 @@
 /*
     net_setup.c -- Setup.
     Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
                   2006      Scott Lamb <slamb@slamb.org>
                   2010      Brandon Black <blblack@gmail.com>
 
@@ -751,7 +751,7 @@ static bool setup_myself(void) {
 	myself->nexthop = myself;
 	myself->via = myself;
 	myself->status.reachable = true;
-	myself->last_state_change = time(NULL);
+	myself->last_state_change = now.tv_sec;
 	myself->status.sptps = experimental;
 	node_add(myself);
 
@@ -808,6 +808,37 @@ static bool setup_myself(void) {
 
 	/* Open sockets */
 
+#ifndef HAVE_MINGW
+	int unix_fd = socket(AF_UNIX, SOCK_STREAM, 0);
+	if(unix_fd < 0) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Could not create UNIX socket: %s", sockstrerror(errno));
+		return false;
+	}
+
+	struct sockaddr_un sa;
+	sa.sun_family = AF_UNIX;
+	strncpy(sa.sun_path, unixsocketname, sizeof sa.sun_path);
+
+	if(connect(unix_fd, (struct sockaddr *)&sa, sizeof sa) >= 0) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "UNIX socket %s is still in use!", unixsocketname);
+		return false;
+	}
+
+	unlink(unixsocketname);
+
+	if(bind(unix_fd, (struct sockaddr *)&sa, sizeof sa) < 0) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Could not bind UNIX socket to %s: %s", unixsocketname, sockstrerror(errno));
+		return false;
+	}
+
+	if(listen(unix_fd, 3) < 0) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Could not listen on UNIX socket %s: %s", unixsocketname, sockstrerror(errno));
+		return false;
+	}
+
+	io_add(&unix_socket, handle_new_unix_connection, &unix_socket, unix_fd, IO_READ);
+#endif
+
 	if(!do_detach && getenv("LISTEN_FDS")) {
 		sockaddr_t sa;
 		socklen_t salen;
@@ -927,7 +958,7 @@ static bool setup_myself(void) {
 		return false;
 	}
 
-	last_config_check = time(NULL);
+	last_config_check = now.tv_sec;
 
 	return true;
 }
@@ -992,6 +1023,11 @@ void close_network_connections(void) {
 		close(listen_socket[i].udp.fd);
 	}
 
+#ifndef HAVE_MINGW
+	io_del(&unix_socket);
+	close(unix_socket.fd);
+#endif
+
 	char *envp[5];
 	xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
 	xasprintf(&envp[1], "DEVICE=%s", device ? : "");