j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Replace the connection_tree with a connection_list.

Browse source 
The tree functions were never used on the connection_tree, a list is more appropriate.
Also be more paranoid about connections disappearing while traversing the list.
This commit is contained in:
Guus Sliepen 2012-10-07 21:59:53 +02:00
parent ce059e36fd
commit ff306f0cda
15 changed files with 77 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/net_socket.c
View file

@ -22,7 +22,6 @@
#include "system.h"
#include "splay_tree.h"
#include "conf.h"
#include "connection.h"
#include "logger.h"
@ -627,9 +626,9 @@ void try_outgoing_connections(void) {
/* Terminate any connections whose outgoing_t is to be deleted. */
for(splay_node_t *n = connection_tree->head, *next; n; n = next) {
next = n->next;
connection_t *c = n->data;
for(list_node_t *node = connection_list->head, *next; node; node = next) {
next = node->next;
connection_t *c = node->data;
if(c->outgoing && c->outgoing->timeout == -1) {
c->outgoing = NULL;
logger(DEBUG_CONNECTIONS, LOG_INFO, "No more outgoing connection to %s", c->name);
@ -639,10 +638,10 @@ void try_outgoing_connections(void) {
/* Delete outgoing_ts for which there is no ConnectTo. */
for(list_node_t *i = outgoing_list->head, *next; i; i = next) {
next = i->next;
outgoing = i->data;
for(list_node_t *node = outgoing_list->head, *next; node; node = next) {
next = node->next;
outgoing = node->data;
if(outgoing->timeout == -1)
list_delete_node(outgoing_list, i);
list_delete_node(outgoing_list, node);
}
}