From 0df5133ef2af1b293770f254a394b3661c4266ad Mon Sep 17 00:00:00 2001
From: Vicente <victek@tomatoraf.com>
Date: Tue, 15 Oct 2013 17:54:50 +0200
Subject: [PATCH] www: Changes for ipv6 menu, build options, Remote access with
 dmz enabled. BW limiter.

---
 release/src/router/snmp/agent/helpers/Makefile |   2 +-
 release/src/router/www/Makefile                |   4 +-
 release/src/router/www/basic-ipv6.asp          |   2 +-
 release/src/router/www/forward-dmz.asp         |  11 +-
 release/src/router/www/qoslimit.asp            | 289 -------------------------
 release/src/router/www/status-devices.asp      |   8 +-
 release/src/router/www/tomato.js               |   2 +-
 7 files changed, 18 insertions(+), 300 deletions(-)
 delete mode 100644 release/src/router/www/qoslimit.asp

diff --git a/release/src/router/snmp/agent/helpers/Makefile b/release/src/router/snmp/agent/helpers/Makefile
index a9fe54fdb7..d7684223cf 100644
--- a/release/src/router/snmp/agent/helpers/Makefile
+++ b/release/src/router/snmp/agent/helpers/Makefile
@@ -42,7 +42,7 @@ AUTOHEADER	= :
 #
 # Compiler arguments
 #
-CFLAGS		= -Os -Wall -DLINUX26 -DCONFIG_BCMWL5 -pipe -DBCMWPA2 -funit-at-a-time -Wno-pointer-sign -mtune=mips32 -mips32   -Dlinux 
+CFLAGS		= -Os -Wall -DLINUX26 -DCONFIG_BCMWL5 -pipe -DBCMWPA2 -funit-at-a-time -Wno-pointer-sign -mtune=mips32r2 -mips32r2   -Dlinux 
 EXTRACPPFLAGS	= -x c
 LDFLAGS		=  
 LIBTOOL		= $(SHELL) $(top_builddir)/libtool 
diff --git a/release/src/router/www/Makefile b/release/src/router/www/Makefile
index bdaee7165c..61358ae7db 100644
--- a/release/src/router/www/Makefile
+++ b/release/src/router/www/Makefile
@@ -77,9 +77,8 @@ ifneq ($(TCONFIG_EMF),y)
 	sed -i $(INSTALLDIR)/www/advanced-routing.asp -e "/EMF-BEGIN/,/EMF-END/d"
 endif
 
-# Only include extra themes if USB Extras are configured in.
+# Only include if USB configured in.
 ifneq ($(TCONFIG_USB_EXTRAS),y)
-	sed -i $(INSTALLDIR)/www/admin-access.asp -e "/THEMES-BEGIN/,/THEMES-END/d"
 	sed -i $(INSTALLDIR)/www/nas-usb.asp -e "/EXTRAS-BEGIN/,/EXTRAS-END/d"
 endif
 
@@ -140,6 +139,7 @@ endif
 # Only include the USB and NAS pages if USB Support is configured in.
 ifneq ($(TCONFIG_USB),y)
 	rm -f $(INSTALLDIR)/www/nas-*.*
+	sed -i $(INSTALLDIR)/www/basic-network.asp -e "/USB-BEGIN/,/USB-END/d"
 	sed -i $(INSTALLDIR)/www/tomato.js -e "/USB-BEGIN/,/USB-END/d"
 	sed -i $(INSTALLDIR)/www/admin-buttons.asp -e "/USB-BEGIN/,/USB-END/d"
 	sed -i $(INSTALLDIR)/www/admin-access.asp -e "/USB-BEGIN/,/USB-END/d"
diff --git a/release/src/router/www/basic-ipv6.asp b/release/src/router/www/basic-ipv6.asp
index ce6204ef1b..6c7b45b93f 100644
--- a/release/src/router/www/basic-ipv6.asp
+++ b/release/src/router/www/basic-ipv6.asp
@@ -107,10 +107,10 @@ function verifyFields(focused, quiet)
 			vis._f_ipv6_prefix = 0;
 			vis._f_ipv6_rtr_addr_auto = 0;
 			vis._f_ipv6_rtr_addr = 0;
