X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol_auth.c;h=908ab2472cb2ad20981f4fed904588090f87a56f;hb=ce059e36fdb3d3049c278e8b2f36b03c93778996;hp=790d324d0b054457a9d2e42f848d141dc3cf43fe;hpb=248d300f1be0d5f2aae39202041699ab2b46c56b;p=tinc diff --git a/src/protocol_auth.c b/src/protocol_auth.c index 790d324d..908ab247 100644 --- a/src/protocol_auth.c +++ b/src/protocol_auth.c @@ -212,9 +212,8 @@ bool id_h(connection_t *c, const char *request) { if(!c->config_tree) { init_configuration(&c->config_tree); - if(!read_connection_config(c)) { - logger(DEBUG_ALWAYS, LOG_ERR, "Peer %s had unknown identity (%s)", c->hostname, - c->name); + if(!read_host_config(c->config_tree, c->name)) { + logger(DEBUG_ALWAYS, LOG_ERR, "Peer %s had unknown identity (%s)", c->hostname, c->name); return false; } @@ -506,7 +505,7 @@ bool send_ack(connection_t *c) { get_config_int(lookup_config(c->config_tree, "Weight"), &c->estimated_weight); - return send_request(c, "%d %s %d %x", ACK, myport, c->estimated_weight, (c->options & 0xffffff) | (PROT_MINOR << 24)); + return send_request(c, "%d %s %d %x", ACK, myport, c->estimated_weight, (c->options & 0xffffff) | (experimental ? (PROT_MINOR << 24) : 0)); } static void send_everything(connection_t *c) {