if(na->last_connect_try == nb->last_connect_try)
return 0;
+ if(na->last_connect_try == 0 || na->last_connect_try > nb->last_connect_try)
+ return -1;
+
if(nb->last_connect_try == 0 || na->last_connect_try < nb->last_connect_try)
+ return 1;
+
+ if(na < nb)
return -1;
- if(na->last_connect_try == 0 || na->last_connect_try > nb->last_connect_try)
+ if(na > nb)
return 1;
return 0;
if(na->last_connect_try == nb->last_connect_try)
return 0;
+ if(na->last_connect_try == 0 || na->last_connect_try > nb->last_connect_try)
+ return -1;
+
if(nb->last_connect_try == 0 || na->last_connect_try < nb->last_connect_try)
+ return 1;
+
+ if(na < nb)
return -1;
- if(na->last_connect_try == 0 || na->last_connect_try > nb->last_connect_try)
+ if(na > nb)
return 1;
return 0;
if(na->devclass > nb->devclass)
{ return 1; }
+ if(na < nb)
+ return -1;
+
+ if(na > nb)
+ return 1;
+
return 0;
}
/*
-
autoconnect()
{
timeout = 5
}
-
- */
+*/
static void periodic_handler(event_loop_t *loop, void *data) {
logger(mesh, MESHLINK_INFO, "--- autoconnect begin ---");
-
int retry_timeout = min(mesh->nodes->count * 5, 60);
+ logger(mesh, MESHLINK_INFO, "* devclass = %d", mesh->devclass);
+ logger(mesh, MESHLINK_INFO, "* nodes = %d", mesh->nodes->count);
+ logger(mesh, MESHLINK_INFO, "* retry_timeout = %d", retry_timeout);
+
+
// connect disconnect nodes
node_t* connect_to = NULL;
}
logger(mesh, MESHLINK_INFO, "* cur_connects = %d", cur_connects);
-
+ logger(mesh, MESHLINK_INFO, "* outgoings = %d", mesh->outgoings->count);
// get min_connects and max_connects
for splay_each(node_t, n, mesh->nodes)
{
- if(n->devclass <= mesh->devclass && !n->connection && (n->last_connect_try == 0 || (time(NULL) - n->last_connect_try) > retry_timeout))
+ logger(mesh, MESHLINK_INFO, "* n->devclass = %d", n->devclass);
+ if(n != mesh->self && n->devclass <= mesh->devclass && !n->connection && (n->last_connect_try == 0 || (time(NULL) - n->last_connect_try) > retry_timeout))
{ splay_insert(nodes, n); }
}
//timeout = 0;
connect_to = (node_t*)nodes->head->data;
}
+ else
+ { logger(mesh, MESHLINK_INFO, "* could not find node for initial connect"); }
splay_free_tree(nodes);
}
// find better nodes to connect to
- if(!connect_to && min_connects <= cur_connects < max_connects)
+ if(!connect_to && min_connects <= cur_connects && cur_connects < max_connects)
{
unsigned int connects = 0;
for splay_each(node_t, n, mesh->nodes)
{
- if(n->devclass == devclass && !n->connection && (n->last_connect_try == 0 || (time(NULL) - n->last_connect_try) > retry_timeout))
+ if(n != mesh->self && n->devclass == devclass && !n->connection && (n->last_connect_try == 0 || (time(NULL) - n->last_connect_try) > retry_timeout))
{ splay_insert(nodes, n); }
}
else
{ break; }
}
+
+ if(!connect_to)
+ { logger(mesh, MESHLINK_INFO, "* could not find better nodes"); }
}
// heal partitions
- if(!connect_to && min_connects <= cur_connects < max_connects)
+ if(!connect_to && min_connects <= cur_connects && cur_connects < max_connects)
{
splay_tree_t *nodes = splay_alloc_tree(node_compare_devclass_asc_last_connect_try_desc, NULL);
for splay_each(node_t, n, mesh->nodes)
{
- if(n->devclass <= mesh->devclass && !n->status.reachable && (n->last_connect_try == 0 || (time(NULL) - n->last_connect_try) > retry_timeout))
+ if(n != mesh->self && n->devclass <= mesh->devclass && !n->status.reachable && (n->last_connect_try == 0 || (time(NULL) - n->last_connect_try) > retry_timeout))
{ splay_insert(nodes, n); }
}
logger(mesh, MESHLINK_INFO, "* try to heal partition");
connect_to = (node_t*)nodes->head->data;
}
+ else
+ { logger(mesh, MESHLINK_INFO, "* could not find nodes for partition healing"); }
splay_free_tree(nodes);
}
if(connect_to && !connect_to->connection)
{
+ connect_to->last_connect_try = time(NULL);
+
/* check if there is already a connection attempt to this node */
bool found = false;
- for list_each(outgoing_t, outgoing, mesh->outgoings) {
- if(!strcmp(outgoing->name, connect_to->name)) {
+ for list_each(outgoing_t, outgoing, mesh->outgoings)
+ {
+ if(!strcmp(outgoing->name, connect_to->name))
+ {
found = true;
break;
}
list_insert_tail(mesh->outgoings, outgoing);
setup_outgoing_connection(mesh, outgoing);
}
+ else
+ { logger(mesh, MESHLINK_INFO, "* skip autoconnect since it is an outgoing connection already"); }
}
// disconnect suboptimal outgoing connections
- if(min_connects < cur_connects <= max_connects)
+ if(min_connects < cur_connects && cur_connects <= max_connects)
{
unsigned int connects = 0;
break;
}
}
+
+ if(!disconnect_from)
+ { logger(mesh, MESHLINK_INFO, "* no suboptimal outgoing connections"); }
}
if(nodes->head)
{
- logger(mesh, MESHLINK_INFO, "* disconnect connection (too many connections");
+ logger(mesh, MESHLINK_INFO, "* disconnect connection (too many connections)");
//timeout = 0;
disconnect_from = (node_t*)nodes->head->data;
}
+ else
+ { logger(mesh, MESHLINK_INFO, "* no node we want to disconnect, even though we have too many connections"); }
splay_free_tree(nodes);
}
mesh->datafromapp.signum = 0;
signal_add(&(mesh->loop),&(mesh->datafromapp), (signal_cb_t)meshlink_send_from_queue,mesh, mesh->datafromapp.signum);
- if(!event_loop_run(&mesh->loop)) {
+ if(!event_loop_run(&(mesh->loop), &(mesh->mesh_mutex))) {
logger(mesh, MESHLINK_ERROR, "Error while waiting for input: %s", strerror(errno));
return 1;
}