X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fnet.c;h=348c9e343b34a14dae8b04a9b4a2902035d5d6df;hp=ce7e00d862a931bf21490e7582d5bb8afe7de327;hb=53522b1c11222273c7b41f72b374e759d13b2165;hpb=1622803438b8c4bfff50bedfae6cd809e27fa075 diff --git a/src/net.c b/src/net.c index ce7e00d8..348c9e34 100644 --- a/src/net.c +++ b/src/net.c @@ -490,23 +490,27 @@ static void periodic_handler(event_loop_t *loop, void *data) { 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(outgoing->node == connect_to) { - found = true; + logger(mesh, MESHLINK_DEBUG, "* skip autoconnect since it is an outgoing connection already"); + skip = true; break; } } - if(!found) { + if(!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->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"); } } @@ -587,6 +591,13 @@ static void periodic_handler(event_loop_t *loop, void *data) { 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 });