-			vis._f_ipv6_accept_ra_wan = 0;
 			if (c == '6rd-pd') {
 				vis._f_ipv6_prefix_length = 0;
 				vis._f_ipv6_accept_ra_lan = 0;
+				vis._f_ipv6_accept_ra_wan = 0;
 			}
 			// fall through
 		case 'native':
diff --git a/release/src/router/www/forward-dmz.asp b/release/src/router/www/forward-dmz.asp
index e80b63da87..8add715753 100644
--- a/release/src/router/www/forward-dmz.asp
+++ b/release/src/router/www/forward-dmz.asp
@@ -24,7 +24,7 @@
 
 <script type='text/javascript'>
 
-//	<% nvram("dmz_enable,dmz_ipaddr,dmz_sip,dmz_ifname,lan_ifname,lan1_ifname,lan2_ifname,lan3_ifname"); %>
+//	<% nvram("dmz_enable,dmz_ipaddr,dmz_sip,dmz_ifname,dmz_ra,lan_ifname,lan1_ifname,lan2_ifname,lan3_ifname"); %>
 
 var lipp = '<% lipp(); %>.';
 
@@ -40,6 +40,9 @@ function verifyFields(focused, quiet)
 	sip = E('_f_dmz_sip');
 	sip.disabled = off;
 
+	sip = E('_f_dmz_ra');
+	sip.disabled = off;
+
 /* VLAN-BEGIN */
 	var dif = E('_dmz_ifname');
 	dif.disabled = off;
@@ -77,6 +80,7 @@ function save()
 		fom.dmz_ipaddr.value = (s.indexOf(lipp) == 0) ? s.replace(lipp, '') : s;
 	}
 	fom.dmz_sip.value = fom.f_dmz_sip.value.split(/\s*,\s*/).join(',');
+	fom.dmz_ra.value = E('_f_dmz_ra').checked ? 1 : 0;
 	form.submit(fom, 0);
 }
 
@@ -118,6 +122,7 @@ function init() {
 <input type='hidden' name='dmz_enable'>
 <input type='hidden' name='dmz_ipaddr'>
 <input type='hidden' name='dmz_sip'>
+<input type='hidden' name='dmz_ra'>
 
 <div class='section-title'>DMZ</div>
 <div class='section'>
@@ -131,7 +136,9 @@ createFieldTable('', [
 		options: [['br0','LAN (br0)'],['br1','LAN1  (br1)'],['br2','LAN2 (br2)'],['br3','LAN3 (br3)']], value: nvram.dmz_ifname },
 /* VLAN-END */
 	{ title: 'Source Address<br>Restriction', indent: 2, name: 'f_dmz_sip', type: 'text', maxlen: 512, size: 64,
-		value: nvram.dmz_sip, suffix: '<br><small>(optional; ex: "1.1.1.1", "1.1.1.0/24", "1.1.1.1 - 2.2.2.2" or "me.example.com")</small>' }
+		value: nvram.dmz_sip, suffix: '<br><small>(optional; ex: "1.1.1.1", "1.1.1.0/24", "1.1.1.1 - 2.2.2.2" or "me.example.com")</small>' },
+	null,
+	{ title: 'Leave Remote Access', indent: 2, name: 'f_dmz_ra', type: 'checkbox', value: (nvram.dmz_ra == '1'), suffix: ' &nbsp;<small>(Redirect remote access ports for SSH and HTTP(s) to router)</small>' }
 ]);
 </script>
 </div>
