C99 extravaganza.

[tinc] / src / control.c

diff --git a/src/control.c b/src/control.c
index d074ebb..d22d5b0 100644 (file)
--- a/src/control.c
+++ b/src/control.c
@@ -44,7 +44,7 @@ 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) {
@@ -99,16 +99,12 @@ bool control_h(connection_t *c, char *request) {
 
                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;
+                       for list_each(connection_t, other, connection_list) {
                                if(strcmp(other->name, name))
                                        continue;
                                terminate_connection(other, other->status.active);