X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fcontrol.c;h=539ff3605993c3c3bb80033e5140e2f53b6320de;hb=cc3c69c892b0dad9a6ece0a0f4ccd429a22fcbff;hp=c166943ba59a607aa0ba8a85198ef68303167bc6;hpb=d917c8cb6b69475d568ccbe82389b9f2b3eb5e80;p=meshlink

diff --git a/src/control.c b/src/control.c
index c166943b..539ff360 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,6 +25,7 @@
 #include "graph.h"
 #include "logger.h"
 #include "meta.h"
+#include "names.h"
 #include "net.h"
 #include "netutl.h"
 #include "protocol.h"
@@ -33,7 +34,6 @@
 #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);
@@ -58,7 +58,7 @@ 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:
@@ -156,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) {