From ac08e0cce975c761fe40de2d7ba107feb9bb0404 Mon Sep 17 00:00:00 2001
From: Phykris <phykris@none>
Date: Sun, 27 Feb 2011 05:16:37 +0700
Subject: [PATCH] fix "IP outside LAN" warning

---
 release/src/router/www/new-qoslimit.asp |   4 +-
 release/src/router/www/tomato.js        | 120 ++++++++++++++++++--------------
 2 files changed, 70 insertions(+), 54 deletions(-)

diff --git a/release/src/router/www/new-qoslimit.asp b/release/src/router/www/new-qoslimit.asp
index 4b942f600f..ea9da5d6bf 100644
--- a/release/src/router/www/new-qoslimit.asp
+++ b/release/src/router/www/new-qoslimit.asp
@@ -41,7 +41,7 @@
 <script type='text/javascript' src='debug.js'></script>
 
 <script type='text/javascript'>
-// <% nvram("new_qoslimit_enable,qos_ibw,qos_obw,new_qoslimit_rules"); %>
+// <% nvram("new_qoslimit_enable,qos_ibw,qos_obw,new_qoslimit_rules,lan_ipaddr,lan_netmask"); %>
 
 var class_prio = [['0','Highest'],['1','High'],['2','Normal'],['3','Low'],['4','Lowest']];
 var class_tcp = [['0','nolimit']];
@@ -156,7 +156,7 @@ qosg.verifyFields = function(row, quiet)
 		}
 	}
 */
-	if(v_macip(f[1], quiet, 0, 0)) {
+if(v_macip(f[1], quiet, 0, nvram.lan_ipaddr, nvram.lan_netmask)) {
 		if(this.existIP(f[1].value)) {
 			ferror.set(f[1], 'duplicate MAC address', quiet);
 			ok = 0;
diff --git a/release/src/router/www/tomato.js b/release/src/router/www/tomato.js
index e2260cf3c9..312364e7fa 100644
--- a/release/src/router/www/tomato.js
+++ b/release/src/router/www/tomato.js
@@ -407,59 +407,75 @@ function v_mins(e, quiet, min, max)
 	return 0;
 }
 
-function v_macip(e, quiet, bok, ipp)
-{
-	var s, a, b, c, d, i;
-
-	if ((e = E(e)) == null) return 0;
-	s = e.value.replace(/\s+/g, '');
-
-	if ((a = fixMAC(s)) != null) {
-		if (isMAC0(a)) {
-			if (bok) {
-				e.value = '';
-			}
-			else {
-				ferror.set(e, 'Invalid MAC or IP address');
-				return false;
-			}
-		}
+function v_macip(e, quiet, bok, lan_ipaddr, lan_netmask)
+{
+    var s, a, b, c, d, i;
+    var ipp, first_match, temp;
+
+    ipp = ntoa(aton(lan_ipaddr) & aton(lan_netmask));
+    temp = ipp.split('.');
+    ipp = '';
+    first_match = -1;
+    for (i=3;i>0;i--)
+    {
+        if (temp[i]!='0')
+        {    
+            first_match = i;
+            break;
+        }
+    }
+    for (i=0;i<=first_match;i++)
+        ipp = ipp + temp[i] + '.';
+
+    if ((e = E(e)) == null) return 0;
+    s = e.value.replace(/\s+/g, '');
+
+    if ((a = fixMAC(s)) != null) {
+        if (isMAC0(a)) {
+            if (bok) {
+                e.value = '';
+            }
+            else {
+                ferror.set(e, 'Invalid MAC or IP address');
+                return false;
+            }
+        }
         else e.value = a;
-		ferror.clear(e);
-		return true;
-	}
-
-	a = s.split('-');
-	if (a.length > 2) {
-		ferror.set(e, 'Invalid IP address range', quiet);
-		return false;
-	}
-	c = 0;
-	for (i = 0; i < a.length; ++i) {
-		b = a[i];
-		if (b.match(/^\d+$/)) b = ipp + b;
-
-		b = fixIP(b);
-		if (!b) {
-			ferror.set(e, 'Invalid IP address', quiet);
-			return false;
-		}
-
-		if (b.indexOf(ipp) != 0) {
-			ferror.set(e, 'IP address outside of LAN', quiet);
-			return false;
-		}
-
-		d = (b.split('.'))[3];
-		if (d <= c) {
-			ferror.set(e, 'Invalid IP address range', quiet);
-			return false;
-		}
-
-		a[i] = c = d;
-	}
-	e.value = ipp + a.join('-');
-	return true;
+        ferror.clear(e);
+        return true;
+    }
+
+    a = s.split('-');
+    if (a.length > 2) {
+        ferror.set(e, 'Invalid IP address range', quiet);
+        return false;
+    }
+    c = 0;
+    for (i = 0; i < a.length; ++i) {
+        b = a[i];    
+        if (b.match(/^\d+$/)) b = ipp + b;
+
+        b = fixIP(b);
+        if (!b) {
+            ferror.set(e, 'Invalid IP address', quiet);
+            return false;
+        }
+
+        if ((aton(b) & aton(lan_netmask))!=(aton(lan_ipaddr) & aton(lan_netmask))) {
+            ferror.set(e, 'IP address outside of LAN', quiet);
+            return false;
+        }
+
+        d = (b.split('.'))[3];
+        if (d <= c) {
+            ferror.set(e, 'Invalid IP address range', quiet);
+            return false;
+        }
+
+        a[i] = c = d;
+    }
+    e.value = b.split('.')[0] + '.' + b.split('.')[1] + '.' + b.split('.')[2] + '.' + a.join('-');
+    return true;
 }
 
 function fixIP(ip, x)
-- 
2.11.4.GIT