diff --git a/release/src/router/www/qoslimit.asp b/release/src/router/www/qoslimit.asp
deleted file mode 100644
index 48ab70730c..0000000000
--- a/release/src/router/www/qoslimit.asp
+++ /dev/null
@@ -1,289 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.0//EN'>
-<!--
-	Tomato GUI
-	Copyright (C) 2006-2008 Jonathan Zarate
-	http://www.polarcloud.com/tomato/
-
-	Copyright (C) 2011 Deon 'PrinceAMD' Thomas 
-	rate limit & connection limit from Conanxu, 
-	adapted by Victek, Shibby, PrinceAMD, Phykris
-
-	For use with Tomato Firmware only.
-	No part of this file may be used without permission.
--->
-<html>
-<head>
-<meta http-equiv='content-type' content='text/html;charset=utf-8'>
-<meta name='robots' content='noindex,nofollow'>
-<title>[<% ident(); %>] Bandwidth Limiter</title>
-<link rel='stylesheet' type='text/css' href='tomato.css'>
-<link rel='stylesheet' type='text/css' href='color.css'>
-<script type='text/javascript' src='tomato.js'></script>
-
-<!-- / / / -->
-<style type='text/css'>
-#qosg-grid {
-	width: 100%;
-}
-#qosg-grid .co1 {
-	width: 30%;
-}
-#qosg-grid .co2,
-#qosg-grid .co3,
-#qosg-grid .co4,
-#qosg-grid .co5,
-#qosg-grid .co6,
-#qosg-grid .co7,
-#qosg-grid .co8 {
-	width: 10%;
-}
-</style>
-
-<script type='text/javascript' src='debug.js'></script>
-
-<script type='text/javascript'>
-// <% nvram("qosl_enable,qos_ibw,qos_obw,qosl_rules,lan_ipaddr,lan_netmask"); %>
-
-var class_prio = [['0','Highest'],['1','High'],['2','Normal'],['3','Low'],['4','Lowest']];
-var class_tcp = [['0','nolimit']];
-var class_udp = [['0','nolimit']];
-for (var i = 1; i <= 100; ++i) {
-	class_tcp.push([i*10, i*10+'']);
-	class_udp.push([i, i + '/s']);
-}
-var qosg = new TomatoGrid();
-
-qosg.setup = function() {
-	this.init('qosg-grid', '', 80, [
-		{ type: 'text', maxlen: 31 },
-		{ type: 'text', maxlen: 6 },
-		{ type: 'text', maxlen: 6 },
-		{ type: 'text', maxlen: 6 },
-		{ type: 'text', maxlen: 6 },
-		{ type: 'select', options: class_prio },
-		{ type: 'select', options: class_tcp },
-		{ type: 'select', options: class_udp }]);
-	this.headerSet(['IP or IP Range or MAC Address', 'DLRate', 'DLCeil', 'ULRate', 'ULCeil', 'Priority', 'TCP Limit', 'UDP Limit']);
-	var qoslimitrules = nvram.qosl_rules.split('>');
-	for (var i = 0; i < qoslimitrules.length; ++i) {
-		var t = qoslimitrules[i].split('<');
-		if (t.length == 8) this.insertData(-1, t);
-	}
-	this.showNewEditor();
-	this.resetNewEditor();
-}
-
-qosg.dataToView = function(data) {
-	return [data[0],data[1]+'kbps',data[2]+'kbps',data[3]+'kbps',data[4]+'kbps',class_prio[data[5]*1][1],class_tcp[data[6]*1/10][1],class_udp[data[7]*1][1]];
-}
-
-qosg.resetNewEditor = function() {
-	var f, c, n;
-
-	var f = fields.getAll(this.newEditor);
-	ferror.clearAll(f);
-	if ((c = cookie.get('addqoslimit')) != null) {
-		cookie.set('addqoslimit', '', 0);
-		c = c.split(',');
-		if (c.length == 2) {
-	f[0].value = c[0];
-	f[1].value = '';
-	f[2].value = '';
-	f[3].value = '';
-	f[4].value = '';
-	f[5].selectedIndex = '2';
-	f[6].selectedIndex = '0';
-	f[7].selectedIndex = '0';
-	return;
-		}
-	}
-
-	f[0].value = '';
-	f[1].value = '';
-	f[2].value = '';
-	f[3].value = '';
-	f[4].value = '';
-	f[5].selectedIndex = '2';
-	f[6].selectedIndex = '0';
-	f[7].selectedIndex = '0';
-	
-	}
-
-qosg.exist = function(f, v)
-{
-	var data = this.getAllData();
-	for (var i = 0; i < data.length; ++i) {
-		if (data[i][f] == v) return true;
-	}
-	return false;
-}
-
-qosg.existID = function(id)
-{
-	return this.exist(0, id);
-}
-
-qosg.existIP = function(ip)
-{
-	if (ip == "0.0.0.0") return true;
-	return this.exist(1, ip);
-}
-
-qosg.checkRate = function(rate)
-{
-	var s = parseInt(rate, 10);
-	if( isNaN(s) || s <= 0 || a >= 100000 ) return true;
-	return false;
-}
-
-qosg.checkRateCeil = function(rate, ceil)
-{
-	var r = parseInt(rate, 10);
-	var c = parseInt(ceil, 10);
-	if( r > c ) return true;
-	return false;
-}
-
-qosg.verifyFields = function(row, quiet)
-{
-	var ok = 1;
-	var f = fields.getAll(row);
-	var s;
-
-	if(v_macip(f[0], quiet, 0, nvram.lan_ipaddr, nvram.lan_netmask)) {
-		if(this.existIP(f[0].value)) {
-			ferror.set(f[0], 'duplicate IP or MAC address', quiet);
-			ok = 0;
-		}
-	}
-     
-	if( this.checkRate(f[1].value)) {
-		ferror.set(f[1], 'DLRate must between 1 and 99999', quiet);
-		ok = 0;
-	}
-
-	if( this.checkRate(f[2].value)) {
-		ferror.set(f[2], 'DLCeil must between 1 and 99999', quiet);
-		ok = 0;
-	}
-
-	if( this.checkRateCeil(f[1].value, f[2].value)) {
-		ferror.set(f[2], 'DLCeil must be greater than DLRate', quiet);
-		ok = 0;
-	}
-
-	if( this.checkRate(f[3].value)) {
-		ferror.set(f[3], 'ULRate must between 1 and 99999', quiet);
-		ok = 0;
-	}
-
-	if( this.checkRate(f[4].value)) {
-		ferror.set(f[4], 'ULCeil must between 1 and 99999', quiet);
-		ok = 0;
-	}
-
-	if( this.checkRateCeil(f[3].value, f[4].value)) {
-		ferror.set(f[4], 'ULCeil must be greater than ULRate', quiet);
-		ok = 0;
-	}
-
-	return ok;
-}
-
-function verifyFields(focused, quiet)
-{
-	var a = !E('_f_qosl_enable').checked;
-
-	E('_qos_ibw').disabled = a;
-	E('_qos_obw').disabled = a;
-
-	elem.display(PR('_qos_ibw'), PR('_qos_obw'), !a);
-
-	return 1;
-}
-
-function save()
-{
-	if (qosg.isEditing()) return;
-
-	var data = qosg.getAllData();
-	var qoslimitrules = '';
-	var i;
-
-    if (data.length != 0) qoslimitrules += data[0].join('<');	
-	for (i = 1; i < data.length; ++i) {
-		qoslimitrules += '>' + data[i].join('<');
-	}
-
-	var fom = E('_fom');
-	fom.qosl_enable.value = E('_f_qosl_enable').checked ? 1 : 0;
-	fom.qosl_rules.value = qoslimitrules;
-	form.submit(fom, 1);
-}
-
-function init()
-{
-	qosg.recolor();
-}
-</script>
-</head>
-<body onload='init()'>
-<form id='_fom' method='post' action='tomato.cgi'>
-<table id='container' cellspacing=0>
-<tr><td colspan=2 id='header'>
-	<div class='title'>Tomato</div>
-	<div class='version'>Version <% version(); %></div>
-</td></tr>
-<tr id='body'><td id='navi'><script type='text/javascript'>navi()</script></td>
-<td id='content'>
-<div id='ident'><% ident(); %></div>
-
-<!-- / / / -->
-
-<input type='hidden' name='_nextpage' value='qos-qoslimit.asp'>
-<input type='hidden' name='_nextwait' value='10'>
-<input type='hidden' name='_service' value='qoslimit-restart'>
-
-<input type='hidden' name='qosl_enable'>
-<input type='hidden' name='qosl_rules'>
-
-<div id='qoslimit'>
-
-	<div class='section-title'>Bandwidth Limiter</div>
-	<div class='section'>
-		<script type='text/javascript'>
-			createFieldTable('', [
-			{ title: 'Enable Limiter', name: 'f_qosl_enable', type: 'checkbox', suffix: ' <i>(BW Limiter and QoS cannot work at once!)</i>', value: nvram.qosl_enable != '0' },
-			{ title: 'Max Download Bandwidth <small>(same as used by QOS)', name: 'qos_ibw', type: 'text', maxlen: 6, size: 8, suffix: ' <small>kbit/s</small>', value: nvram.qos_ibw },
-			{ title: 'Max Upload Bandwidth <small>(same as used by QOS)', name: 'qos_obw', type: 'text', maxlen: 6, size: 8, suffix: ' <small>kbit/s</small>', value: nvram.qos_obw }
-			]);
-		</script>
-		<br>
-		<table class='tomato-grid' id='qosg-grid'></table>
-		<div>
-			<ul>
-				<li><b>IP Address / IP Range:</b>
-				<li>Example: 192.168.1.5 for one IP.
-				<li>Example: 192.168.1.4-7 for IP 192.168.1.4 to 192.168.1.7
-				<li>Example: 4-7 for IP Range .4 to .7
-				<li><b>The IP Range devices will share the Bandwidth</b>
-				<li><b>MAC Address</b> Example: 00:2E:3C:6A:22:D8
-			</ul>
-		</div>
-	</div>
-	
-	<br>
-
-<!-- / / / -->
-
-</td></tr>
-<tr><td id='footer' colspan=2>
-	<span id='footer-msg'></span>
-	<input type='button' value='Save' id='save-button' onclick='save()'>
-	<input type='button' value='Cancel' id='cancel-button' onclick='reloadPage();'>
-</td></tr>
-</table>
-</form>
-<script type='text/javascript'>qosg.setup(); verifyFields(null, 1);</script>
-</body>
-</html>
diff --git a/release/src/router/www/status-devices.asp b/release/src/router/www/status-devices.asp
index a9c8075026..0b813d27b2 100644
--- a/release/src/router/www/status-devices.asp
+++ b/release/src/router/www/status-devices.asp
@@ -151,11 +151,11 @@ function addWF(n)
 	location.href = 'basic-wfilter.asp';
 }
 
