X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fcontrol.c;h=83a9d79cb054bd03e6081129b7b55891f05973d9;hb=6bc5d626a8726fc23365ee705761a3c666a08ad4;hp=d22d5b0e244387240c5be5630ad4c5539a639012;hpb=0b8b23e0dd7219344543f135ca0aeba8a4a42d48;p=tinc

diff --git a/src/control.c b/src/control.c
index d22d5b0e..83a9d79c 100644
--- a/src/control.c
+++ b/src/control.c
@@ -29,7 +29,6 @@
 #include "netutl.h"
 #include "protocol.h"
 #include "route.h"
-#include "splay_tree.h"
 #include "utils.h"
 #include "xalloc.h"
 
@@ -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);
 
@@ -157,7 +156,7 @@ 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)) {
+	if(getsockname(listen_socket[0].tcp.fd, (struct sockaddr *)&sa, &len)) {
 		xasprintf(&localhost, "127.0.0.1 port %d", myport);
 	} else {
 		if(sa.sa.sa_family == AF_INET) {