- Check if we need to retry making an outgoing connection
*/
void terminate_connection(meshlink_handle_t *mesh, connection_t *c, bool report) {
- logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Closing connection with %s (%s)", c->name, c->hostname);
+ logger(mesh, MESHLINK_INFO, "Closing connection with %s (%s)", c->name, c->hostname);
c->status.active = false;
*/
static void timeout_handler(event_loop_t *loop, void *data) {
meshlink_handle_t *mesh = loop->data;
+ logger(mesh, MESHLINK_DEBUG, "timeout_handler()");
for list_each(connection_t, c, mesh->connections) {
+ // Also make sure that if outstanding key requests for the UDP counterpart of a connection has timed out, we restart it.
+ if(c->node) {
+ if(c->node->status.waitingforkey && c->node->last_req_key + mesh->pingtimeout <= mesh->loop.now.tv_sec)
+ send_req_key(mesh, c->node);
+ }
if(c->last_ping_time + mesh->pingtimeout <= mesh->loop.now.tv_sec) {
if(c->status.active) {
if(c->status.pinged) {
- logger(DEBUG_CONNECTIONS, LOG_INFO, "%s (%s) didn't respond to PING in %ld seconds", c->name, c->hostname, (long)mesh->loop.now.tv_sec - c->last_ping_time);
+ logger(mesh, MESHLINK_INFO, "%s (%s) didn't respond to PING in %ld seconds", c->name, c->hostname, (long)mesh->loop.now.tv_sec - c->last_ping_time);
} else if(c->last_ping_time + mesh->pinginterval <= mesh->loop.now.tv_sec) {
send_ping(mesh, c);
continue;
}
} else {
if(c->status.connecting)
- logger(DEBUG_CONNECTIONS, LOG_WARNING, "Timeout while connecting to %s (%s)", c->name, c->hostname);
+ logger(mesh, MESHLINK_WARNING, "Timeout while connecting to %s (%s)", c->name, c->hostname);
else
- logger(DEBUG_CONNECTIONS, LOG_WARNING, "Timeout from %s (%s) during authentication", c->name, c->hostname);
+ logger(mesh, MESHLINK_WARNING, "Timeout from %s (%s) during authentication", c->name, c->hostname);
}
terminate_connection(mesh, c, c->status.active);
}
if(!found) {
//TODO: if the node is blacklisted the connection will not happen, but
//the user will read this debug message "Autoconnecting to %s" that is misleading
- logger(DEBUG_CONNECTIONS, LOG_INFO, "Autoconnecting to %s", n->name);
+ logger(mesh, MESHLINK_INFO, "Autoconnecting to %s", n->name);
outgoing_t *outgoing = xzalloc(sizeof *outgoing);
outgoing->mesh = mesh;
outgoing->name = xstrdup(n->name);
*/
if(mesh->contradicting_del_edge > 100 && mesh->contradicting_add_edge > 100) {
- logger(DEBUG_ALWAYS, LOG_WARNING, "Possible node with same Name as us! Sleeping %d seconds.", mesh->sleeptime);
+ logger(mesh, MESHLINK_WARNING, "Possible node with same Name as us! Sleeping %d seconds.", mesh->sleeptime);
usleep(mesh->sleeptime * 1000000LL);
mesh->sleeptime *= 2;
if(mesh->sleeptime < 0)
int timeout = 5;
- /* If AutoConnect is set, check if we need to make or break connections. */
+ /* Check if we need to make or break connections. */
+
+ if(mesh->nodes->count > 1) {
+
+ splay_tree_t* ccounts = splay_alloc_tree(dclass_ccount_compare, NULL);
- if(autoconnect && mesh->nodes->count > 1) {
- /* Count number of active connections */
- int nc = 0;
+ /* Count number of active connections per device class */
+ int num_total = 0;
for list_each(connection_t, c, mesh->connections) {
if(c->status.active)
- nc++;
+ {
+ dclass_ccount_t key;
+ key.dclass = c->node->dclass;
+
+ dclass_ccount_t* ccount = splay_search(ccounts, &key);
+
+ if(!ccount)
+ {
+ ccount = dclass_ccount_alloc();
+ ccount->dclass = c->node->dclass;
+ splay_insert(ccounts, ccount);
+ }
+
+ ccount->ccount++;
+ num_total++;
+ }
}
/* Count number of unreachable nodes */
num_unreachable++;
}
- if(nc < autoconnect) {
+ bool satisfied = dclass_ccounts_satisfied(mesh->self->dclass, ccounts, num_total);
+
+ if(!satisfied) {
/* Not enough active connections, try to add one.
Choose a random node, if we don't have a connection to it,
and we are not already trying to make one, create an
outgoing connection to this node.
*/
cond_add_connection(mesh, mesh->nodes->count, &found_random_node);
- } else if(num_unreachable > 0) {
+ }
+
+ if(satisfied && num_unreachable > 0) {
/* Min number of connections established. Now try
to connect to some unreachable nodes to attempt
to heal possible partitions.
cond_add_connection(mesh, num_unreachable, &found_random_unreachable_node);
}
- if(nc > autoconnect) {
+ if(max_ccount_from_dclass(mesh->self->dclass) > num_total) {
/* Too many active connections, try to remove one.
Choose a random outgoing connection to a node
that has at least one other connection.
*/
- int r = rand() % nc;
+ int r = rand() % num_total;
int i = 0;
for list_each(connection_t, c, mesh->connections) {
if(!c->outgoing || !c->node || c->node->edge_tree->count < 2)
break;
- logger(DEBUG_CONNECTIONS, LOG_INFO, "Autodisconnecting from %s", c->name);
+ logger(mesh, MESHLINK_INFO, "Autodisconnecting from %s", c->name);
list_delete(mesh->outgoings, c->outgoing);
c->outgoing = NULL;
terminate_connection(mesh, c, c->status.active);
}
}
- if(nc >= autoconnect) {
+ if(satisfied) {
/* If we have enough active connections,
remove any pending outgoing connections.
Do not remove pending connections to unreachable
}
}
if(!found) {
- logger(DEBUG_CONNECTIONS, LOG_INFO, "Cancelled outgoing connection to %s", o->name);
+ logger(mesh, MESHLINK_INFO, "Cancelled outgoing connection to %s", o->name);
/* The node variable is leaked in from using the list_each macro.
The o variable could be used, but using node directly
is more efficient.
}
}
- if (nc + mesh->outgoings->count < min(autoconnect, mesh->nodes->count - 1))
+ if (!satisfied && (num_total + mesh->outgoings->count) < mesh->nodes->count)
timeout = 0;
+
+ splay_free_tree(ccounts);
}
timeout_set(&mesh->loop, data, &(struct timeval){timeout, rand() % 100000});
signal_add(&(mesh->loop),&(mesh->datafromapp), (signal_cb_t)meshlink_send_from_queue,mesh, mesh->datafromapp.signum);
if(!event_loop_run(&mesh->loop)) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Error while waiting for input: %s", strerror(errno));
+ logger(mesh, MESHLINK_ERROR, "Error while waiting for input: %s", strerror(errno));
return 1;
}
projects / meshlink / blobdiff