Fix nodes joining the VPN after tincctl top started.

diff --git a/src/list.c b/src/list.c
index 9d4920b70a075c0b257c622aeb24f87b277791ff..9b67791120c3746decab18d0d620aaacc954fd05 100644 (file)
--- a/src/list.c
+++ b/src/list.c
@@ -111,6 +111,26 @@ list_node_t *list_insert_after(list_t *list, list_node_t *after, void *data) {
        return node;
 }
 
+list_node_t *list_insert_before(list_t *list, list_node_t *before, void *data) {
+       list_node_t *node;
+
+       node = list_alloc_node();
+
+       node->data = data;
+       node->next = before;
+       node->prev = before->prev;
+       before->prev = node;
+
+       if(node->prev)
+               node->prev->next = node;
+       else
+               list->head = node;
+
+       list->count++;
+
+       return node;
+}
+
 void list_unlink_node(list_t *list, list_node_t *node) {
        if(node->prev)
                node->prev->next = node->next;

diff --git a/src/list.h b/src/list.h
index a45803995bdce3e6fe3f5a273a0015aa16b2834e..4fe48dbeb465fc10ca0c65ad1982f7f0dfaff002 100644 (file)
--- a/src/list.h
+++ b/src/list.h
@@ -55,6 +55,7 @@ extern void list_free_node(list_t *, list_node_t *);
 extern list_node_t *list_insert_head(list_t *, void *);
 extern list_node_t *list_insert_tail(list_t *, void *);
 extern list_node_t *list_insert_after(list_t *, list_node_t *, void *);
+extern list_node_t *list_insert_before(list_t *, list_node_t *, void *);
 
 extern void list_unlink_node(list_t *, list_node_t *);
 extern void list_delete_node(list_t *, list_node_t *);

diff --git a/src/top.c b/src/top.c
index 62c46f5ddcdd556b1a894e9b901734ca4d5247fb..dc1fecf30d9eb7521fbe9ff5398c6b7362443063 100644 (file)
--- a/src/top.c
+++ b/src/top.c
@@ -108,7 +108,9 @@ static void update(int fd) {
                        } else {
                                found = xmalloc_and_zero(sizeof *found);
                                found->name = xstrdup(name);
-                               list_insert_after(&node_list, i, found);
+                               fprintf(stderr, "Inserting %s before %s\n", found->name, node->name);
+                               list_insert_before(&node_list, i, found);
+                               changed = true;
                                break;
                        }
                }
@@ -117,6 +119,7 @@ static void update(int fd) {
                        found = xmalloc_and_zero(sizeof *found);
                        found->name = xstrdup(name);
                        list_insert_tail(&node_list, found);
+                       changed = true;
                }
 
                found->known = true;