/*
net.c -- most of the network code
- Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+ Copyright (C) 2014-2017 Guus Sliepen <guus@meshlink.io>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include <assert.h>
#if !defined(min)
-static const int min(int a, int b) {
+static inline int min(int a, int b) {
return a < b ? a : b;
}
#endif
- Check if we need to retry making an outgoing connection
*/
void terminate_connection(meshlink_handle_t *mesh, connection_t *c, bool report) {
- logger(mesh, MESHLINK_INFO, "Closing connection with %s (%s)", c->name, c->hostname);
+ logger(mesh, MESHLINK_INFO, "Closing connection with %s", c->name);
c->status.active = false;
- if(c->node && c->node->connection == c)
+ if(c->node && c->node->connection == c) {
c->node->connection = NULL;
+ }
if(c->edge) {
- if(report)
- send_del_edge(mesh, mesh->everyone, c->edge);
+ if(report) {
+ send_del_edge(mesh, mesh->everyone, c->edge, 0);
+ }
edge_del(mesh, c->edge);
c->edge = NULL;
/* If the node is not reachable anymore but we remember it had an edge to us, clean it up */
- if(report && !c->node->status.reachable) {
+ if(report && c->node && !c->node->status.reachable) {
edge_t *e;
e = lookup_edge(c->node, mesh->self);
+
if(e) {
- send_del_edge(mesh, mesh->everyone, e);
+ send_del_edge(mesh, mesh->everyone, e, 0);
edge_del(mesh, e);
}
}
/* Check if this was our outgoing connection */
- if(outgoing)
+ if(outgoing) {
do_outgoing_connection(mesh, outgoing);
+ }
#ifndef HAVE_MINGW
/* Clean up dead proxy processes */
while(waitpid(-1, NULL, WNOHANG) > 0);
+
#endif
}
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)
+ 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(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) {
+ if(c->status.pinged) {
+ logger(mesh, MESHLINK_INFO, "%s didn't respond to PING in %ld seconds", c->name, (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
+ } else {
continue;
+ }
} else {
- if(c->status.connecting)
- logger(mesh, MESHLINK_WARNING, "Timeout while connecting to %s (%s)", c->name, c->hostname);
- else
- logger(mesh, MESHLINK_WARNING, "Timeout from %s (%s) during authentication", c->name, c->hostname);
+ if(c->status.connecting) {
+ logger(mesh, MESHLINK_WARNING, "Timeout while connecting to %s", c->name);
+ } else {
+ logger(mesh, MESHLINK_WARNING, "Timeout from %s during authentication", c->name);
+ }
}
+
terminate_connection(mesh, c, c->status.active);
}
}
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)
+ if(na->devclass < nb->devclass) {
return -1;
+ }
- if(na->devclass > nb->devclass)
+ if(na->devclass > nb->devclass) {
return 1;
+ }
- if(na->last_successfull_connection == nb->last_successfull_connection)
+ if(na->last_successfull_connection == nb->last_successfull_connection) {
return 0;
+ }
- if(na->last_successfull_connection == 0 || na->last_successfull_connection > nb->last_successfull_connection)
+ if(na->last_successfull_connection == 0 || na->last_successfull_connection > nb->last_successfull_connection) {
return -1;
+ }
- if(nb->last_successfull_connection == 0 || na->last_successfull_connection < nb->last_successfull_connection)
+ if(nb->last_successfull_connection == 0 || na->last_successfull_connection < nb->last_successfull_connection) {
return 1;
+ }
- if(na < nb)
+ if(na < nb) {
return -1;
+ }
- if(na > nb)
+ if(na > nb) {
return 1;
+ }
return 0;
}
static int node_compare_lsc_desc(const void *a, const void *b) {
const node_t *na = a, *nb = b;
- if(na->last_successfull_connection == nb->last_successfull_connection)
+ if(na->last_successfull_connection == nb->last_successfull_connection) {
return 0;
+ }
- if(na->last_successfull_connection == 0 || na->last_successfull_connection > nb->last_successfull_connection)
+ if(na->last_successfull_connection == 0 || na->last_successfull_connection > nb->last_successfull_connection) {
return -1;
+ }
- if(nb->last_successfull_connection == 0 || na->last_successfull_connection < nb->last_successfull_connection)
+ if(nb->last_successfull_connection == 0 || na->last_successfull_connection < nb->last_successfull_connection) {
return 1;
+ }
- if(na < nb)
+ if(na < nb) {
return -1;
+ }
- if(na > nb)
+ if(na > nb) {
return 1;
+ }
return 0;
}
static int node_compare_devclass_desc(const void *a, const void *b) {
const node_t *na = a, *nb = b;
- if(na->devclass < nb->devclass)
+ if(na->devclass < nb->devclass) {
return -1;
+ }
- if(na->devclass > nb->devclass)
+ if(na->devclass > nb->devclass) {
return 1;
+ }
- if(na < nb)
+ if(na < nb) {
return -1;
+ }
- if(na > nb)
+ if(na > nb) {
return 1;
+ }
return 0;
}
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)
+
+ if(mesh->sleeptime < 0) {
mesh->sleeptime = 3600;
+ }
} else {
mesh->sleeptime /= 2;
- if(mesh->sleeptime < 10)
+
+ if(mesh->sleeptime < 10) {
mesh->sleeptime = 10;
+ }
}
mesh->contradicting_add_edge = 0;
// get cur_connects
- int cur_connects = 0;
+ unsigned int cur_connects = 0;
for list_each(connection_t, c, mesh->connections) {
- if(c->status.active)
+ if(c->status.active) {
cur_connects += 1;
+ }
}
logger(mesh, MESHLINK_DEBUG, "* cur_connects = %d", cur_connects);
// 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;
+ unsigned int min_connects = dev_class_traits[mesh->devclass].min_connects;
+ unsigned int max_connects = dev_class_traits[mesh->devclass].max_connects;
logger(mesh, MESHLINK_DEBUG, "* min_connects = %d", min_connects);
logger(mesh, MESHLINK_DEBUG, "* max_connects = %d", max_connects);
splay_tree_t *nodes = splay_alloc_tree(node_compare_devclass_asc_lsc_desc, NULL);
for splay_each(node_t, n, mesh->nodes) {
- logger(mesh, MESHLINK_DEBUG, "* 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))
+ logger(mesh, MESHLINK_DEBUG, "* %s->devclass = %d", n->name, n->devclass);
+
+ if(n != mesh->self && n->devclass <= mesh->devclass && !n->connection && !n->status.blacklisted && (n->last_connect_try == 0 || (time(NULL) - n->last_connect_try) > retry_timeout)) {
splay_insert(nodes, n);
+ }
}
if(nodes->head) {
- logger(mesh, MESHLINK_DEBUG, "* found best one for initial connect");
-
//timeout = 0;
connect_to = (node_t *)nodes->head->data;
- } else
+
+ logger(mesh, MESHLINK_DEBUG, "* found best one for initial connect: %s", connect_to->name);
+ } else {
logger(mesh, MESHLINK_DEBUG, "* could not find node for initial connect");
+ }
splay_free_tree(nodes);
}
if(!connect_to && min_connects <= cur_connects && cur_connects < max_connects) {
unsigned int connects = 0;
- for(int devclass = 0; devclass <= mesh->devclass; ++devclass) {
+ for(int32_t devclass = 0; devclass <= mesh->devclass; ++devclass) {
for list_each(connection_t, c, mesh->connections) {
- if(c->status.active && c->node && c->node->devclass == devclass)
+ if(c->status.active && c->node && c->node->devclass == devclass) {
connects += 1;
+ }
}
if(connects < min_connects) {
splay_tree_t *nodes = splay_alloc_tree(node_compare_lsc_desc, NULL);
for splay_each(node_t, n, mesh->nodes) {
- if(n != mesh->self && 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->status.blacklisted && (n->last_connect_try == 0 || (time(NULL) - n->last_connect_try) > retry_timeout)) {
splay_insert(nodes, n);
+ }
}
if(nodes->head) {
}
splay_free_tree(nodes);
- } else
+ } else {
break;
+ }
}
- if(!connect_to)
+ if(!connect_to) {
logger(mesh, MESHLINK_DEBUG, "* could not find better nodes");
+ }
}
splay_tree_t *nodes = splay_alloc_tree(node_compare_devclass_asc_lsc_desc, NULL);
for splay_each(node_t, n, mesh->nodes) {
- if(n != mesh->self && 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->status.blacklisted && (n->last_connect_try == 0 || (time(NULL) - n->last_connect_try) > retry_timeout)) {
splay_insert(nodes, n);
+ }
}
if(nodes->head) {
logger(mesh, MESHLINK_DEBUG, "* try to heal partition");
connect_to = (node_t *)nodes->head->data;
- } else
+ } else {
logger(mesh, MESHLINK_DEBUG, "* could not find nodes for partition healing");
+ }
splay_free_tree(nodes);
}
if(connect_to && !connect_to->connection) {
connect_to->last_connect_try = time(NULL);
+ logger(mesh, MESHLINK_DEBUG, "Autoconnect trying to connect to %s", connect_to->name);
/* check if there is already a connection attempt to this node */
- bool found = false;
+ bool skip = false;
+
for list_each(outgoing_t, outgoing, mesh->outgoings) {
- if(!strcmp(outgoing->name, connect_to->name)) {
- found = true;
+ if(outgoing->node == connect_to) {
+ logger(mesh, MESHLINK_DEBUG, "* skip autoconnect since it is an outgoing connection already");
+ skip = true;
break;
}
}
- if(!found) {
+ if(!connect_to->status.reachable && !node_read_public_key(mesh, connect_to)) {
+ logger(mesh, MESHLINK_DEBUG, "* skip autoconnect since we don't know this node's public key");
+ skip = true;
+ }
+
+ if(!skip) {
logger(mesh, MESHLINK_DEBUG, "Autoconnecting to %s", connect_to->name);
outgoing_t *outgoing = xzalloc(sizeof(outgoing_t));
- outgoing->mesh = mesh;
- outgoing->name = xstrdup(connect_to->name);
+ outgoing->node = connect_to;
list_insert_tail(mesh->outgoings, outgoing);
setup_outgoing_connection(mesh, outgoing);
- } else
- logger(mesh, MESHLINK_DEBUG, "* skip autoconnect since it is an outgoing connection already");
+ }
}
if(min_connects < cur_connects /*&& cur_connects <= max_connects*/) {
unsigned int connects = 0;
- for(int devclass = 0; devclass <= mesh->devclass; ++devclass) {
+ for(int32_t devclass = 0; devclass <= mesh->devclass; ++devclass) {
for list_each(connection_t, c, mesh->connections) {
- if(c->status.active && c->node && c->node->devclass == devclass)
+ if(c->status.active && c->node && c->node->devclass == devclass) {
connects += 1;
+ }
}
if(min_connects < connects) {
splay_tree_t *nodes = splay_alloc_tree(node_compare_devclass_desc, NULL);
for list_each(connection_t, c, mesh->connections) {
- if(c->outgoing && c->node && c->node->devclass >= devclass)
+ if(c->outgoing && c->node && c->node->devclass >= devclass) {
splay_insert(nodes, c->node);
+ }
}
if(nodes->head) {
}
}
- if(!disconnect_from)
+ if(!disconnect_from) {
logger(mesh, MESHLINK_DEBUG, "* no suboptimal outgoing connections");
+ }
}
splay_tree_t *nodes = splay_alloc_tree(node_compare_devclass_desc, NULL);
for list_each(connection_t, c, mesh->connections) {
- if(c->status.active && c->node)
+ if(c->status.active && c->node) {
splay_insert(nodes, c->node);
+ }
}
if(nodes->head) {
//timeout = 0;
disconnect_from = (node_t *)nodes->head->data;
- } else
+ } else {
logger(mesh, MESHLINK_DEBUG, "* no node we want to disconnect, even though we have too many connections");
+ }
splay_free_tree(nodes);
}
logger(mesh, MESHLINK_DEBUG, "--- autoconnect end ---");
}
+ for splay_each(node_t, n, mesh->nodes) {
+ if(n->status.dirty) {
+ node_write_config(mesh, n);
+ n->status.dirty = false;
+ }
+ }
+
timeout_set(&mesh->loop, data, &(struct timeval) {
timeout, rand() % 100000
});
/* Reset the reconnection timers for all outgoing connections */
for list_each(outgoing_t, outgoing, mesh->outgoings) {
outgoing->timeout = 0;
+
if(outgoing->ev.cb)
timeout_set(&mesh->loop, &outgoing->ev, &(struct timeval) {
0, 0
/* Check for outgoing connections that are in progress, and reset their ping timers */
for list_each(connection_t, c, mesh->connections) {
- if(c->outgoing && !c->node)
+ if(c->outgoing && !c->node) {
c->last_ping_time = 0;
+ }
}
/* Kick the ping timeout handler */