X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fcontrol.c;h=84098be5388471129c887c0e6220eb9dddd102b0;hb=a38e0d621397d6d69c939ccc287d5a803b668195;hp=956d6ee10bd066174c4ef406ec8d71020b31de9d;hpb=6dfdb323612184529b4b83c1be914dda8262de47;p=tinc

diff --git a/src/control.c b/src/control.c
index 956d6ee1..84098be5 100644
--- a/src/control.c
+++ b/src/control.c
@@ -1,6 +1,6 @@
 /*
     control.c -- Control socket handling.
-    Copyright (C) 2012 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2013 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -25,16 +25,15 @@
 #include "graph.h"
 #include "logger.h"
 #include "meta.h"
+#include "names.h"
 #include "net.h"
 #include "netutl.h"
 #include "protocol.h"
 #include "route.h"
-#include "splay_tree.h"
 #include "utils.h"
 #include "xalloc.h"
 
 char controlcookie[65];
-extern char *pidfilename;
 
 static bool control_return(connection_t *c, int type, int error) {
 	return send_request(c, "%d %d %d", CONTROL, type, error);
@@ -59,12 +58,12 @@ bool control_h(connection_t *c, const char *request) {
 
 	switch (type) {
 		case REQ_STOP:
-			event_loopexit(NULL);
+			event_exit();
 			return control_ok(c, REQ_STOP);
 
 		case REQ_DUMP_NODES:
 			return dump_nodes(c);
-			
+
 		case REQ_DUMP_EDGES:
 			return dump_edges(c);
 
@@ -99,16 +98,12 @@ bool control_h(connection_t *c, const char *request) {
 
 		case REQ_DISCONNECT: {
 			char name[MAX_STRING_SIZE];
-			connection_t *other;
-			splay_node_t *node, *next;
 			bool found = false;
 
 			if(sscanf(request, "%*d %*d " MAX_STRING, name) != 1)
 				return control_return(c, REQ_DISCONNECT, -1);
 
-			for(node = connection_tree->head; node; node = next) {
-				next = node->next;
-				other = node->data;
+			for list_each(connection_t, other, connection_list) {
 				if(strcmp(other->name, name))
 					continue;
 				terminate_connection(other, other->status.active);
@@ -142,17 +137,16 @@ bool init_control(void) {
 	randomize(controlcookie, sizeof controlcookie / 2);
 	bin2hex(controlcookie, controlcookie, sizeof controlcookie / 2);
 
+	mode_t mask = umask(0);
+	umask(mask | 077);
 	FILE *f = fopen(pidfilename, "w");
+	umask(mask);
+
 	if(!f) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Cannot write control socket cookie file %s: %s", pidfilename, strerror(errno));
 		return false;
 	}
 
-#ifdef HAVE_FCHMOD
-	fchmod(fileno(f), 0600);
-#else
-	chmod(pidfilename, 0600);
-#endif
 	// Get the address and port of the first listening socket
 
 	char *localhost = NULL;
@@ -161,8 +155,8 @@ bool init_control(void) {
 
 	// Make sure we have a valid address, and map 0.0.0.0 and :: to 127.0.0.1 and ::1.
 
-	if(getsockname(listen_socket[0].tcp, (struct sockaddr *)&sa, &len)) {
-		xasprintf(&localhost, "127.0.0.1 port %d", myport);
+	if(getsockname(listen_socket[0].tcp.fd, (struct sockaddr *)&sa, &len)) {
+		xasprintf(&localhost, "127.0.0.1 port %s", myport);
 	} else {
 		if(sa.sa.sa_family == AF_INET) {
 			if(sa.in.sin_addr.s_addr == 0)