From 113f384dcc4124bdc9fc63819fd6d1fea0885fc3 Mon Sep 17 00:00:00 2001
From: Julian Kranz <julian@juliankranz.de>
Date: Fri, 6 Jan 2012 17:30:48 +0100
Subject: [PATCH] ---

---
 src/client.c  | 5 +++++
 src/iodined.c | 5 +++++
 src/tun.c     | 8 --------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/client.c b/src/client.c
index e468bb9..94d7261 100644
--- a/src/client.c
+++ b/src/client.c
@@ -1548,6 +1548,11 @@ handshake_login(int dns_fd, int seed)
 				} else if (handshake_login_info_check(in, server, client, &mtu, &netmask,
 					server6, client6, &netmask6)) {
 
+					if(_v6 && mtu < 1280) {
+						fprintf(stderr, "Increasing MTU from %u to 1280 (as needed by IPv6)\n", mtu);
+						mtu = 1280;
+					}
+
 					server[64] = 0;
 					client[64] = 0;
 					if (tun_setip(client, server, netmask) == 0 && 
diff --git a/src/iodined.c b/src/iodined.c
index 1e98296..64440d0 100644
--- a/src/iodined.c
+++ b/src/iodined.c
@@ -2406,6 +2406,11 @@ main(int argc, char **argv)
 			usage();
 		}
 
+		if(mtu < 1280) {
+			fprintf(stderr, "Increasing MTU from %u to 1280 (as needed by IPv6)\n", mtu);
+			mtu = 1280;
+		}
+
 		fprintf(stderr, "IPv6 network: ");
 		ipv6_print(&my_net6, netmask6);
 	}
diff --git a/src/tun.c b/src/tun.c
index ac929a6..2d5cef1 100644
--- a/src/tun.c
+++ b/src/tun.c
@@ -550,14 +550,6 @@ tun_setmtu(unsigned mtu)
 #ifndef WINDOWS32
 	char cmdline[512];
 
-	/**
-	 * Todo: Correct?
-	 */
-	if(mtu < 1280) {
-		fprintf(stderr, "Increasing MTU from %u to 1280 (as needed by IPv6)\n", mtu);
-		mtu = 1280;
-	}
-
 	if (mtu > 200 && mtu <= 1500) {
 		snprintf(cmdline, sizeof(cmdline), 
 				IFCONFIGPATH "ifconfig %s mtu %u",