From e26748a144f831d1ec5ce784c9455ebe3ad6c61e Mon Sep 17 00:00:00 2001
From: Shibby <shibby@openlinksys.info>
Date: Thu, 12 Mar 2015 21:40:34 +0100
Subject: [PATCH] =?utf8?q?IPv6:=20Allow=20request=20/64=20subnet=20for=20L?=
 =?utf8?q?AN1/2/3=20if=20prefix=20lenght=20is=20lower=20than=2064=20?=
 =?utf8?q?=E2=80=93=20thx=20@tvlz?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 release/src/router/httpd/tomato.c     |  3 ++-
 release/src/router/nvram/defaults.c   |  1 +
 release/src/router/rc/dhcp.c          | 34 +++++++++++++++++++++++++++++++---
 release/src/router/www/basic-ipv6.asp | 32 +++++++++++++++++++++++++++++---
 4 files changed, 63 insertions(+), 7 deletions(-)

diff --git a/release/src/router/httpd/tomato.c b/release/src/router/httpd/tomato.c
index 578292decb..04c5c04fb3 100644
--- a/release/src/router/httpd/tomato.c
+++ b/release/src/router/httpd/tomato.c
@@ -717,7 +717,8 @@ static const nvset_t nvset_list[] = {
 	{ "ipv6_6rd_prefix_length",	V_RANGE(3, 127)			},
 	{ "ipv6_6rd_borderrelay",	V_IP				},
 	{ "ipv6_6rd_ipv4masklen",	V_RANGE(0, 32)			},
-	{ "ipv6_vlan",			V_RANGE(0, 7)			},	// Enable IPv6 on 1=LAN1 2=LAN2 4=LAN3 
+	{ "ipv6_vlan",			V_RANGE(0, 7)			},	// Enable IPv6 on 1=LAN1 2=LAN2 4=LAN3
+	{ "ipv6_isp_opt",		V_01				},	// wan.c add eval option for dhcpd
 #endif
 
 // basic-wfilter
diff --git a/release/src/router/nvram/defaults.c b/release/src/router/nvram/defaults.c
index 8eac7375ce..69297bb4c8 100644
--- a/release/src/router/nvram/defaults.c
+++ b/release/src/router/nvram/defaults.c
@@ -198,6 +198,7 @@ const defaults_t defaults[] = {
 	{ "ipv6_6rd_prefix_length",	"32"				},	// 6RD prefix length (32-62) checkme
 	{ "ipv6_6rd_borderrelay",	"68.113.165.1"			},	// 6RD border relay address
 	{ "ipv6_6rd_ipv4masklen",	"0"				},	// 6RD IPv4 mask length (0-30) checkme
+	{ "ipv6_vlan",			"0"				},	// Enable IPv6 on 1=LAN1 2=LAN2 4=LAN3
 	{ "ipv6_isp_opt",		"0"				},	// wan.c add eval option for dhcpd
 #endif
 
diff --git a/release/src/router/rc/dhcp.c b/release/src/router/rc/dhcp.c
index ccf51743f0..62d427cc97 100644
--- a/release/src/router/rc/dhcp.c
+++ b/release/src/router/rc/dhcp.c
@@ -479,6 +479,7 @@ void start_dhcp6c(void)
 	char *wan6face;
 	char *argv[] = { "dhcp6c", "-T", "LL", NULL, NULL, NULL };
 	int argc;
+	int ipv6_vlan;
 
 	TRACE_PT("begin\n");
 
@@ -489,30 +490,57 @@ void start_dhcp6c(void)
 	if (prefix_len < 0)
 		prefix_len = 0;
 	wan6face = nvram_safe_get("wan_iface");
+	ipv6_vlan = nvram_get_int("ipv6_vlan");
 
 	nvram_set("ipv6_get_dns", "");
 	nvram_set("ipv6_rtr_addr", "");
 	nvram_set("ipv6_prefix", "");
 
 	// Create dhcp6c.conf
+	unlink("/var/dhcp6c_duid");
 	if ((f = fopen("/etc/dhcp6c.conf", "w"))) {
 		fprintf(f,
 			"interface %s {\n"
+			" send ia-na 0;\n" //Required to get correct WAN IP
 			" send ia-pd 0;\n"
 			" send rapid-commit;\n"
 			" request domain-name-servers;\n"
 			" script \"/sbin/dhcp6c-state\";\n"
 			"};\n"
 			"id-assoc pd 0 {\n"
+			" prefix ::/%d infinity;\n"			
 			" prefix-interface %s {\n"
 			"  sla-id 0;\n"
 			"  sla-len %d;\n"
-			" };\n"
-			"};\n"
-			"id-assoc na 0 { };\n",
+			" 	};\n",
 			wan6face,
+			nvram_get_int("ipv6_prefix_length"),
 			nvram_safe_get("lan_ifname"),
 			prefix_len);
+		if ((ipv6_vlan & 1) && (prefix_len >= 1)) { //2 ipv6 /64 networks
+		fprintf(f,
+			"	prefix-interface %s {\n"
+			"		sla-id 1;\n"
+			"		sla-len %d;\n"
+			"	};\n", nvram_safe_get("lan1_ifname"), prefix_len);
+		};
+		if ((ipv6_vlan & 2) && (prefix_len >= 2)) { //4 ipv6 /64 networks
+		fprintf(f,
+			"	prefix-interface %s {\n"
+			"		sla-id 2;\n"
+			"		sla-len %d;\n"
+			"	};\n", nvram_safe_get("lan2_ifname"), prefix_len);
+		};
+		if ((ipv6_vlan & 4) && (prefix_len >= 2)) {
+		fprintf(f,
+			"	prefix-interface %s {\n"
+			"		sla-id 3;\n"
+			"		sla-len %d;\n"
+			"	};\n", nvram_safe_get("lan3_ifname"), prefix_len);
+		};		
+		fprintf(f,
+			"};\n"
+			"id-assoc na 0 { };\n");
 		fclose(f);
 	}
 
diff --git a/release/src/router/www/basic-ipv6.asp b/release/src/router/www/basic-ipv6.asp
index 8ee3c23c38..d2b779324d 100644
--- a/release/src/router/www/basic-ipv6.asp
+++ b/release/src/router/www/basic-ipv6.asp
@@ -21,7 +21,7 @@
 <script type='text/javascript' src='debug.js'></script>
 
 <script type='text/javascript'>
-//	<% nvram("ipv6_6rd_prefix_length,ipv6_prefix,ipv6_prefix_length,ipv6_accept_ra,ipv6_isp_opt,ipv6_rtr_addr,ipv6_service,ipv6_dns,ipv6_tun_addr,ipv6_tun_addrlen,ipv6_ifname,ipv6_tun_v4end,ipv6_relay,ipv6_tun_mtu,ipv6_tun_ttl,ipv6_6rd_ipv4masklen,ipv6_6rd_prefix,ipv6_6rd_borderrelay"); %>
+//	<% nvram("ipv6_6rd_prefix_length,ipv6_prefix,ipv6_prefix_length,ipv6_accept_ra,ipv6_isp_opt,ipv6_rtr_addr,ipv6_service,ipv6_dns,ipv6_tun_addr,ipv6_tun_addrlen,ipv6_ifname,ipv6_tun_v4end,ipv6_relay,ipv6_tun_mtu,ipv6_tun_ttl,ipv6_6rd_ipv4masklen,ipv6_6rd_prefix,ipv6_6rd_borderrelay,lan1_ifname,lan2_ifname,lan3_ifname,ipv6_vlan"); %>
 
 nvram.ipv6_accept_ra = fixInt(nvram.ipv6_accept_ra, 0, 3, 0);
 
@@ -55,7 +55,10 @@ function verifyFields(focused, quiet)
 		_ipv6_6rd_ipv4masklen: 1,
 		_ipv6_6rd_prefix_length: 1,
 		_ipv6_6rd_prefix: 1,
-		_ipv6_6rd_borderrelay: 1
+		_ipv6_6rd_borderrelay: 1,
+		_f_lan1_ipv6: 0,
+		_f_lan2_ipv6: 0,
+		_f_lan3_ipv6: 0
 	};
 
 	c = E('_ipv6_service').value;
@@ -129,6 +132,14 @@ function verifyFields(focused, quiet)
 			vis._ipv6_6rd_prefix_length = 0;
 			vis._ipv6_6rd_prefix = 0;
 			vis._ipv6_6rd_borderrelay = 0;
+			if (c != '6rd-pd') {
+				if (nvram.lan1_ifname == 'br1' && E('_f_ipv6_prefix_length').value <= 63){  //2 ipv6 /64 networks
+					vis._f_lan1_ipv6 = 1;}
+				if (nvram.lan2_ifname == 'br2' && E('_f_ipv6_prefix_length').value <= 62){  //4 ipv6 /64 networks
+					vis._f_lan2_ipv6 = 1;}
+				if (nvram.lan3_ifname == 'br3' && E('_f_ipv6_prefix_length').value <= 62){
+					vis._f_lan3_ipv6 = 1;}
+			}
 			break;
 		case '6to4':
 			vis._ipv6_ifname = 0;
@@ -275,6 +286,7 @@ function save()
 
 	fom.ipv6_prefix_length.value = fom.f_ipv6_prefix_length.value;
 	fom.ipv6_prefix.value = fom.f_ipv6_prefix.value;
+	fom.ipv6_vlan.value = 0;
 
 	switch(E('_ipv6_service').value) {
 		case 'other':
@@ -285,9 +297,18 @@ function save()
 		case '6rd':
 			break; //KDB todo
 		case '6to4':
+			fom.ipv6_prefix.value = '';
+			fom.ipv6_rtr_addr.value = '';
+			break;
 		case 'native-pd':
 			fom.ipv6_prefix.value = '';
 			fom.ipv6_rtr_addr.value = '';
+			if (fom.f_lan1_ipv6.checked)
+				fom.ipv6_vlan.value |= 1;
+			if (fom.f_lan2_ipv6.checked)
+				fom.ipv6_vlan.value |= 2;
+			if (fom.f_lan3_ipv6.checked)
+				fom.ipv6_vlan.value |= 4;
 			break;
 		default:
 			fom.ipv6_rtr_addr.disabled = fom.f_ipv6_rtr_addr_auto.disabled;
@@ -326,6 +347,7 @@ function save()
 <input type='hidden' name='ipv6_prefix_length'>
 <input type='hidden' name='ipv6_rtr_addr'>
 <input type='hidden' name='ipv6_accept_ra'>
+<input type='hidden' name='ipv6_vlan'>
 <input type='hidden' name='ipv6_isp_opt'>
 
 <div class='section-title'>IPv6 Configuration</div>
@@ -365,7 +387,11 @@ createFieldTable('', [
 		{ name: 'ipv6_tun_addrlen', type: 'text', maxlen: 3, size: 5, value: nvram.ipv6_tun_addrlen }
 	] },
 	{ title: 'Tunnel MTU', name: 'ipv6_tun_mtu', type: 'text', maxlen: 4, size: 8, value: nvram.ipv6_tun_mtu, suffix: ' <small>(0 for default)</small>' },
-	{ title: 'Tunnel TTL', name: 'ipv6_tun_ttl', type: 'text', maxlen: 3, size: 8, value: nvram.ipv6_tun_ttl }
+	{ title: 'Tunnel TTL', name: 'ipv6_tun_ttl', type: 'text', maxlen: 3, size: 8, value: nvram.ipv6_tun_ttl },
+	null,
+	{ title: 'Request /64 subnet for',  name: 'f_lan1_ipv6', type: 'checkbox', value: (nvram.ipv6_vlan & 1), suffix: '&nbsp; LAN1(br1) &nbsp;&nbsp;&nbsp;' },
+	{ title: '',			name: 'f_lan2_ipv6', type: 'checkbox', value: (nvram.ipv6_vlan & 2), suffix: '&nbsp; LAN2(br2) &nbsp;&nbsp;&nbsp;' },
+	{ title: '',			name: 'f_lan3_ipv6', type: 'checkbox', value: (nvram.ipv6_vlan & 4), suffix: '&nbsp; LAN3(br3) &nbsp;&nbsp;&nbsp;' }
 ]);
 </script>
 </div>
-- 
2.11.4.GIT