X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet.c;h=294014231b1b04f0f556c11d826b57f45596414f;hb=eb049936ffce049cf6b53de8ca0f39c98a360363;hp=74fb04b694c6daea50246471d8a3e26abdf08365;hpb=21f0bddfa4dca5fb21c9dc4970ac64fa8fe706e4;p=meshlink diff --git a/src/net.c b/src/net.c index 74fb04b6..29401423 100644 --- a/src/net.c +++ b/src/net.c @@ -31,16 +31,6 @@ #include "protocol.h" #include "xalloc.h" -int contradicting_add_edge = 0; -int contradicting_del_edge = 0; -static int sleeptime = 10; -time_t last_config_check = 0; -static timeout_t pingtimer; -static timeout_t periodictimer; - -//TODO: move this to a better place -char *confbase; - /* Purge edges of unreachable nodes. Use carefully. */ // TODO: remove @@ -54,7 +44,7 @@ void purge(void) { 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(everyone, e); + send_del_edge(mesh->everyone, e); edge_del(e); } } @@ -88,7 +78,7 @@ void terminate_connection(connection_t *c, bool report) { if(c->edge) { if(report) - send_del_edge(everyone, c->edge); + send_del_edge(mesh->everyone, c->edge); edge_del(c->edge); c->edge = NULL; @@ -103,7 +93,7 @@ void terminate_connection(connection_t *c, bool report) { edge_t *e; e = lookup_edge(c->node, mesh->self); if(e) { - send_del_edge(everyone, e); + send_del_edge(mesh->everyone, e); edge_del(e); } } @@ -163,20 +153,20 @@ static void periodic_handler(void *data) { If so, sleep for a short while to prevent a storm of contradicting messages. */ - if(contradicting_del_edge > 100 && contradicting_add_edge > 100) { - logger(DEBUG_ALWAYS, LOG_WARNING, "Possible node with same Name as us! Sleeping %d seconds.", sleeptime); - usleep(sleeptime * 1000000LL); - sleeptime *= 2; - if(sleeptime < 0) - sleeptime = 3600; + 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); + usleep(mesh->sleeptime * 1000000LL); + mesh->sleeptime *= 2; + if(mesh->sleeptime < 0) + mesh->sleeptime = 3600; } else { - sleeptime /= 2; - if(sleeptime < 10) - sleeptime = 10; + mesh->sleeptime /= 2; + if(mesh->sleeptime < 10) + mesh->sleeptime = 10; } - contradicting_add_edge = 0; - contradicting_del_edge = 0; + mesh->contradicting_add_edge = 0; + mesh->contradicting_del_edge = 0; /* If AutoConnect is set, check if we need to make or break connections. */ @@ -206,7 +196,7 @@ static void periodic_handler(void *data) { bool found = false; - for list_each(outgoing_t, outgoing, outgoing_list) { + for list_each(outgoing_t, outgoing, mesh->outgoings) { if(!strcmp(outgoing->name, n->name)) { found = true; break; @@ -217,7 +207,7 @@ static void periodic_handler(void *data) { logger(DEBUG_CONNECTIONS, LOG_INFO, "Autoconnecting to %s", n->name); outgoing_t *outgoing = xzalloc(sizeof *outgoing); outgoing->name = xstrdup(n->name); - list_insert_tail(outgoing_list, outgoing); + list_insert_tail(mesh->outgoings, outgoing); setup_outgoing_connection(outgoing); } break; @@ -241,7 +231,7 @@ static void periodic_handler(void *data) { break; logger(DEBUG_CONNECTIONS, LOG_INFO, "Autodisconnecting from %s", c->name); - list_delete(outgoing_list, c->outgoing); + list_delete(mesh->outgoings, c->outgoing); c->outgoing = NULL; terminate_connection(c, c->status.active); break; @@ -252,7 +242,7 @@ static void periodic_handler(void *data) { /* If we have enough active connections, remove any pending outgoing connections. */ - for list_each(outgoing_t, o, outgoing_list) { + for list_each(outgoing_t, o, mesh->outgoings) { bool found = false; for list_each(connection_t, c, mesh->connections) { if(c->outgoing == o) { @@ -262,7 +252,7 @@ static void periodic_handler(void *data) { } if(!found) { logger(DEBUG_CONNECTIONS, LOG_INFO, "Cancelled outgoing connection to %s", o->name); - list_delete_node(outgoing_list, node); + list_delete_node(mesh->outgoings, node); } } } @@ -283,16 +273,16 @@ int reload_configuration(void) { /* Reread our own configuration file */ - exit_configuration(&config_tree); - init_configuration(&config_tree); + exit_configuration(&mesh->config); + init_configuration(&mesh->config); if(!read_server_config()) { logger(DEBUG_ALWAYS, LOG_ERR, "Unable to reread configuration file."); return EINVAL; } - xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, mesh->self->name); - read_config_file(config_tree, fname); + xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, mesh->self->name); + read_config_file(mesh->config, fname); free(fname); /* Parse some options that are allowed to be changed while tinc is running */ @@ -306,23 +296,23 @@ int reload_configuration(void) { /* Close connections to hosts that have a changed or deleted host config file */ for list_each(connection_t, c, mesh->connections) { - xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, c->name); + xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, c->name); struct stat s; - if(stat(fname, &s) || s.st_mtime > last_config_check) { + if(stat(fname, &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); } free(fname); } - last_config_check = now.tv_sec; + mesh->last_config_check = now.tv_sec; return 0; } void retry(void) { /* Reset the reconnection timers for all outgoing connections */ - for list_each(outgoing_t, outgoing, outgoing_list) { + for list_each(outgoing_t, outgoing, mesh->outgoings) { outgoing->timeout = 0; if(outgoing->ev.cb) timeout_set(&outgoing->ev, &(struct timeval){0, 0}); @@ -335,23 +325,23 @@ void retry(void) { } /* Kick the ping timeout handler */ - timeout_set(&pingtimer, &(struct timeval){0, 0}); + timeout_set(&mesh->pingtimer, &(struct timeval){0, 0}); } /* this is where it all happens... */ int main_loop(void) { - timeout_add(&pingtimer, timeout_handler, &pingtimer, &(struct timeval){pingtimeout, rand() % 100000}); - timeout_add(&periodictimer, periodic_handler, &periodictimer, &(struct timeval){pingtimeout, rand() % 100000}); + timeout_add(&mesh->pingtimer, timeout_handler, &mesh->pingtimer, &(struct timeval){pingtimeout, rand() % 100000}); + timeout_add(&mesh->periodictimer, periodic_handler, &mesh->periodictimer, &(struct timeval){pingtimeout, rand() % 100000}); if(!event_loop()) { logger(DEBUG_ALWAYS, LOG_ERR, "Error while waiting for input: %s", strerror(errno)); return 1; } - timeout_del(&periodictimer); - timeout_del(&pingtimer); + timeout_del(&mesh->periodictimer); + timeout_del(&mesh->pingtimer); return 0; }