From 5801234f18490f4f50b805f7caa0adae297202f9 Mon Sep 17 00:00:00 2001
From: Jackysi <jacky@prahec.com>
Date: Mon, 24 Jul 2017 00:34:46 +0200
Subject: [PATCH] Static IPv6 configuration changes/improvements @tvlz thx!

---
 basic-ipv6.asp | 118 ++++++++++++++++++++++++++++++-------------------
 1 file changed, 72 insertions(+), 46 deletions(-)

diff --git a/basic-ipv6.asp b/basic-ipv6.asp
index 9c417ec..6dc3709 100644
--- a/basic-ipv6.asp
+++ b/basic-ipv6.asp
@@ -8,7 +8,7 @@ No part of this file may be used without permission.
 --><title>IPv6 Configuration</title>
 <content>
 	<script type="text/javascript">
-		//<% nvram("ipv6_6rd_prefix_length,ipv6_prefix,ipv6_prefix_length,ipv6_accept_ra,ipv6_pdonly,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_6rd_prefix_length,ipv6_prefix,ipv6_prefix_length,ipv6_accept_ra,ipv6_pdonly,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,ipv6_prefix_len_wan,ipv6_isp_gw,ipv6_wan_addr"); %>
 
 		nvram.ipv6_accept_ra = fixInt( nvram.ipv6_accept_ra, 0, 3, 0 );
 
@@ -20,31 +20,34 @@ No part of this file may be used without permission.
 			// --- visibility ---
 
 			var vis = {
-				_ipv6_service          : 1,
-				_f_ipv6_prefix         : 1,
-				_f_ipv6_prefix_length  : 1,
-				_f_ipv6_rtr_addr_auto  : 1,
-				_f_ipv6_rtr_addr       : 1,
-				_f_ipv6_dns_1          : 1,
-				_f_ipv6_dns_2          : 1,
-				_f_ipv6_dns_3          : 1,
-				_f_ipv6_accept_ra_wan  : 1,
-				_f_ipv6_accept_ra_lan  : 1,
-				_f_ipv6_pdonly         : 1,
-				_ipv6_tun_v4end        : 1,
-				_ipv6_relay            : 1,
-				_ipv6_ifname           : 1,
-				_ipv6_tun_addr         : 1,
-				_ipv6_tun_addrlen      : 1,
-				_ipv6_tun_ttl          : 1,
-				_ipv6_tun_mtu          : 1,
-				_ipv6_6rd_ipv4masklen  : 1,
-				_ipv6_6rd_prefix_length: 1,
-				_ipv6_6rd_prefix       : 1,
-				_ipv6_6rd_borderrelay  : 1,
-				_f_lan1_ipv6           : 0,
-				_f_lan2_ipv6           : 0,
-				_f_lan3_ipv6           : 0
+                _ipv6_service          : 1,
+                _f_ipv6_prefix         : 1,
+                _f_ipv6_prefix_length  : 1,
+                _f_ipv6_wan_addr       : 0,
+                _f_ipv6_prefix_len_wan : 0,
+                _f_ipv6_isp_gw         : 0,
+                _f_ipv6_rtr_addr_auto  : 1,
+                _f_ipv6_rtr_addr       : 1,
+                _f_ipv6_dns_1          : 1,
+                _f_ipv6_dns_2          : 1,
+                _f_ipv6_dns_3          : 1,
+                _f_ipv6_accept_ra_wan  : 1,
+                _f_ipv6_accept_ra_lan  : 1,
+                _f_ipv6_pdonly         : 1,
+                _ipv6_tun_v4end        : 1,
+                _ipv6_relay            : 1,
+                _ipv6_ifname           : 1,
+                _ipv6_tun_addr         : 1,
+                _ipv6_tun_addrlen      : 1,
+                _ipv6_tun_ttl          : 1,
+                _ipv6_tun_mtu          : 1,
+                _ipv6_6rd_ipv4masklen  : 1,
+                _ipv6_6rd_prefix_length: 1,
+                _ipv6_6rd_prefix       : 1,
+                _ipv6_6rd_borderrelay  : 1,
+                _f_lan1_ipv6           : 0,
+                _f_lan2_ipv6           : 0,
+                _f_lan3_ipv6           : 0
 			};
 
 			c = E( '_ipv6_service' ).value;
@@ -129,9 +132,17 @@ No part of this file may be used without permission.
 							vis._f_lan3_ipv6 = 1;
 						}
 					}
-					if ( c != 'native-pd' ) {
-						vis._f_ipv6_pdonly = 0;
-					}
+                    if ( c != 'native-pd' ) {
+                        vis._f_ipv6_pdonly = 0;
+                    }
+                    if ( c == 'native' ) {
+                        vis._f_ipv6_pdonly         = 0;
+                        vis._f_ipv6_wan_addr       = 1;
+                        vis._f_ipv6_prefix_len_wan = 1;
+                        vis._f_ipv6_isp_gw         = 1;
+                        vis._f_ipv6_accept_ra_wan  = 0;
+                        vis._f_ipv6_accept_ra_lan  = 0;
+                    }
 					break;
 				case '6to4':
 					vis._ipv6_ifname            = 0;
