X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprotocol_auth.c;h=2109cd4d7328d8af9fe0ef638141c7a622c714ca;hb=08aabbf9317806bc50a9a6693ca866c8936ce26b;hp=291c4b0176f02a25978924551f9c0d66fb98e0b7;hpb=1b8f8918360b40a2749d40355266ed7dedbe41b5;p=meshlink

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index 291c4b01..2109cd4d 100644
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -1,7 +1,7 @@
 /*
     protocol_auth.c -- handle the meta-protocol, authentication
     Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2007 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -40,6 +40,8 @@
 bool send_id(connection_t *c) {
 	cp();
 
+	gettimeofday(&c->start, NULL);
+
 	return send_request(c, "%d %s %d", ID, myself->connection->name,
 						myself->connection->protocol_version);
 }
@@ -205,7 +207,7 @@ bool metakey_h(connection_t *c, char *request) {
 	/* Decrypt the meta key */
 
 	if(!rsa_private_decrypt(&myself->connection->rsa, enckey, len, key)) {
-		logger(LOG_ERR, _("Error during encryption of meta key for %s (%s)"), c->name, c->hostname);
+		logger(LOG_ERR, _("Error during decryption of meta key for %s (%s)"), c->name, c->hostname);
 		return false;
 	}
 
@@ -333,6 +335,7 @@ bool chal_reply_h(connection_t *c, char *request) {
 	 */
 
 	free(c->hischallenge);
+	c->hischallenge = NULL;
 	c->allow_request = ACK;
 
 	return send_ack(c);
@@ -360,7 +363,7 @@ bool send_ack(connection_t *c) {
 	if((get_config_bool(lookup_config(c->config_tree, "TCPOnly"), &choice) && choice) || myself->options & OPTION_TCPONLY)
 		c->options |= OPTION_TCPONLY | OPTION_INDIRECT;
 
-	if((get_config_bool(lookup_config(c->config_tree, "PMTUDiscovery"), &choice) && choice) || myself->options & OPTION_PMTU_DISCOVERY)
+	if(myself->options & OPTION_PMTU_DISCOVERY)
 		c->options |= OPTION_PMTU_DISCOVERY;
 
 	get_config_int(lookup_config(c->config_tree, "Weight"), &c->estimated_weight);
@@ -445,6 +448,10 @@ bool ack_h(connection_t *c, char *request) {
 
 	n->connection = c;
 	c->node = n;
+	if(!(c->options & options & OPTION_PMTU_DISCOVERY)) {
+		c->options &= ~OPTION_PMTU_DISCOVERY;
+		options &= ~OPTION_PMTU_DISCOVERY;
+	}
 	c->options |= options;
 
 	if(get_config_int(lookup_config(c->config_tree, "PMTU"), &mtu) && mtu < n->mtu)