#include "protocol.h"
#include "xalloc.h"
+#include <assert.h>
static const int min(int a, int b) {
return a < b ? a : b;
timeout_set(&mesh->loop, data, &(struct timeval){mesh->pingtimeout, rand() % 100000});
}
-// devclass asc, last_connect_try desc
-static int node_compare_devclass_asc_last_connect_try_desc(const void *a, const void *b)
+// devclass asc, last_successfull_connection desc
+static int node_compare_devclass_asc_lsc_desc(const void *a, const void *b)
{
const node_t *na = a, *nb = b;
if(na->devclass > nb->devclass)
{ return 1; }
- if(na->last_connect_try == nb->last_connect_try)
+ if(na->last_successfull_connection == nb->last_successfull_connection)
return 0;
- if(nb->last_connect_try == 0 || na->last_connect_try < nb->last_connect_try)
+ if(na->last_successfull_connection == 0 || na->last_successfull_connection > nb->last_successfull_connection)
return -1;
- if(na->last_connect_try == 0 || na->last_connect_try > nb->last_connect_try)
+ if(nb->last_successfull_connection == 0 || na->last_successfull_connection < nb->last_successfull_connection)
+ return 1;
+
+ if(na < nb)
+ return -1;
+
+ if(na > nb)
return 1;
return 0;
}
-// last_connect_try desc
-static int node_compare_last_connect_try_desc(const void *a, const void *b)
+// last_successfull_connection desc
+static int node_compare_lsc_desc(const void *a, const void *b)
{
const node_t *na = a, *nb = b;
- if(na->last_connect_try == nb->last_connect_try)
+ if(na->last_successfull_connection == nb->last_successfull_connection)
return 0;
- if(nb->last_connect_try == 0 || na->last_connect_try < nb->last_connect_try)
+ if(na->last_successfull_connection == 0 || na->last_successfull_connection > nb->last_successfull_connection)
return -1;
- if(na->last_connect_try == 0 || na->last_connect_try > nb->last_connect_try)
+ if(nb->last_successfull_connection == 0 || na->last_successfull_connection < nb->last_successfull_connection)
+ return 1;
+
+ if(na < nb)
+ return -1;
+
+ 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
+
+ // find the best one for initial connect
+
+ if cur < min
+ newcon =
+ first from nodes
+ where dclass <= my.dclass and !connection and (timestamp - last_retry) > retry_timeout
+ order by dclass asc, last_connection desc
+ if newcon
+ timeout = 0
+ goto connect
+
+
+ // find better nodes to connect to: in case we have less than min connections within [BACKBONE, i] and there are nodes which we are not connected to within the range
+
+ if min <= cur < max
+ j = 0
+ for i = BACKBONE to my.dclass
+ j += count(from connections where node.dclass = i)
+ if j < min
+ newcon =
+ first from nodes
+ where dclass = i and !connection and (timestamp - last_retry) > retry_timeout
+ order by last_connection desc
+ if newcon
+ goto connect
+ else
+ break
+
+
+ // heal partitions
+
+ if min <= cur < max
+ newcon =
+ first from nodes
+ where dclass <= my.dclass and !reachable and (timestamp - last_retry) > retry_timeout
+ order by dclass asc, last_connection desc
+ if newcon
+ goto connect
+
+
+ // connect
+
+connect:
+ if newcon
+ connect newcon
+
+
+ // disconnect outgoing connections in case we have more than min connections within [BACKBONE, i] and there are nodes which we are connected to within the range [i, PORTABLE]
+
+ if min < cur <= max
+ j = 0
+ for i = BACKBONE to my.dclass
+ j += count(from connections where node.dclass = i)
+ if min < j
+ delcon =
+ first from nodes
+ where dclass >= i and outgoing_connection
+ order by dclass desc
+ if disconnect
+ goto disconnect
+ else
+ break
+
+
+ // disconnect connections in case we have more than enough connections
+
+ if max < cur
+ delcon =
+ first from nodes
+ where outgoing_connection
+ order by dclass desc
+ goto disconnect
+
+ // disconnect
+
+disconnect
+ if delcon
+ disconnect delcon
+
+
+ // next iteration
+ next (timeout, autoconnect)
+
+}
+
+*/
+
+
static void periodic_handler(event_loop_t *loop, void *data) {
meshlink_handle_t *mesh = loop->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
+ assert(mesh->devclass >= 0 && mesh->devclass <= _DEV_CLASS_MAX);
+
int min_connects = dev_class_traits[mesh->devclass].min_connects;
int max_connects = dev_class_traits[mesh->devclass].max_connects;
if(cur_connects < min_connects)
{
- splay_tree_t *nodes = splay_alloc_tree(node_compare_devclass_asc_last_connect_try_desc, NULL);
+ splay_tree_t *nodes = splay_alloc_tree(node_compare_devclass_asc_lsc_desc, NULL);
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); }
}
{
logger(mesh, MESHLINK_INFO, "* found best one for initial connect");
- timeout = 0;
+ //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;
if( connects < min_connects )
{
- splay_tree_t *nodes = splay_alloc_tree(node_compare_last_connect_try_desc, NULL);
+ splay_tree_t *nodes = splay_alloc_tree(node_compare_lsc_desc, NULL);
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);
+ splay_tree_t *nodes = splay_alloc_tree(node_compare_devclass_asc_lsc_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)
{
- logger(mesh, MESHLINK_INFO, "Autoconnecting to %s", connect_to->name);
- outgoing_t *outgoing = xzalloc(sizeof(outgoing_t));
- outgoing->mesh = mesh;
- outgoing->name = xstrdup(connect_to->name);
- list_insert_tail(mesh->outgoings, outgoing);
- setup_outgoing_connection(mesh, outgoing);
- }
-
-
- // disconnect suboptimal outgoing connections
-
- if(min_connects < cur_connects <= max_connects)
- {
- unsigned int connects = 0;
+ connect_to->last_connect_try = time(NULL);
- for(int devclass = 0; devclass <= mesh->devclass; ++devclass)
+ /* check if there is already a connection attempt to this node */
+ bool found = false;
+ for list_each(outgoing_t, outgoing, mesh->outgoings)
{
- for list_each(connection_t, c, mesh->connections)
- {
- if(!c->status.remove_unused && c->node && c->node->devclass == devclass)
- { connects += 1; }
- }
-
- if( min_connects < connects )
+ if(!strcmp(outgoing->name, connect_to->name))
{
- splay_tree_t *nodes = splay_alloc_tree(node_compare_devclass_desc, NULL);
-
- for list_each(connection_t, c, mesh->connections)
- {
- if(!c->status.remove_unused && c->outgoing && c->node && c->node->devclass >= devclass)
- { splay_insert(nodes, c->node); }
- }
-
- if(nodes->head)
- {
- logger(mesh, MESHLINK_INFO, "* disconnect suboptimal outgoing connection");
- disconnect_from = (node_t*)nodes->head->data;
- }
-
- splay_free_tree(nodes);
+ found = true;
break;
}
}
- }
-
-
- // disconnect connections (too many connections)
-
- if(!disconnect_from && max_connects < cur_connects)
- {
- splay_tree_t *nodes = splay_alloc_tree(node_compare_devclass_desc, NULL);
-
- for list_each(connection_t, c, mesh->connections)
- {
- if(!c->status.remove_unused && c->node)
- { splay_insert(nodes, c->node); }
- }
- if(nodes->head)
+ if(!found)
{
- logger(mesh, MESHLINK_INFO, "* disconnect connection (too many connections");
-
- timeout = 0;
- disconnect_from = (node_t*)nodes->head->data;
+ logger(mesh, MESHLINK_INFO, "Autoconnecting to %s", connect_to->name);
+ outgoing_t *outgoing = xzalloc(sizeof(outgoing_t));
+ outgoing->mesh = mesh;
+ outgoing->name = xstrdup(connect_to->name);
+ list_insert_tail(mesh->outgoings, outgoing);
+ setup_outgoing_connection(mesh, outgoing);
}
-
- splay_free_tree(nodes);
+ else
+ { logger(mesh, MESHLINK_INFO, "* skip autoconnect since it is an outgoing connection already"); }
}
- // perform disconnect
-
- if(disconnect_from && disconnect_from->connection)
- {
- logger(mesh, MESHLINK_INFO, "Autodisconnecting from %s", disconnect_from->connection->name);
- list_delete(mesh->outgoings, disconnect_from->connection->outgoing);
- disconnect_from->connection->outgoing = NULL;
- terminate_connection(mesh, disconnect_from->connection, disconnect_from->connection->status.active);
- }
// done!
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;
}
projects / meshlink / blobdiff