-function addqoslimit(n)
+function addbwlimit(n)
 {
 	var e = list[n];
-	cookie.set('addqoslimit', [e.ip, e.name.split(',')[0]].join(','), 1);
-	location.href = 'qoslimit.asp';
+	cookie.set('addbwlimit', [e.ip, e.name.split(',')[0]].join(','), 1);
+	location.href = 'bwlimit.asp';
 }
 
 var ref = new TomatoRefresh('update.cgi', 'exec=devlist', 0, 'status_devices_refresh');
@@ -292,7 +292,7 @@ dg.populate = function()
 			b += '<br><small>' +
 				'<a href="http://standards.ieee.org/cgi-bin/ouisearch?' + RegExp.$1 + '-' + RegExp.$2 + '-' + RegExp.$3 + '" target="_new" title="OUI Search">[oui]</a> ' +
 				'<a href="javascript:addStatic(' + i + ')" title="Static Lease...">[static]</a>' +
-				'<a href="javascript:addqoslimit(' + i + ')" title="QoS BW Limiter">[qoslimit]</a>';
+				'<a href="javascript:addbwlimit(' + i + ')" title="QoS BW Limiter">[BWlimit]</a>';
 
 			if (e.rssi != '') {
 				b += ' <a href="javascript:addWF(' + i + ')" title="Wireless Filter...">[wfilter]</a>';
diff --git a/release/src/router/www/tomato.js b/release/src/router/www/tomato.js
index dbcb0a5b0b..08029565a7 100644
--- a/release/src/router/www/tomato.js
+++ b/release/src/router/www/tomato.js
@@ -2416,7 +2416,7 @@ REMOVE-END */
 		
 		['Access Restriction',		'restrict.asp'],
 		null,
-		['Bandwidth Limiter',		'qoslimit.asp'], 
+		['Bandwidth Limiter',		'bwlimit.asp'], 
 		/* NOCAT-BEGIN */
 		['Captive Portal',		'splashd.asp'],
 /* NOCAT-END */
-- 
2.11.4.GIT