hacker07/NeoTachyon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge: объединить изменения из upstream forkop в tachyon, разрешить конфликты и исправить тесты E2E

Browse Source
This commit is contained in:
Dushnilin
2026-07-15 17:56:18 +03:00
parent f0d6af0d6f daa0853382
commit 509cf128b8
55 changed files with 788 additions and 648 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/mark_ranges.sh
+18 -4
View File
@@ -44,10 +44,16 @@ assert_mark_range_no_overlap() {
eval "$(ucode -L "$TACHYON_LIB" "$TACHYON_LIB/core/constants.uc" shell-env)"
TAILSCALE_FWMARK_MASK=0x00ff0000
assert_no_overlap "FakeIP" "$((NFT_FAKEIP_MARK))" "$((TAILSCALE_FWMARK_MASK))" "Tailscale"
assert_no_overlap "outbound" "$((NFT_OUTBOUND_MARK))" "$((TAILSCALE_FWMARK_MASK))" "Tailscale"
assert_mark_range_no_overlap "Zapret" "$((ZAPRET_ROUTE_MARK_BASE))" "$ZAPRET_QUEUE_RANGE_SIZE" "$((NFT_FAKEIP_MARK))" "FakeIP"
assert_mark_range_no_overlap "Zapret" "$((ZAPRET_ROUTE_MARK_BASE))" "$ZAPRET_QUEUE_RANGE_SIZE" "$((NFT_OUTBOUND_MARK))" "outbound"
assert_mark_range_no_overlap "Zapret2" "$((ZAPRET2_ROUTE_MARK_BASE))" "$ZAPRET2_QUEUE_RANGE_SIZE" "$((NFT_FAKEIP_MARK))" "FakeIP"
assert_mark_range_no_overlap "Zapret2" "$((ZAPRET2_ROUTE_MARK_BASE))" "$ZAPRET2_QUEUE_RANGE_SIZE" "$((NFT_OUTBOUND_MARK))" "outbound"
assert_mark_range_no_overlap "Zapret" "$((ZAPRET_ROUTE_MARK_BASE))" "$ZAPRET_QUEUE_RANGE_SIZE" "$((TAILSCALE_FWMARK_MASK))" "Tailscale"
assert_mark_range_no_overlap "Zapret2" "$((ZAPRET2_ROUTE_MARK_BASE))" "$ZAPRET2_QUEUE_RANGE_SIZE" "$((TAILSCALE_FWMARK_MASK))" "Tailscale"
cat >"$WORK_DIR/fixture.json" <<'JSON'
{
@@ -57,6 +63,8 @@ JSON
context_json() {
local zapret2_base="${1:-$ZAPRET2_ROUTE_MARK_BASE}"
local fakeip_mark="${2:-$NFT_FAKEIP_MARK}"
local outbound_mark="${3:-$NFT_OUTBOUND_MARK}"
cat <<JSON
{
@@ -72,16 +80,22 @@ context_json() {
"zapret_queue_range_size": "$ZAPRET_QUEUE_RANGE_SIZE",
"zapret2_route_mark_base": "$zapret2_base",
"zapret2_queue_range_size": "$ZAPRET2_QUEUE_RANGE_SIZE",
"nft_fakeip_mark": "$NFT_FAKEIP_MARK",
"nft_outbound_mark": "$NFT_OUTBOUND_MARK"
"nft_fakeip_mark": "$fakeip_mark",
"nft_outbound_mark": "$outbound_mark"
}
JSON
}
TACHYON_LIB="$TACHYON_LIB" ucode -L "$TACHYON_LIB" "$VALIDATOR" validate-runtime-fixture "$WORK_DIR/fixture.json" "$(context_json)"
if TACHYON_LIB="$TACHYON_LIB" ucode -L "$TACHYON_LIB" "$VALIDATOR" validate-runtime-fixture "$WORK_DIR/fixture.json" "$(context_json "0x01100000")" >/dev/null 2>&1; then
fail "legacy Zapret2 route mark base should overlap FakeIP mark"
if TACHYON_LIB="$TACHYON_LIB" ucode -L "$TACHYON_LIB" "$VALIDATOR" validate-runtime-fixture "$WORK_DIR/fixture.json" "$(context_json "0x01010000")" >/dev/null 2>&1; then
fail "legacy Zapret2 route mark base should overlap Tailscale fwmark mask"
fi
if TACHYON_LIB="$TACHYON_LIB" ucode -L "$TACHYON_LIB" "$VALIDATOR" validate-runtime-fixture "$WORK_DIR/fixture.json" "$(context_json "" "0x00100000")" >/dev/null 2>&1; then
fail "legacy FakeIP mark should overlap Tailscale fwmark mask"
fi
if TACHYON_LIB="$TACHYON_LIB" ucode -L "$TACHYON_LIB" "$VALIDATOR" validate-runtime-fixture "$WORK_DIR/fixture.json" "$(context_json "" "" "0x00200000")" >/dev/null 2>&1; then
fail "legacy outbound mark should overlap Tailscale fwmark mask"
fi
printf 'mark range checks passed\n'