gandc/zapret2
Template
1
0
Fork 0
mirror of https://github.com/bol-van/zapret2.git synced 2026-03-14 06:13:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

nfqws2: reasm support negative overlaps without gaps and without going beyond the starting seq

Browse Source
This commit is contained in:
bol-van
2025-12-08 09:55:09 +03:00
parent 1a190fcf9e
commit 378ee514c4
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@@ -71,3 +71,4 @@ v0.6
* zapret-lib,zapret-antidpi: tls_mod_shim supports sni=%var subst
* blockcheck2: syndata tests
* nfqws2: reasm support negative overlaps without going beyond the starting seq. gaps are not supported.

15
nfq2/conntrack.c
View File

@@ -396,15 +396,20 @@ bool ReasmResize(t_reassemble *reasm, size_t new_size)
}
bool ReasmFeed(t_reassemble *reasm, uint32_t seq, const void *payload, size_t len)
{
if (reasm->seq != seq) return false; // fail session if out of sequence
uint32_t neg_overlap = reasm->seq - seq;
if ((seq > reasm->seq) || (neg_overlap > reasm->size_present))
return false; // fail session if a gap about to appear or negative overlap is beyond start position
size_t szcopy;
szcopy = reasm->size - reasm->size_present;
if (len < szcopy) szcopy = len;
memcpy(reasm->packet + reasm->size_present, payload, szcopy);
reasm->size_present += szcopy;
reasm->seq += (uint32_t)szcopy;
// in case of seq overlap new data replaces old - unix behavior
memcpy(reasm->packet + reasm->size_present - neg_overlap, payload, szcopy);
if (szcopy>neg_overlap)
{
reasm->size_present += szcopy - neg_overlap;
reasm->seq += (uint32_t)szcopy - neg_overlap;
}
return true;
}
bool ReasmHasSpace(t_reassemble *reasm, size_t len)