www: move mac_null to tomato.js as a global variable

release/src-rt-6.x.4708/router/www/advanced-wlanvifs.asp

@@ -282,7 +282,7 @@ wlg.onAdd = function() {
 		data[1] || '1',							/* bss_enabled */
 		data[3],							/* WL net mode */
 		data[2], 							/* nvram['wl'+u+'_ssid'] */
-		(eval('nvram["wl'+u+'_hwaddr"]')) || '00:00:00:00:00:00',	/* MAC addr */
+		(eval('nvram["wl'+u+'_hwaddr"]')) || mac_null,			/* MAC addr */
 		'0',								/* VIFs supported */
 		data[4],
 		data[5]								/* Wireless Filter */
@@ -1226,7 +1226,7 @@ function do_pre_submit_form(fom) {
 			s += 'nvram unset wl'+u+'_hwaddr\n';
 			// AB TODO: figure out what to do with pre-existing/set MAC addresses
 			if (vif >= 0) {
-				if ((vifs_defined[vif][9] == '00:00:00:00:00:00') || (vifs_defined[vif][9] == '')) {
+				if ((vifs_defined[vif][9] == mac_null) || (vifs_defined[vif][9] == '')) {
 					s += 'nvram unset wl'+u+'_hwaddr\n';
 				}
 			}
@@ -1452,7 +1452,7 @@ function escapeText(s) {
 						value: (eval('nvram["wl'+u+'_radio"]') == '1') && (eval('nvram["wl'+u+'_net_mode"]') != 'disabled') },
 					{ title: 'AP Isolation', name: 'f_wl'+u+'_ap_isolate', type: 'checkbox',
 						value: (eval('nvram["wl'+u+'_ap_isolate"]') == '1') },
-					{ title: 'MAC Address', text: '<a href="advanced-mac.asp">'+(eval('nvram["wl'+u+'_hwaddr"]') || '00:00:00:00:00:00')+'<\/a>' +
+					{ title: 'MAC Address', text: '<a href="advanced-mac.asp">'+(eval('nvram["wl'+u+'_hwaddr"]') || mac_null)+'<\/a>' +
 						' &nbsp; <b id="wl'+u+'_hwaddr_msg" style="display:none"><small>(warning: WL driver reports BSSID <a href="advanced-mac.asp">'+((typeof(wl_ifaces[wl_ifidxx(u)]) != 'undefined')? wl_ifaces[wl_ifidxx(u)][9] : '')+'<\/a>)<\/small><\/b>' },
 					{ title: 'Wireless Mode', name: 'f_wl'+u+'_mode', type: 'select',
 						options: wl_modes_available,
@@ -1553,8 +1553,8 @@ REMOVE-END */
 REMOVE-END */
 				for (var k = 0; k < 10; k += 2)	{
 					f.push({ title: (k ? '' : 'MAC Address'), indent: 2, multi: [
-						{ name: 'f_wl'+u+'_wds_'+k, type: 'text', maxlen: 17, size: 20, value: wds[k] || '00:00:00:00:00:00' },
-						{ name: 'f_wl'+u+'_wds_'+(k + 1), type: 'text', maxlen: 17, size: 20, value: wds[k + 1] || '00:00:00:00:00:00' } ] } );
+						{ name: 'f_wl'+u+'_wds_'+k, type: 'text', maxlen: 17, size: 20, value: wds[k] || mac_null },
+						{ name: 'f_wl'+u+'_wds_'+(k + 1), type: 'text', maxlen: 17, size: 20, value: wds[k + 1] || mac_null } ] } );
 				}
 
 				createFieldTable('', f);

release/src-rt-6.x.4708/router/www/basic-network.asp

@@ -1885,8 +1885,8 @@ REMOVE-END -->
 			wds = eval('nvram.wl'+u+'_wds').split(/\s+/);
 			for (i = 0; i < 10; i += 2) {
 				f.push({ title: (i ? '' : 'MAC Address'), indent: 2, multi: [
-					{ name: 'f_wl'+u+'_wds_'+i, type: 'text', maxlen: 17, size: 20, value: wds[i] || '00:00:00:00:00:00' },
-					{ name: 'f_wl'+u+'_wds_'+(i + 1), type: 'text', maxlen: 17, size: 20, value: wds[i + 1] || '00:00:00:00:00:00' } ] } );
+					{ name: 'f_wl'+u+'_wds_'+i, type: 'text', maxlen: 17, size: 20, value: wds[i] || mac_null },
+					{ name: 'f_wl'+u+'_wds_'+(i + 1), type: 'text', maxlen: 17, size: 20, value: wds[i + 1] || mac_null } ] } );
 			}
 			createFieldTable('', f);
 			W('<\/div>');

release/src-rt-6.x.4708/router/www/basic-static.asp

@@ -25,7 +25,6 @@
 //	<% nvram("lan_ipaddr,lan_netmask,dhcpd_static,dhcpd_startip,dhcpd_static_only,cstats_include"); %>
 
 var cprefix = 'basic_static';
-var mac_null = '00:00:00:00:00:00';
 
 if (nvram.lan_ipaddr.match(/^(\d+\.\d+\.\d+)\.(\d+)$/))
 	ipp = RegExp.$1 + '.';

release/src-rt-6.x.4708/router/www/basic-wfilter.asp

@@ -50,7 +50,7 @@ smg.resetNewEditor = function() {
 		}
 	}
 
-	f[0].value = '00:00:00:00:00:00';
+	f[0].value = mac_null;
 	f[1].value = '';
 }
 

release/src-rt-6.x.4708/router/www/status-devices.asp

@@ -38,7 +38,7 @@ function find(mac, ip) {
 	mac = mac.toUpperCase();
 	for (i = list.length - 1; i >= 0; --i) {
 		e = list[i];
-		if (((e.mac == mac) && ((e.ip == ip) || (e.ip == '') || (ip == null))) || ((e.mac == '00:00:00:00:00:00') && (e.ip == ip)))
+		if (((e.mac == mac) && ((e.ip == ip) || (e.ip == '') || (ip == null))) || ((e.mac == mac_null) && (e.ip == ip)))
 			return e;
 	}
 

release/src-rt-6.x.4708/router/www/tomato.js

@@ -19,6 +19,7 @@ var xifs = [['wan', 'lan', 'lan1', 'lan2', 'lan3', 'wan2'],['WAN0', 'LAN0', 'LAN
 /* MULTIWAN-BEGIN */
 var xifs = [['wan', 'lan', 'lan1', 'lan2', 'lan3', 'wan2', 'wan3', 'wan4'],['WAN0', 'LAN0', 'LAN1', 'LAN2', 'LAN3', 'WAN1', 'WAN2', 'WAN3']];
 /* MULTIWAN-END */
+var mac_null = '00:00:00:00:00:00';
 
 // -----------------------------------------------------------------------------
 
@@ -1193,7 +1194,7 @@ function v_path(e, quiet, required) {
 }
 
 function isMAC0(mac) {
-	return (mac == '00:00:00:00:00:00');
+	return (mac == mac_null);
 }
 
 // -----------------------------------------------------------------------------

release/src-rt-6.x.4708/router/www/wireless.js

@@ -242,7 +242,7 @@ function joinAddr(a) {
 	r = [];
 	for (i = 0; i < a.length; ++i) {
 		s = a[i];
-		if ((s != '00:00:00:00:00:00') && (s != '0.0.0.0')) r.push(s);
+		if ((s != mac_null) && (s != '0.0.0.0')) r.push(s);
 	}
 
 	return r.join(' ');