/* Select a random node we haven't connected to yet. */
int count = 0;
- for splay_each(node_t, n, node_tree) {
+ for splay_each(node_t, n, &node_tree) {
if(n == myself || n->connection || !(n->status.has_address || n->status.reachable)) {
continue;
}
int r = rand() % count;
- for splay_each(node_t, n, node_tree) {
+ for splay_each(node_t, n, &node_tree) {
if(n == myself || n->connection || !(n->status.has_address || n->status.reachable)) {
continue;
}
bool found = false;
- for list_each(outgoing_t, outgoing, outgoing_list) {
+ for list_each(outgoing_t, outgoing, &outgoing_list) {
if(outgoing->node == n) {
found = true;
break;
logger(DEBUG_CONNECTIONS, LOG_INFO, "Autoconnecting to %s", n->name);
outgoing_t *outgoing = xzalloc(sizeof(*outgoing));
outgoing->node = n;
- list_insert_tail(outgoing_list, outgoing);
+ list_insert_tail(&outgoing_list, outgoing);
setup_outgoing_connection(outgoing, false);
}
* are only a few reachable nodes, and many unreachable ones, we're
* going to try harder to connect to them. */
- int r = rand() % node_tree->count;
+ unsigned int r = rand() % node_tree.count;
- for splay_each(node_t, n, node_tree) {
+ for splay_each(node_t, n, &node_tree) {
if(r--) {
continue;
}
}
/* Are we already trying to make an outgoing connection to it? If so, return. */
- for list_each(outgoing_t, outgoing, outgoing_list) {
+ for list_each(outgoing_t, outgoing, &outgoing_list) {
if(outgoing->node == n) {
return;
}
logger(DEBUG_CONNECTIONS, LOG_INFO, "Autoconnecting to %s", n->name);
outgoing_t *outgoing = xzalloc(sizeof(*outgoing));
outgoing->node = n;
- list_insert_tail(outgoing_list, outgoing);
+ list_insert_tail(&outgoing_list, outgoing);
setup_outgoing_connection(outgoing, false);
return;
/* Choose a random outgoing connection to a node that has at least one other connection. */
int count = 0;
- for list_each(connection_t, c, connection_list) {
- if(!c->edge || !c->outgoing || !c->node || c->node->edge_tree->count < 2) {
+ for list_each(connection_t, c, &connection_list) {
+ if(!c->edge || !c->outgoing || !c->node || c->node->edge_tree.count < 2) {
continue;
}
int r = rand() % count;
- for list_each(connection_t, c, connection_list) {
- if(!c->edge || !c->outgoing || !c->node || c->node->edge_tree->count < 2) {
+ for list_each(connection_t, c, &connection_list) {
+ if(!c->edge || !c->outgoing || !c->node || c->node->edge_tree.count < 2) {
continue;
}
}
logger(DEBUG_CONNECTIONS, LOG_INFO, "Autodisconnecting from %s", c->name);
- list_delete(outgoing_list, c->outgoing);
+ list_delete(&outgoing_list, c->outgoing);
c->outgoing = NULL;
terminate_connection(c, c->edge);
break;
}
static void drop_superfluous_pending_connections() {
- for list_each(outgoing_t, o, outgoing_list) {
+ for list_each(outgoing_t, o, &outgoing_list) {
/* Only look for connections that are waiting to be retried later. */
bool found = false;
- for list_each(connection_t, c, connection_list) {
+ for list_each(connection_t, c, &connection_list) {
if(c->outgoing == o) {
found = true;
break;
}
logger(DEBUG_CONNECTIONS, LOG_INFO, "Cancelled outgoing connection to %s", o->node->name);
- list_delete_node(outgoing_list, node);
+ list_delete_node(&outgoing_list, node);
}
}
/* Count number of active connections. */
int nc = 0;
- for list_each(connection_t, c, connection_list) {
+ for list_each(connection_t, c, &connection_list) {
if(c->edge) {
nc++;
}
drop_superfluous_outgoing_connection();
}
+ /* Drop pending outgoing connections from the outgoing list. */
+ drop_superfluous_pending_connections();
/* Check if there are unreachable nodes that we should try to connect to. */
connect_to_unreachable();
-
- /* Drop pending outgoing connections from the outgoing list. */
- drop_superfluous_pending_connections();
}