X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprotocol_auth.c;h=404a81c88de8ec09fddc65f58d926a09f4935eda;hb=7d0d06e82233623ce90c70dac2803a7f299c673e;hp=d359b9b638c9aae8e9699201317bc5d470bb285f;hpb=2dedfacd26539e45171c243d1e9df49993298dbb;p=meshlink diff --git a/src/protocol_auth.c b/src/protocol_auth.c index d359b9b6..404a81c8 100644 --- a/src/protocol_auth.c +++ b/src/protocol_auth.c @@ -329,11 +329,20 @@ bool id_h(meshlink_handle_t *mesh, connection_t *c, const char *request) { logger(mesh, MESHLINK_ERROR, "Peer %s had unknown identity (%s)", c->hostname, c->name); return false; } + } - read_ecdsa_public_key(mesh, c); - } else { - if(c->protocol_minor && !ecdsa_active(c->ecdsa)) - c->protocol_minor = 1; + read_ecdsa_public_key(mesh, c); + + if(!ecdsa_active(c->ecdsa)) { + logger(mesh, MESHLINK_ERROR, "No key known for peer %s (%s)", c->name, c->hostname); + + node_t *n = lookup_node(mesh, c->name); + if(n && !n->status.waitingforkey) { + logger(mesh, MESHLINK_INFO, "Requesting key from peer %s (%s)", c->name, c->hostname); + send_req_key(mesh, n); + } + + return false; } /* Forbid version rollback for nodes whose ECDSA key we know */ @@ -424,6 +433,8 @@ bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) { n->devclass = devclass; node_write_devclass(mesh, n); + n->last_successfull_connection = time(NULL); + n->connection = c; c->node = n; if(!(c->options & options & OPTION_PMTU_DISCOVERY)) {