mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 14:23:38 +00:00
89 lines
4.5 KiB
Diff
89 lines
4.5 KiB
Diff
--- a/frontends/nss/ecm_nss_ported_ipv4.c
|
|
+++ b/frontends/nss/ecm_nss_ported_ipv4.c
|
|
@@ -1213,7 +1213,6 @@ static void ecm_nss_ported_ipv4_connection_accelerate(struct ecm_front_end_conne
|
|
#else
|
|
struct nf_tcp_net *tn = nf_tcp_pernet(nf_ct_net(ct));
|
|
uint32_t tcp_be_liberal = tn->tcp_be_liberal;
|
|
- uint32_t tcp_no_window_check = tn->tcp_no_window_check;
|
|
#endif
|
|
ecm_db_connection_address_get(feci->ci, ECM_DB_OBJ_DIR_FROM, addr);
|
|
ecm_front_end_flow_and_return_directions_get(ct, addr, 4, &flow_dir, &return_dir);
|
|
@@ -1228,11 +1227,7 @@ static void ecm_nss_ported_ipv4_connection_accelerate(struct ecm_front_end_conne
|
|
nircm->tcp_rule.return_max_window = ct->proto.tcp.seen[return_dir].td_maxwin;
|
|
nircm->tcp_rule.return_end = ct->proto.tcp.seen[return_dir].td_end;
|
|
nircm->tcp_rule.return_max_end = ct->proto.tcp.seen[return_dir].td_maxend;
|
|
-#ifdef ECM_OPENWRT_SUPPORT
|
|
- if (tcp_be_liberal || tcp_no_window_check
|
|
-#else
|
|
if (tcp_be_liberal
|
|
-#endif
|
|
|| (ct->proto.tcp.seen[flow_dir].flags & IP_CT_TCP_FLAG_BE_LIBERAL)
|
|
|| (ct->proto.tcp.seen[return_dir].flags & IP_CT_TCP_FLAG_BE_LIBERAL)) {
|
|
nircm->rule_flags |= NSS_IPV4_RULE_CREATE_FLAG_NO_SEQ_CHECK;
|
|
--- a/frontends/nss/ecm_nss_ported_ipv6.c
|
|
+++ b/frontends/nss/ecm_nss_ported_ipv6.c
|
|
@@ -1133,7 +1133,6 @@ static void ecm_nss_ported_ipv6_connection_accelerate(struct ecm_front_end_conne
|
|
#else
|
|
struct nf_tcp_net *tn = nf_tcp_pernet(nf_ct_net(ct));
|
|
uint32_t tcp_be_liberal = tn->tcp_be_liberal;
|
|
- uint32_t tcp_no_window_check = tn->tcp_no_window_check;
|
|
#endif
|
|
ecm_front_end_flow_and_return_directions_get(ct, src_ip, 6, &flow_dir, &return_dir);
|
|
|
|
@@ -1147,11 +1146,7 @@ static void ecm_nss_ported_ipv6_connection_accelerate(struct ecm_front_end_conne
|
|
nircm->tcp_rule.return_max_window = ct->proto.tcp.seen[return_dir].td_maxwin;
|
|
nircm->tcp_rule.return_end = ct->proto.tcp.seen[return_dir].td_end;
|
|
nircm->tcp_rule.return_max_end = ct->proto.tcp.seen[return_dir].td_maxend;
|
|
-#ifdef ECM_OPENWRT_SUPPORT
|
|
- if (tcp_be_liberal || tcp_no_window_check
|
|
-#else
|
|
if (tcp_be_liberal
|
|
-#endif
|
|
|| (ct->proto.tcp.seen[flow_dir].flags & IP_CT_TCP_FLAG_BE_LIBERAL)
|
|
|| (ct->proto.tcp.seen[return_dir].flags & IP_CT_TCP_FLAG_BE_LIBERAL)) {
|
|
nircm->rule_flags |= NSS_IPV6_RULE_CREATE_FLAG_NO_SEQ_CHECK;
|
|
--- a/frontends/sfe/ecm_sfe_ported_ipv4.c
|
|
+++ b/frontends/sfe/ecm_sfe_ported_ipv4.c
|
|
@@ -1358,7 +1358,6 @@ static void ecm_sfe_ported_ipv4_connection_accelerate(struct ecm_front_end_conne
|
|
#else
|
|
struct nf_tcp_net *tn = nf_tcp_pernet(nf_ct_net(ct));
|
|
uint32_t tcp_be_liberal = tn->tcp_be_liberal;
|
|
- uint32_t tcp_no_window_check = tn->tcp_no_window_check;
|
|
#endif
|
|
ecm_db_connection_address_get(feci->ci, ECM_DB_OBJ_DIR_FROM, addr);
|
|
ecm_front_end_flow_and_return_directions_get(ct, addr, 4, &flow_dir, &return_dir);
|
|
@@ -1374,11 +1373,7 @@ static void ecm_sfe_ported_ipv4_connection_accelerate(struct ecm_front_end_conne
|
|
nircm->tcp_rule.return_end = ct->proto.tcp.seen[return_dir].td_end;
|
|
nircm->tcp_rule.return_max_end = ct->proto.tcp.seen[return_dir].td_maxend;
|
|
|
|
-#ifdef ECM_OPENWRT_SUPPORT
|
|
- if (tcp_be_liberal || tcp_no_window_check
|
|
-#else
|
|
if (tcp_be_liberal
|
|
-#endif
|
|
|| (ct->proto.tcp.seen[flow_dir].flags & IP_CT_TCP_FLAG_BE_LIBERAL)
|
|
|| (ct->proto.tcp.seen[return_dir].flags & IP_CT_TCP_FLAG_BE_LIBERAL)) {
|
|
nircm->rule_flags |= SFE_RULE_CREATE_FLAG_NO_SEQ_CHECK;
|
|
--- a/frontends/sfe/ecm_sfe_ported_ipv6.c
|
|
+++ b/frontends/sfe/ecm_sfe_ported_ipv6.c
|
|
@@ -1371,7 +1371,6 @@ static void ecm_sfe_ported_ipv6_connection_accelerate(struct ecm_front_end_conne
|
|
#else
|
|
struct nf_tcp_net *tn = nf_tcp_pernet(nf_ct_net(ct));
|
|
uint32_t tcp_be_liberal = tn->tcp_be_liberal;
|
|
- uint32_t tcp_no_window_check = tn->tcp_no_window_check;
|
|
#endif
|
|
ecm_front_end_flow_and_return_directions_get(ct, src_ip, 6, &flow_dir, &return_dir);
|
|
|
|
@@ -1385,11 +1384,7 @@ static void ecm_sfe_ported_ipv6_connection_accelerate(struct ecm_front_end_conne
|
|
nircm->tcp_rule.return_max_window = ct->proto.tcp.seen[return_dir].td_maxwin;
|
|
nircm->tcp_rule.return_end = ct->proto.tcp.seen[return_dir].td_end;
|
|
nircm->tcp_rule.return_max_end = ct->proto.tcp.seen[return_dir].td_maxend;
|
|
-#ifdef ECM_OPENWRT_SUPPORT
|
|
- if (tcp_be_liberal || tcp_no_window_check
|
|
-#else
|
|
if (tcp_be_liberal
|
|
-#endif
|
|
|| (ct->proto.tcp.seen[flow_dir].flags & IP_CT_TCP_FLAG_BE_LIBERAL)
|
|
|| (ct->proto.tcp.seen[return_dir].flags & IP_CT_TCP_FLAG_BE_LIBERAL)) {
|
|
nircm->rule_flags |= SFE_RULE_CREATE_FLAG_NO_SEQ_CHECK;
|