gandc/zapret2
Template
1
0
Fork 0
mirror of https://github.com/bol-van/zapret2.git synced 2026-03-21 08:45:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

nfqws2: more fixes to reasm overlap support

Browse Source
This commit is contained in:
bol-van
2025-12-08 10:55:32 +03:00
parent 04cb71150a
commit c94264c79e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
nfq2/conntrack.c
View File

@@ -406,13 +406,13 @@ bool ReasmFeed(t_reassemble *reasm, uint32_t seq, const void *payload, size_t le
size_t szcopy, szignore;
szignore = (neg_overlap > reasm->size_present) ? neg_overlap - reasm->size_present : 0;
szcopy = reasm->size - reasm->size_present;
if (len < szcopy) szcopy = len;
if (szignore>=szcopy) return true; // everyting is before the starting pos
szcopy-=szignore;
neg_overlap-=szignore;
if (szignore>=len) return true; // everyting is before the starting pos
szcopy = len - szignore;
neg_overlap -= szignore;
if ((reasm->size_present - neg_overlap + szcopy) > reasm->size)
return false; // buffer overflow
// in case of seq overlap new data replaces old - unix behavior
memcpy(reasm->packet + reasm->size_present - neg_overlap, payload+szignore, szcopy);
memcpy(reasm->packet + reasm->size_present - neg_overlap, payload + szignore, szcopy);
if (szcopy>neg_overlap)
{
reasm->size_present += szcopy - neg_overlap;