X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fcontrol.c;h=7f46a7093dd0e16ede03e247b6189c6e81c39898;hb=fec279a9c54ec8a13bd1ba4c7bec0d2a15454992;hp=220781518848adbcea16cd1b789e4a1abb661788;hpb=edebf579f2ea29e6e84360cb13731f5858a1555b;p=tinc

diff --git a/src/control.c b/src/control.c
index 22078151..7f46a709 100644
--- a/src/control.c
+++ b/src/control.c
@@ -24,15 +24,17 @@
 #include "control_common.h"
 #include "graph.h"
 #include "logger.h"
+#include "meta.h"
+#include "net.h"
+#include "netutl.h"
 #include "protocol.h"
+#include "route.h"
+#include "splay_tree.h"
 #include "utils.h"
 #include "xalloc.h"
 
-static int control_socket = -1;
-static struct event control_event;
-static splay_tree_t *control_socket_tree;
 char controlcookie[65];
-extern char *controlcookiename;
+extern char *pidfilename;
 
 static bool control_return(connection_t *c, int type, int error) {
 	return send_request(c, "%d %d %d", CONTROL, type, error);
@@ -95,34 +97,74 @@ bool control_h(connection_t *c, char *request) {
 			int result = reload_configuration();
 			return control_return(c, REQ_RELOAD, result);
 
+		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;
+				if(strcmp(other->name, name))
+					continue;
+				terminate_connection(other, other->status.active);
+				found = true;
+			}
+
+			return control_return(c, REQ_DISCONNECT, found ? 0 : -2);
+		}
+
+		case REQ_DUMP_TRAFFIC:
+			return dump_traffic(c);
+
+		case REQ_PCAP:
+			c->status.pcap = true;
+			pcap = true;
+			return true;
+
 		default:
 			return send_request(c, "%d %d", CONTROL, REQ_INVALID);
 	}
 }
 
-bool init_control() {
+bool init_control(void) {
 	randomize(controlcookie, sizeof controlcookie / 2);
 	bin2hex(controlcookie, controlcookie, sizeof controlcookie / 2);
-	controlcookie[sizeof controlcookie - 1] = 0;
 
-	FILE *f = fopen(controlcookiename, "w");
+	FILE *f = fopen(pidfilename, "w");
 	if(!f) {
-		logger(LOG_ERR, "Cannot write control socket cookie file %s: %s", controlcookiename, strerror(errno));
+		logger(LOG_ERR, "Cannot write control socket cookie file %s: %s", pidfilename, strerror(errno));
 		return false;
 	}
 
 #ifdef HAVE_FCHMOD
-	fchmod(f, 0600);
+	fchmod(fileno(f), 0600);
 #else
-	chmod(controlcookiename, 0600);
+	chmod(pidfilename, 0600);
 #endif
+	// Get the address and port of the first listening socket
+
+	char *localhost = NULL;
+	sockaddr_t sa;
+	socklen_t len = sizeof sa;
+
+	if(getsockname(listen_socket[0].tcp, (struct sockaddr *)&sa, &len))
+		xasprintf(&localhost, "127.0.0.1 port %d", myport);
+	else
+		localhost = sockaddr2hostname(&sa);
+
+	fprintf(f, "%d %s %s\n", (int)getpid(), controlcookie, localhost);
 
-	fprintf(f, "%s %s %d\n", controlcookie, myport, getpid());
+	free(localhost);
 	fclose(f);
 
 	return true;
 }
 
-void exit_control() {
-	unlink(controlcookiename);
+void exit_control(void) {
+	unlink(pidfilename);
 }