#include "protocol.h"
#include "xalloc.h"
-/* Purge edges of unreachable nodes. Use carefully. */
-
-// TODO: remove
-void purge(void) {
- logger(DEBUG_PROTOCOL, LOG_DEBUG, "Purging unreachable nodes");
-
- /* Remove all edges owned by unreachable nodes. */
-
- for splay_each(node_t, n, mesh->nodes) {
- if(!n->status.reachable) {
- logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Purging node %s (%s)", n->name, n->hostname);
-
- for splay_each(edge_t, e, n->edge_tree) {
- send_del_edge(mesh->everyone, e);
- edge_del(e);
- }
- }
- }
-
- /* Check if anyone else claims to have an edge to an unreachable node. If not, delete node. */
-
- for splay_each(node_t, n, mesh->nodes) {
- if(!n->status.reachable) {
- for splay_each(edge_t, e, mesh->edges)
- if(e->to == n)
- return;
- }
- }
-}
-
/*
Terminate a connection:
- Mark it as inactive
- Kill it with fire
- Check if we need to retry making an outgoing connection
*/
-void terminate_connection(connection_t *c, bool report) {
+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);
c->status.active = false;
if(c->edge) {
if(report)
- send_del_edge(mesh->everyone, c->edge);
+ send_del_edge(mesh, mesh->everyone, c->edge);
- edge_del(c->edge);
+ edge_del(mesh, c->edge);
c->edge = NULL;
/* Run MST and SSSP algorithms */
- graph();
+ graph(mesh);
/* If the node is not reachable anymore but we remember it had an edge to us, clean it up */
edge_t *e;
e = lookup_edge(c->node, mesh->self);
if(e) {
- send_del_edge(mesh->everyone, e);
- edge_del(e);
+ send_del_edge(mesh, mesh->everyone, e);
+ edge_del(mesh, e);
}
}
}
outgoing_t *outgoing = c->outgoing;
- connection_del(c);
+ connection_del(mesh, c);
/* Check if this was our outgoing connection */
and close the connection.
*/
static void timeout_handler(event_loop_t *loop, void *data) {
+ meshlink_handle_t *mesh = loop->data;
+
for list_each(connection_t, c, mesh->connections) {
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);
} else if(c->last_ping_time + mesh->pinginterval <= mesh->loop.now.tv_sec) {
- send_ping(c);
+ send_ping(mesh, c);
continue;
} else {
continue;
else
logger(DEBUG_CONNECTIONS, LOG_WARNING, "Timeout from %s (%s) during authentication", c->name, c->hostname);
}
- terminate_connection(c, c->status.active);
+ terminate_connection(mesh, c, c->status.active);
}
}
}
static void periodic_handler(event_loop_t *loop, void *data) {
+ meshlink_handle_t *mesh = loop->data;
+
/* Check if there are too many contradicting ADD_EDGE and DEL_EDGE messages.
This usually only happens when another node has the same Name as this node.
If so, sleep for a short while to prevent a storm of contradicting messages.
}
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);
outgoing_t *outgoing = xzalloc(sizeof *outgoing);
outgoing->name = xstrdup(n->name);
logger(DEBUG_CONNECTIONS, LOG_INFO, "Autodisconnecting from %s", c->name);
list_delete(mesh->outgoings, c->outgoing);
c->outgoing = NULL;
- terminate_connection(c, c->status.active);
+ terminate_connection(mesh, c, c->status.active);
break;
}
}
timeout_set(&mesh->loop, data, &(struct timeval){5, rand() % 100000});
}
-void handle_meta_connection_data(connection_t *c) {
- if (!receive_meta(c)) {
- terminate_connection(c, c->status.active);
+void handle_meta_connection_data(meshlink_handle_t *mesh, connection_t *c) {
+ if (!receive_meta(mesh, c)) {
+ terminate_connection(mesh, c, c->status.active);
return;
}
}
-int reload_configuration(void) {
- char filename[PATH_MAX];
-
- /* Reread our own configuration file */
-
- exit_configuration(&mesh->config);
- init_configuration(&mesh->config);
-
- if(!read_server_config(mesh)) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Unable to reread configuration file.");
- return EINVAL;
- }
-
- snprintf(filename, PATH_MAX,"%s" SLASH "hosts" SLASH "%s", mesh->confbase, mesh->self->name);
- read_config_file(mesh->config, filename);
-
- /* Parse some options that are allowed to be changed while tinc is running */
-
- setup_myself_reloadable(mesh);
-
- /* Try to make outgoing connections */
-
- try_outgoing_connections(mesh);
-
- /* Close connections to hosts that have a changed or deleted host config file */
-
- for list_each(connection_t, c, mesh->connections) {
- snprintf(filename, PATH_MAX,"%s" SLASH "hosts" SLASH "%s", mesh->confbase, c->name);
- struct stat s;
- if(stat(filename, &s) || s.st_mtime > mesh->last_config_check) {
- logger(DEBUG_CONNECTIONS, LOG_INFO, "Host config file of %s has been changed", c->name);
- terminate_connection(c, c->status.active);
- }
- }
-
- mesh->last_config_check = mesh->loop.now.tv_sec;
-
- return 0;
-}
-
-void retry(void) {
+void retry(meshlink_handle_t *mesh) {
/* Reset the reconnection timers for all outgoing connections */
for list_each(outgoing_t, outgoing, mesh->outgoings) {
outgoing->timeout = 0;
/*
this is where it all happens...
*/
-int main_loop(void) {
+int main_loop(meshlink_handle_t *mesh) {
timeout_add(&mesh->loop, &mesh->pingtimer, timeout_handler, &mesh->pingtimer, &(struct timeval){mesh->pingtimeout, rand() % 100000});
timeout_add(&mesh->loop, &mesh->periodictimer, periodic_handler, &mesh->periodictimer, &(struct timeval){mesh->pingtimeout, rand() % 100000});
+ //Add signal handler
+ 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)) {
logger(DEBUG_ALWAYS, LOG_ERR, "Error while waiting for input: %s", strerror(errno));
return 1;
projects / meshlink / blobdiff