@@ -202,7 +213,7 @@ No part of this file may be used without permission.
 				if ( (vis[ a[ i ] ]) && (!v_ip( a[ i ], quiet || !ok )) ) ok = 0;
 
 			// range
-			a = [ [ '_f_ipv6_prefix_length', 3, 127 ], [ '_ipv6_tun_addrlen', 3, 127 ], [ '_ipv6_tun_ttl', 0, 255 ], [ '_ipv6_relay', 1, 254 ] ];
+			a = [['_f_ipv6_prefix_length', 3, 127], ['_f_ipv6_prefix_len_wan', 3, 127], ['_ipv6_tun_addrlen', 3, 127], ['_ipv6_tun_ttl', 0, 255], ['_ipv6_relay', 1, 254]];
 			for ( i = a.length - 1; i >= 0; --i ) {
 				b = a[ i ];
 				if ( (vis[ b[ 0 ] ]) && (!v_range( b[ 0 ], quiet || !ok, b[ 1 ], b[ 2 ] )) ) ok = 0;
@@ -236,7 +247,7 @@ No part of this file may be used without permission.
 			}
 
 			// optional IPv6 address
-			a = [ '_f_ipv6_rtr_addr', '_f_ipv6_dns_1', '_f_ipv6_dns_2', '_f_ipv6_dns_3' ];
+			a = ['_f_ipv6_rtr_addr', '_f_ipv6_wan_addr', '_f_ipv6_isp_gw', '_f_ipv6_dns_1', '_f_ipv6_dns_2', '_f_ipv6_dns_3'];
 			for ( i = a.length - 1; i >= 0; --i )
 				if ( (vis[ a[ i ] ] == 1) && (E( a[ i ] ).value.length > 0) && (!v_ipv6_addr( a[ i ], quiet || !ok )) ) ok = 0;
 
@@ -274,9 +285,12 @@ No part of this file may be used without permission.
 			if ( fom.f_ipv6_accept_ra_lan.checked && !fom.f_ipv6_accept_ra_lan.disabled )
 				fom.ipv6_accept_ra.value |= 2;
 
