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: remove unneeded loop

Browse Source
This commit is contained in:
bol-van
2026-03-04 14:16:19 +03:00
parent 14a2548bf5
commit 55dc47bae4
1 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
nfq2/protocol.c
View File

@@ -1268,7 +1268,7 @@ bool QUICDefragCrypto(const uint8_t *clean,size_t clean_len, uint8_t *defrag,siz
size_t defrag_data_len = *defrag_len-10; size_t defrag_data_len = *defrag_len-10;
uint8_t ft; uint8_t ft;
uint64_t offset,sz,szmax=0,zeropos=0,pos=0,r1,r2; uint64_t offset,sz,szmax=0,zeropos=0,pos=0,r1,r2;
bool found=false, isect; bool found=false;
struct range64 ranges[MAX_DEFRAG_PIECES]; struct range64 ranges[MAX_DEFRAG_PIECES];
int i,j,range=0; int i,j,range=0;
@@ -1312,32 +1312,28 @@ bool QUICDefragCrypto(const uint8_t *clean,size_t clean_len, uint8_t *defrag,siz
{ {
//for(i=0 ; i<range ; i++) //for(i=0 ; i<range ; i++)
// printf("range1 %llu-%llu\n",ranges[i].offset,ranges[i].offset+ranges[i].len); // printf("range1 %llu-%llu\n",ranges[i].offset,ranges[i].offset+ranges[i].len);
do for(i=range-1 ; i>=0 ; i--)
{ {
for(isect=false, i=range-1 ; i>=0 ; i--) r1 = ranges[i].offset + ranges[i].len;
for(j=i-1 ; j>=0 ; j--)
{ {
r1 = ranges[i].offset + ranges[i].len; r2 = ranges[j].offset + ranges[j].len;
for(j=i-1 ; j>=0 ; j--) //printf("test intersect i=%d j=%d %llu-%llu %llu-%llu\n",i,j,ranges[i].offset,r1,ranges[j].offset,r2);
if (intersected_u64(ranges[i].offset,r1,ranges[j].offset,r2))
{ {
r2 = ranges[j].offset + ranges[j].len; // join range
//printf("test intersect i=%d j=%d %llu-%llu %llu-%llu\n",i,j,ranges[i].offset,r1,ranges[j].offset,r2); ranges[j].offset = MIN(ranges[i].offset, ranges[j].offset);
if (intersected_u64(ranges[i].offset,r1,ranges[j].offset,r2)) ranges[j].len = MAX(r1,r2) - ranges[j].offset;
{ // delete element i
// join range memmove(ranges+i, ranges+i+1, (range-i-1)*sizeof(*ranges));
isect = true; range--;
ranges[j].offset = MIN(ranges[i].offset, ranges[j].offset); //printf("intersected %llu-%llu\n",ranges[j].offset,ranges[j].offset+ranges[j].len);
ranges[j].len = MAX(r1,r2) - ranges[j].offset; //for(int k=0 ; k<range ; k++)
// delete element i // printf("rangeX %llu-%llu\n",ranges[k].offset,ranges[k].offset+ranges[k].len);
memmove(ranges+i, ranges+i+1, (range-i-1)*sizeof(*ranges)); break;
range--;
//printf("intersected %llu-%llu\n",ranges[j].offset,ranges[j].offset+ranges[j].len);
//for(int k=0 ; k<range ; k++)
// printf("rangeX %llu-%llu\n",ranges[k].offset,ranges[k].offset+ranges[k].len);
break;
}
} }
} }
} while(isect); }
//for(i=0 ; i<range ; i++) //for(i=0 ; i<range ; i++)
// printf("range2 %llu-%llu\n",ranges[i].offset,ranges[i].offset+ranges[i].len); // printf("range2 %llu-%llu\n",ranges[i].offset,ranges[i].offset+ranges[i].len);