Replace the connection_tree with a connection_list.

[tinc] / src / control.c

diff --git a/src/control.c b/src/control.c
index 2207815..46300ed 100644 (file)
--- a/src/control.c
+++ b/src/control.c
@@ -1,6 +1,6 @@
 /*
     control.c -- Control socket handling.
-    Copyright (C) 2007 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2012 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
@@ -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);
@@ -42,16 +44,16 @@ static bool control_ok(connection_t *c, int type) {
        return control_return(c, type, 0);
 }
 
-bool control_h(connection_t *c, char *request) {
+bool control_h(connection_t *c, const char *request) {
        int type;
 
        if(!c->status.control || c->allow_request != CONTROL) {
-               logger(LOG_ERR, "Unauthorized control request from %s (%s)", c->name, c->hostname);
+               logger(DEBUG_ALWAYS, LOG_ERR, "Unauthorized control request from %s (%s)", c->name, c->hostname);
                return false;
        }
 
        if(sscanf(request, "%*d %d", &type) != 1) {
-               logger(LOG_ERR, "Got bad %s from %s (%s)", "CONTROL", c->name, c->hostname);
+               logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "CONTROL", c->name, c->hostname);
                return false;
        }
 
@@ -91,38 +93,96 @@ bool control_h(connection_t *c, char *request) {
                        return control_ok(c, REQ_RETRY);
 
                case REQ_RELOAD:
-                       logger(LOG_NOTICE, "Got '%s' command", "reload");
+                       logger(DEBUG_ALWAYS, LOG_NOTICE, "Got '%s' command", "reload");
                        int result = reload_configuration();
                        return control_return(c, REQ_RELOAD, result);
 
+               case REQ_DISCONNECT: {
+                       char name[MAX_STRING_SIZE];
+                       connection_t *other;
+                       bool found = false;
+
+                       if(sscanf(request, "%*d %*d " MAX_STRING, name) != 1)
+                               return control_return(c, REQ_DISCONNECT, -1);
+
+                       for(list_node_t *node = connection_list->head, *next; 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:
+                       sscanf(request, "%*d %*d %d", &c->outmaclength);
+                       c->status.pcap = true;
+                       pcap = true;
+                       return true;
+
+               case REQ_LOG:
+                       sscanf(request, "%*d %*d %d", &c->outcompression);
+                       c->status.log = true;
+                       logcontrol = 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(DEBUG_ALWAYS, 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;
+
+       // 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);
+       } else {
+               if(sa.sa.sa_family == AF_INET) {
+                       if(sa.in.sin_addr.s_addr == 0)
+                               sa.in.sin_addr.s_addr = htonl(0x7f000001);
+               } else if(sa.sa.sa_family == AF_INET6) {
+                       static const uint8_t zero[16] = {0};
+                       if(!memcmp(sa.in6.sin6_addr.s6_addr, zero, sizeof zero))
+                               sa.in6.sin6_addr.s6_addr[15] = 1;
+               }
+
+               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);
 }