-			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;
+            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;
+            fom.ipv6_wan_addr.value       = fom.f_ipv6_wan_addr.value;
+            fom.ipv6_prefix_len_wan.value = fom.f_ipv6_prefix_len_wan.value;
+            fom.ipv6_isp_gw.value         = fom.f_ipv6_isp_gw.value;
 
 			switch ( E( '_ipv6_service' ).value ) {
 				case 'other':
@@ -299,7 +313,13 @@ No part of this file may be used without permission.
 						fom.ipv6_vlan.value |= 2;
 					if ( fom.f_lan3_ipv6.checked )
 						fom.ipv6_vlan.value |= 4;
-					break;
+                    break;
+                case 'native':
+                    fom.ipv6_wan_addr.value       = fom.f_ipv6_wan_addr.value;
+                    fom.ipv6_prefix_len_wan.value = fom.f_ipv6_prefix_len_wan.value;
+                    fom.ipv6_isp_gw.value         = fom.f_ipv6_isp_gw.value;
+                    fom.ipv6_rtr_addr.value       = fom.f_ipv6_rtr_addr.value;
+                    break;
 				default:
 					fom.ipv6_rtr_addr.disabled = fom.f_ipv6_rtr_addr_auto.disabled;
 					if ( fom.f_ipv6_rtr_addr_auto.value == 1 )
@@ -324,8 +344,11 @@ No part of this file may be used without permission.
 		<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_pdonly">
+        <input type="hidden" name="ipv6_vlan">
+        <input type="hidden" name="ipv6_pdonly">
+        <input type="hidden" name="ipv6_wan_addr">
+        <input type="hidden" name="ipv6_prefix_len_wan">
+        <input type="hidden" name="ipv6_isp_gw">
 
 		<div class="box" id="section-ipv6">
 			<div class="heading">Basic IPv6 Configuration</div>
@@ -339,22 +362,25 @@ No part of this file may be used without permission.
 
 					$('#section-ipv6 .formfields').forms([
 		                 { title: 'IPv6 Service Type', name: 'ipv6_service', type: 'select',
-		                     options: [['', 'Disabled'],['native','Native IPv6 from ISP'],['native-pd','DHCPv6 with Prefix Delegation'],['6to4','6to4 Anycast Relay'],['sit','6in4 Static Tunnel'],['6rd','6rd Relay'],['6rd-pd','6rd from DHCPv4 (Option 212)'],['other','Other (Manual Configuration)']],
-		                     value: nvram.ipv6_service },
+		                     options: [['', 'Disabled'],['native-pd','DHCPv6 with Prefix Delegation'],['native','Static IPv6'],['6to4','6to4 Anycast Relay'],['sit','6in4 Static Tunnel'],['6rd','6rd Relay'],['6rd-pd','6rd from DHCPv4 (Option 212)'],['other','Other (Manual Configuration)']],
+                             value: nvram.ipv6_service },
 		                 { title: 'IPv6 WAN Interface', name: 'ipv6_ifname', type: 'text', maxlen: 8, size: 10, value: nvram.ipv6_ifname },
 		                 null,
-		                 { title: 'Assigned / Routed Prefix', name: 'f_ipv6_prefix', type: 'text', maxlen: 46, size: 48, value: nvram.ipv6_prefix },
-		                 { title: '6rd Routed Prefix', name: 'ipv6_6rd_prefix', type: 'text', maxlen: 46, size: 48, value: nvram.ipv6_6rd_prefix },
+                         { title: 'IPv6 WAN Address', name: 'f_ipv6_wan_addr', type: 'text', maxlen: 40, size: 42, value: nvram.ipv6_wan_addr, suffix: ' <small>(ex. 2001:0db8:1234::2)</small>' },
+                         { title: 'IPv6 WAN Prefix Length', name: 'f_ipv6_prefix_len_wan', type: 'text', maxlen: 3, size: 5, value: nvram.ipv6_prefix_len_wan, suffix: ' <small>(Usually  64)</small>' },
+                         { title: 'IPv6 WAN Gateway', name: 'f_ipv6_isp_gw', type: 'text', maxlen: 40, size: 42, value: nvram.ipv6_isp_gw, suffix: ' <small>(ex. 2001:0db8:1234::1)</small>' },
+                         { title: 'Assigned / Routed Prefix', name: 'f_ipv6_prefix', type: 'text', maxlen: 40, size: 42, value: nvram.ipv6_prefix, suffix: ' <small>(ex. 2001:0db8:1234:0001::)</small>' },
+                         { title: '6rd Routed Prefix', name: 'ipv6_6rd_prefix', type: 'text', maxlen: 40, size: 42, value: nvram.ipv6_6rd_prefix },
 		                 { title: '6rd Prefix Length', name: 'ipv6_6rd_prefix_length', type: 'text', maxlen: 3, size: 5, value: nvram.ipv6_6rd_prefix_length, suffix: ' <small>(Usually 32)</small>' },
 		                 { title: 'Prefix Length', name: 'f_ipv6_prefix_length', type: 'text', maxlen: 3, size: 5, value: nvram.ipv6_prefix_length },
-		                 { title: 'Request PD Only', name: 'f_ipv6_pdonly', type: 'checkbox', value: (nvram.ipv6_pdonly != '0') },
-		                 { title: 'Router IPv6 Address', multi: [
+		                 { title: 'Request PD Only', name: 'f_ipv6_pdonly', type: 'checkbox', value: (nvram.ipv6_pdonly != '0'), suffix: ' <small>(Usually PPPoE connections)</small>' },
+                         { title: 'IPv6 Router LAN Address', multi: [
 		                     { name: 'f_ipv6_rtr_addr_auto', type: 'select', options: [['0', 'Default'],['1','Manual']], value: (nvram.ipv6_rtr_addr == '' ? '0' : '1') },
 		                     { name: 'f_ipv6_rtr_addr', type: 'text', maxlen: 46, size: 48, value: nvram.ipv6_rtr_addr }
 		                 ] },
-		                 { title: 'Static DNS', name: 'f_ipv6_dns_1', type: 'text', maxlen: 46, size: 48, value: dns[0] || '' },
-		                 { title: '',           name: 'f_ipv6_dns_2', type: 'text', maxlen: 46, size: 48, value: dns[1] || '' },
-		                 { title: '',           name: 'f_ipv6_dns_3', type: 'text', maxlen: 46, size: 48, value: dns[2] || '' },
+		                 { title: 'Static DNS', name: 'f_ipv6_dns_1', type: 'text', maxlen: 40, size: 42, value: dns[0] || '' },
+                         { title: '',           name: 'f_ipv6_dns_2', type: 'text', maxlen: 40, size: 42, value: dns[1] || '' },
+                         { title: '',           name: 'f_ipv6_dns_3', type: 'text', maxlen: 40, size: 42, value: dns[2] || '' },
 		                 { title: 'Accept RA from', multi: [
 		                     { suffix: '&nbsp; WAN &nbsp;&nbsp;&nbsp;', name: 'f_ipv6_accept_ra_wan', type: 'checkbox', value: (nvram.ipv6_accept_ra & 1) },
 		                     { suffix: '&nbsp; LAN &nbsp;',	name: 'f_ipv6_accept_ra_lan', type: 'checkbox', value: (nvram.ipv6_accept_ra & 2) }