qos: workaround for bug in restore-mark

john9527 · Aug 3, 2016 · 92e88b8 · 92e88b8
1 parent da9e1f9
commit 92e88b8
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/release/src/router/rc/qos.c b/release/src/router/rc/qos.c
@@ -256,7 +256,7 @@ int add_qos_rules(char *pcWANIF)
 		":OUTPUT ACCEPT [0:0]\n"
 		":QOSO - [0:0]\n"
 		"%s\n" //NAT Loopback
-		"-A QOSO -j CONNMARK --restore-mark --mask 0x7\n"
+		"-A QOSO -m conntrack --ctstate RELATED,ESTABLISHED -j CONNMARK --restore-mark --mask 0x7\n"
 		"-A QOSO -m connmark ! --mark 0/0xff00 -j RETURN\n"
 		, (nvram_get_int("fw_nat_loopback") ? "" : "-A QOSO -m mark --mark 0x8000/0x8000 -j RETURN")
 		);
@@ -267,7 +267,7 @@ int add_qos_rules(char *pcWANIF)
 		":PREROUTING ACCEPT [0:0]\n"
 		":OUTPUT ACCEPT [0:0]\n"
 		":QOSO - [0:0]\n"
-		"-A QOSO -j CONNMARK --restore-mark --mask 0x7\n"
+		"-A QOSO -m conntrack --ctstate RELATED,ESTABLISHED -j CONNMARK --restore-mark --mask 0x7\n"
 		"-A QOSO -m connmark ! --mark 0/0xff00 -j RETURN\n"
 		);
 #endif
@@ -781,13 +781,13 @@ int add_qos_rules(char *pcWANIF)
                 if ((!g) || ((p = strsep(&g, ",")) == NULL)) continue;
                 if ((inuse & (1 << i)) == 0) continue;
                 if (atoi(p) > 0) {
-                        fprintf(fn, "-A PREROUTING -i %s -j CONNMARK --restore-mark --mask 0x7\n", pcWANIF);
+                        fprintf(fn, "-A PREROUTING -i %s -m conntrack --ctstate RELATED,ESTABLISHED -j CONNMARK --restore-mark --mask 0x7\n", pcWANIF);
 #ifdef CLS_ACT
 			fprintf(fn, "-A PREROUTING -i %s -j IMQ --todev 0\n", pcWANIF);
 #endif
 #ifdef RTCONFIG_IPV6
 			if (ipv6_enabled() && *wan6face) {
-				fprintf(fn_ipv6, "-A PREROUTING -i %s -j CONNMARK --restore-mark --mask 0x7\n", wan6face);
+				fprintf(fn_ipv6, "-A PREROUTING -i %s -m conntrack --ctstate RELATED,ESTABLISHED -j CONNMARK --restore-mark --mask 0x7\n", wan6face);
 #ifdef CLS_ACT
 				fprintf(fn_ipv6, "-A PREROUTING -i %s -j IMQ --todev 0\n", wan6face);
 #endif