X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol_auth.c;h=21a4b7e14055bdff220424e6bddbe18ff3e53d06;hb=bbeab00f46a6c856573fe0d2b9b85bce35728403;hp=70062f3f59f87ed0d158011fe12bbf4616857d91;hpb=30ef2a981e1d62692b3a2363e0b3a0e8711d9604;p=tinc diff --git a/src/protocol_auth.c b/src/protocol_auth.c index 70062f3f..21a4b7e1 100644 --- a/src/protocol_auth.c +++ b/src/protocol_auth.c @@ -43,12 +43,16 @@ bool send_id(connection_t *c) { gettimeofday(&c->start, NULL); - int minor = myself->connection->protocol_minor; - if(c->config_tree && !read_ecdsa_public_key(c)) - minor = 1; + int minor = 0; - return send_request(c, "%d %s %d.%d", ID, myself->connection->name, - myself->connection->protocol_major, minor); + if(experimental) { + if(c->config_tree && !read_ecdsa_public_key(c)) + minor = 1; + else + minor = myself->connection->protocol_minor; + } + + return send_request(c, "%d %s %d.%d", ID, myself->connection->name, myself->connection->protocol_major, minor); } bool id_h(connection_t *c, char *request) { @@ -115,7 +119,7 @@ bool id_h(connection_t *c, char *request) { return false; } - if(c->protocol_minor >= 2) + if(experimental && c->protocol_minor >= 2) if(!read_ecdsa_public_key(c)) return false; } else { @@ -123,6 +127,9 @@ bool id_h(connection_t *c, char *request) { c->protocol_minor = 1; } + if(!experimental) + c->protocol_minor = 0; + c->allow_request = METAKEY; if(c->protocol_minor >= 2)