nfqws2: join fragments in quic CRYPTO reconstruction. allow intersections

.github/workflows/build.yml

@@ -250,6 +250,7 @@ jobs:
             arm64-v8a)
               # not safe without GC64
               SYSMALLOC=
+              PAGESIZE="-Wl,-z,max-page-size=16384"
               ;;
           esac
 
@@ -290,7 +291,7 @@ jobs:
 
           # zapret2
           CFLAGS="-DZAPRET_GH_VER=${{ github.ref_name }} -DZAPRET_GH_HASH=${{ github.sha }} -I$DEPS_DIR/include $CPU" \
-          LDFLAGS="-L$DEPS_DIR/lib" \
+          LDFLAGS="-L$DEPS_DIR/lib $PAGESIZE" \
           make -C zapret2 LUA_JIT=$LJIT LUA_CFLAGS="$LCFLAGS" LUA_LIB="$LLIB" -j$(nproc) android
 
           # strip unwanted ELF sections to prevent warnings on old Android versions

docs/changes.txt

@@ -270,5 +270,6 @@ v0.9.4.3
 0.9.4.5
 
 * github: rollback to lj_alloc in luajit for arm64 and mips64
+* github: use 16K page size for android arm64 build
 * nfqws2: join fragments in quic CRYPTO reconstruction. allow intersections.
 

nfq2/protocol.c

@@ -1252,10 +1252,12 @@ static int cmp_range64(const void * a, const void * b)
 {
 	return (((struct range64*)a)->offset < ((struct range64*)b)->offset) ? -1 : (((struct range64*)a)->offset > ((struct range64*)b)->offset) ? 1 : 0;
 }
+/*
 static bool intersected_u64(uint64_t l1, uint64_t r1, uint64_t l2, uint64_t r2)
 {
-	return l1>=l2 && l1<=r2 || r1>=l2 && r1<=r2 || l2>=l1 && l2<=r1 || r2>=l1 && r2<=r1;
+	return l1 <= r2 && l2 <= r1;
 }
+*/
 
 bool QUICDefragCrypto(const uint8_t *clean,size_t clean_len, uint8_t *defrag,size_t *defrag_len, bool *bFull)
 {
@@ -1267,8 +1269,8 @@ bool QUICDefragCrypto(const uint8_t *clean,size_t clean_len, uint8_t *defrag,siz
 	uint8_t *defrag_data = defrag+10;
 	size_t defrag_data_len = *defrag_len-10;
 	uint8_t ft;
-	uint64_t offset,sz,szmax=0,zeropos=0,pos=0,r1,r2;
-	bool found=false, isect;
+	uint64_t offset,sz,szmax=0,zeropos=0,pos=0;
+	bool found=false;
 	struct range64 ranges[MAX_DEFRAG_PIECES];
 	int i,j,range=0;
 
@@ -1292,54 +1294,53 @@ bool QUICDefragCrypto(const uint8_t *clean,size_t clean_len, uint8_t *defrag,siz
 			if ((pos+sz)>clean_len) return false;
 
 			if ((offset+sz)>defrag_data_len) return false; // defrag buf overflow
+
+			// remove exact duplicates early to save cpu
+			for(i=0;i<range;i++)
+				if (ranges[i].offset==offset && ranges[i].len==sz)
+					goto skip_range;
+
 			if (zeropos < offset)
 				// make sure no uninitialized gaps exist in case of not full fragment coverage
 				memset(defrag_data+zeropos,0,offset-zeropos);
 			if ((offset+sz) > zeropos)
 				zeropos=offset+sz;
 
-			memcpy(defrag_data+offset,clean+pos,sz);
-			if ((offset+sz) > szmax) szmax = offset+sz;
-
 			found=true;
-			pos+=sz;
+			if ((offset+sz) > szmax) szmax = offset+sz;
+			memcpy(defrag_data+offset,clean+pos,sz);
 			ranges[range].offset = offset;
 			ranges[range].len = sz;
 			range++;
+skip_range:
+			pos+=sz;
 		}
 	}
 	if (found)
 	{
-		//for(i=0 ; i<range ; i++)
-		//	printf("range1 %llu-%llu\n",ranges[i].offset,ranges[i].offset+ranges[i].len);
-		do
+		qsort(ranges, range, sizeof(*ranges), cmp_range64);
+
+//		for(i=0 ; i<range ; i++)
+//			printf("range1 %llu-%llu\n",ranges[i].offset,ranges[i].offset+ranges[i].len);
+
+		if (range>0)
 		{
-			for(isect=false, i=range-1 ; i>=0 ; i--)
+			for (j=0,i=1; i < range; i++)
 			{
-				r1 = ranges[i].offset + ranges[i].len;
-				for(j=i-1 ; j>=0 ; j--)
-				{
-					r2 = ranges[j].offset + ranges[j].len;
-					//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))
-					{
-						// join range
-						isect = true;
-						ranges[j].offset = MIN(ranges[i].offset, ranges[j].offset);
-						ranges[j].len = MAX(r1,r2) - ranges[j].offset;
-						// delete element i
-						memmove(ranges+i, ranges+i+1, (range-i-1)*sizeof(*ranges));
-						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;
-					}
-				}
+				uint64_t current_end = ranges[j].offset + ranges[j].len;
+				uint64_t next_start = ranges[i].offset;
+				uint64_t next_end = ranges[i].offset + ranges[i].len;
+
+				if (next_start <= current_end)
+					ranges[j].len = MAX(next_end,current_end) - ranges[j].offset;
+				else
+					ranges[++j] = ranges[i];
 			}
-		} while(isect);
-		//for(i=0 ; i<range ; i++)
-		//	printf("range2 %llu-%llu\n",ranges[i].offset,ranges[i].offset+ranges[i].len);
+			range = j+1;
+		}
+
+//		for(i=0 ; i<range ; i++)
+//			printf("range2 %llu-%llu\n",ranges[i].offset,ranges[i].offset+ranges[i].len);
 
 		defrag[0] = 6;
 		defrag[1] = 0; // offset
@@ -1372,6 +1373,8 @@ bool IsQUICInitial(const uint8_t *data, size_t len)
 	if (data[offset] > QUIC_MAX_CID_LENGTH) return false;
 	offset += 1 + data[offset];
 
+	if (offset>=len) return false;
+
 	// SCID
 	if (data[offset] > QUIC_MAX_CID_LENGTH) return false;
 	offset += 1 + data[offset];