nfqws: allow resetting conntrack entry in any state on SYN

4 years ago · 17867c25b7
9 changed files with 5 additions and 8 deletions
--- a/binaries/aarch64/nfqws
+++ b/binaries/aarch64/nfqws
--- a/binaries/arm/nfqws
+++ b/binaries/arm/nfqws
--- a/binaries/mips32r1-lsb/nfqws
+++ b/binaries/mips32r1-lsb/nfqws
--- a/binaries/mips32r1-msb/nfqws
+++ b/binaries/mips32r1-msb/nfqws
--- a/binaries/mips64r2-msb/nfqws
+++ b/binaries/mips64r2-msb/nfqws
--- a/binaries/ppc/nfqws
+++ b/binaries/ppc/nfqws
--- a/binaries/x86/nfqws
+++ b/binaries/x86/nfqws
--- a/binaries/x86_64/nfqws
+++ b/binaries/x86_64/nfqws
--- a/nfq/conntrack.c
+++ b/nfq/conntrack.c
@ -126,17 +126,14 @@ static void ConntrackFeedPacket(t_ctrack *t, bool bReverse, const struct tcphdr
 	uint8_t scale;
 	if (tcp_syn_segment(tcphdr))
 	{
-		if (t->state==FIN) ConntrackInitTrack(t); // erase current entry
-		if (t->state==SYN) t->seq0 = htonl(tcphdr->th_seq);
+		ConntrackInitTrack(t); // erase current entry
+		t->seq0 = htonl(tcphdr->th_seq);
 	}
 	else if (tcp_synack_segment(tcphdr))
 	{
-		if (t->state==FIN) ConntrackInitTrack(t); // erase current entry
-		if (t->state==SYN) 
-		{
-			if (!t->seq0) t->seq0 = htonl(tcphdr->th_ack)-1;
-			t->ack0 = htonl(tcphdr->th_seq);
-		}
+		ConntrackInitTrack(t); // erase current entry
+		if (!t->seq0) t->seq0 = htonl(tcphdr->th_ack)-1;
+		t->ack0 = htonl(tcphdr->th_seq);
 	}
 	else if (tcphdr->th_flags & (TH_FIN|TH_RST))
 	{