X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol_auth.c;h=05f547f22ac5b8ae2f751b8c2023fc9af3ebe07f;hp=5e960ea5fc53e199b8610ab1c4a7babf3a9a9569;hb=dc09f6fe896f5e35fffe8cc2004781b2e1b6fd5a;hpb=9bab08e972ae0ca4b904a659d9aed46aaa9b5dd5

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index 5e960ea5..05f547f2 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-2003 Ivo Timmermans <ivo@o2w.nl>,
-                  2000-2003 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1999-2004 Ivo Timmermans <ivo@tinc-vpn.org>,
+                  2000-2004 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
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: protocol_auth.c,v 1.1.4.32 2003/12/20 21:09:33 guus Exp $
+    $Id$
 */
 
 #include "system.h"
@@ -76,8 +76,11 @@ bool id_h(connection_t *c)
 				   c->name);
 			return false;
 		}
-	} else
+	} else {
+		if(c->name)
+			free(c->name);
 		c->name = xstrdup(name);
+	}
 
 	/* Check if version matches */
 
@@ -476,8 +479,10 @@ 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_DONTFRAGMENT)
-		c->options |= OPTION_DONTFRAGMENT;
+	if((get_config_bool(lookup_config(c->config_tree, "PMTUDiscovery"), &choice) && choice) || myself->options & OPTION_PMTU_DISCOVERY)
+		c->options |= OPTION_PMTU_DISCOVERY;
+
+	get_config_int(lookup_config(c->config_tree, "Weight"), &c->estimated_weight);
 
 	return send_request(c, "%d %s %d %lx", ACK, myport, c->estimated_weight, c->options);
 }
@@ -519,7 +524,7 @@ bool ack_h(connection_t *c)
 {
 	char hisport[MAX_STRING_SIZE];
 	char *hisaddress, *dummy;
-	int weight;
+	int weight, mtu;
 	long int options;
 	node_t *n;
 
@@ -554,6 +559,12 @@ bool ack_h(connection_t *c)
 	c->node = n;
 	c->options |= options;
 
+	if(get_config_int(lookup_config(c->config_tree, "PMTU"), &mtu) && mtu < n->mtu)
+		n->mtu = mtu;
+
+	if(get_config_int(lookup_config(myself->connection->config_tree, "PMTU"), &mtu) && mtu < n->mtu)
+		n->mtu = mtu;
+
 	/* Activate this connection */
 
 	c->allow_request = ALL;