Releasing 1.1pre5.

[tinc] / src / control.c

diff --git a/src/control.c b/src/control.c
index 46300ed..539ff36 100644 (file)
--- 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,15 +98,12 @@ bool control_h(connection_t *c, const char *request) {
 
                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;
+                       for list_each(connection_t, other, connection_list) {
                                if(strcmp(other->name, name))
                                        continue;
                                terminate_connection(other, other->status.active);
@@ -160,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) {