From 870616169bce98c099f5bf273eb66e584db23de0 Mon Sep 17 00:00:00 2001
From: Lancethepants <lancethepants@linksysinfo.org>
Date: Wed, 13 Aug 2014 13:44:24 +0700
Subject: [PATCH] Add gui for Comcast DSCP fix.

Author: lancethepants
---
 release/src/router/httpd/tomato.c            | 1 +
 release/src/router/nvram/defaults.c          | 1 +
 release/src/router/rc/firewall.c             | 8 +++++---
 release/src/router/www/advanced-firewall.asp | 7 +++++--
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/release/src/router/httpd/tomato.c b/release/src/router/httpd/tomato.c
index afab92ffa3..5eb7b93aa5 100644
--- a/release/src/router/httpd/tomato.c
+++ b/release/src/router/httpd/tomato.c
@@ -748,6 +748,7 @@ static const nvset_t nvset_list[] = {
 	{ "block_loopback",		V_01				},
 	{ "nf_loopback",		V_NUM				},
 	{ "ne_syncookies",		V_01				},
+	{ "DSCP_fix_enable",		V_01				},
 	{ "ne_snat",			V_01				},
 	{ "dhcp_pass",			V_01				},
 #ifdef TCONFIG_EMF
diff --git a/release/src/router/nvram/defaults.c b/release/src/router/nvram/defaults.c
index e63c8cb829..d938fb5193 100644
--- a/release/src/router/nvram/defaults.c
+++ b/release/src/router/nvram/defaults.c
@@ -455,6 +455,7 @@ const defaults_t defaults[] = {
 	{ "udpxy_clients",		"3"				},
 	{ "udpxy_port",			"4022"			},
 	{ "ne_syncookies",		"0"				},	// tcp_syncookies
+	{ "DSCP_fix_enable",		"1"				},	// Comacst DSCP fix
 	{ "ne_snat",			"0"				},	// use SNAT instead of MASQUERADE
 	{ "dhcp_pass",			"1"				},	// allow DHCP responses
 	{ "ne_shlimit",			"0,3,60"			},
diff --git a/release/src/router/rc/firewall.c b/release/src/router/rc/firewall.c
index ebf43964de..81a8ae79e8 100644
--- a/release/src/router/rc/firewall.c
+++ b/release/src/router/rc/firewall.c
@@ -618,12 +618,14 @@ static void mangle_table(void)
 #endif
 		}
 // Reset Incoming DSCP to 0x00
+		if (nvram_match("DSCP_fix_enable", "1")) {
 #ifdef LINUX26
-		modprobe("xt_DSCP");
+			modprobe("xt_DSCP");
 #else
-		modprobe("ipt_DSCP");
+			modprobe("ipt_DSCP");
 #endif
-		ipt_write("-I PREROUTING -i %s -j DSCP --set-dscp 0\n", wanface);
+			ipt_write("-I PREROUTING -i %s -j DSCP --set-dscp 0\n", wanface);
+		}
 	}
 
 	ip46t_write("COMMIT\n");
diff --git a/release/src/router/www/advanced-firewall.asp b/release/src/router/www/advanced-firewall.asp
index 7107d222eb..97f365813c 100644
--- a/release/src/router/www/advanced-firewall.asp
+++ b/release/src/router/www/advanced-firewall.asp
@@ -26,7 +26,7 @@
 
 <script type='text/javascript'>
 
-//	<% nvram("block_wan,block_wan_limit,block_wan_limit_icmp,block_wan_limit_tr,nf_loopback,ne_syncookies,multicast_pass,multicast_lan,multicast_lan1,multicast_lan2,multicast_lan3,lan_ifname,lan1_ifname,lan2_ifname,lan3_ifname,udpxy_enable,udpxy_stats,udpxy_clients,udpxy_port,ne_snat"); %>
+//	<% nvram("block_wan,block_wan_limit,block_wan_limit_icmp,block_wan_limit_tr,nf_loopback,ne_syncookies,DSCP_fix_enable,multicast_pass,multicast_lan,multicast_lan1,multicast_lan2,multicast_lan3,lan_ifname,lan1_ifname,lan2_ifname,lan3_ifname,udpxy_enable,udpxy_stats,udpxy_clients,udpxy_port,ne_snat"); %>
 
 function verifyFields(focused, quiet)
 {
@@ -75,6 +75,7 @@ function save()
 	fom.block_wan_limit_tr.value = E('_f_icmp_limit_traceroute').value;
 
 	fom.ne_syncookies.value = E('_f_syncookies').checked ? 1 : 0;
+	fom.DSCP_fix_enable.value = E('_f_DSCP_fix_enable').checked ? 1 : 0;
 	fom.multicast_pass.value = E('_f_multicast').checked ? 1 : 0;
 /* VLAN-BEGIN */
 	fom.multicast_lan.value = E('_f_multicast_lan').checked ? 1 : 0;
@@ -112,6 +113,7 @@ function save()
 <input type='hidden' name='block_wan_limit_icmp'>
 <input type='hidden' name='block_wan_limit_tr'>
 <input type='hidden' name='ne_syncookies'>
+<input type='hidden' name='DSCP_fix_enable'>
 <input type='hidden' name='multicast_pass'>
 /* VLAN-BEGIN */
 <input type='hidden' name='multicast_lan'>
@@ -129,10 +131,11 @@ function save()
 <script type='text/javascript'>
 createFieldTable('', [
 	{ title: 'Respond to ICMP ping', name: 'f_icmp', type: 'checkbox', value: nvram.block_wan == '0' },
-	{ title: 'Limit PPS', indent: 2, name: 'f_icmp_limit', type: 'checkbox', value: nvram.block_wan_limit != '0' },
+	{ title: 'Limit packets per second', indent: 2, name: 'f_icmp_limit', type: 'checkbox', value: nvram.block_wan_limit != '0' },
 	{ title: 'ICMP', indent: 3, name: 'f_icmp_limit_icmp', type: 'text', maxlen: 3, size: 3, suffix: ' <small> request per second</small>', value: fixInt(nvram.block_wan_limit_icmp || 1, 1, 300, 5) },
 	{ title: 'Traceroute', indent: 3, name: 'f_icmp_limit_traceroute', type: 'text', maxlen: 3, size: 3, suffix: ' <small> request per second</small>', value: fixInt(nvram.block_wan_limit_tr || 5, 1, 300, 5) },
 	{ title: 'Enable SYN cookies', name: 'f_syncookies', type: 'checkbox', value: nvram.ne_syncookies != '0' }
+	{ title: 'Enable DSCP Fix', name: 'f_DSCP_fix_enable', type: 'checkbox', value: nvram.DSCP_fix_enable != '0', suffix: ' <small>Fixes Comcast incorrect DSCP</small>' }
 ]);
 </script>
 </div>
-- 
2.11.4.GIT