j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Require ExperimentalProtocol = yes for new features, update documentation.

Browse source
This commit is contained in:
Guus Sliepen 2011-07-11 21:54:01 +02:00
parent d1cd3c8145
commit bbeab00f46
8 changed files with 44 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/protocol_auth.c
View file

@ -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)