diff --git a/README.md b/README.md index 0a2c6b4..5fbc3be 100644 --- a/README.md +++ b/README.md @@ -4,16 +4,38 @@

WireGold

Wire Golang Guard = WireGold

+ + English | [中文](README_ZH.md) -## Usage -> If you are running in windows, remember to select the `wintun.dll` of your arch in `lower/wintun` and place it alongside the compiled exe +## Overview + +WireGold is a pure Go Layer 3 VPN inspired by WireGuard. + +### Features + +- **Encryption**: XChaCha20-Poly1305 (AEAD) + Curve25519 key exchange + BLAKE2B integrity check +- **Transport**: UDP / UDP-Lite / TCP / Raw IP +- **Encoding**: Optional Base16384 encoding to traverse text-only filters +- **Anti-censorship**: XOR mask header obfuscation + randomized MTU scaling + optional double-send +- **Compression**: Optional Zstd payload compression +- **NAT traversal**: Built-in Hello/Query/Notify protocol for keepalive and hole punching +- **Routing**: Multi-hop forwarding with TTL decrement and routing table management +- **Key rotation**: 32 preshared key slots with random index selection per packet + + +## Usage + +> On Windows, place the `wintun.dll` matching your architecture (from `lower/wintun/`) alongside the executable. + +> For high-latency lossy links, consider pairing with [UDPspeeder](https://github.com/wangyu-/UDPspeeder). -> It is highly recommanded to use [UDPspeeder](https://github.com/wangyu-/UDPspeeder) together if you are using a High-latency Lossy Link ```bash wg [-c config.yaml] [-d|w] [-g] [-h] [-p] [-l log.txt] ``` -#### Instructions + +#### Flags + ```bash -c string specify conf file (default "config.yaml") @@ -28,10 +50,10 @@ wg [-c config.yaml] [-d|w] [-g] [-h] [-p] [-l log.txt] -w only show logs above warn level ``` -## Config file example +## Configuration -- **macos mojave**: max mtu (under ipv4 endpoint) is `9159` -- **ipv6 endpoint**: the recommand mtu is `1280~1500` to prevent the big segments from being dropped +- **macOS Mojave**: max MTU (IPv4 endpoint) is `9159` +- **IPv6 endpoint**: recommended MTU `1280–1500` to avoid oversized segment drops ```yaml IP: 192.168.233.1 @@ -68,11 +90,28 @@ Peers: AllowTrans: false ``` -## Benckmark on localhost -> This benckmark is tested on Mac Book Air M1 within battery mode. +### Configuration Reference -### UDP MTU 4096 -```bash +| Field | Description | +|-------|-------------| +| `AllowedIPs` | Prefix `x` to accept packets from the subnet without creating a system route; prefix `y` to add an internal route table entry only | +| `Mask` | XOR mask for header obfuscation | +| `Base14` | Enable Base16384 encoding | +| `MTURandomRange` | Randomly shrink MTU by up to this value (never grows), adding traffic fingerprint randomness | +| `DoublePacket` | Send every packet twice to counter heavy packet loss | +| `KeepAliveSeconds` | NAT keepalive interval in seconds; 0 disables keepalive | +| `QueryList` | Peer IPs to query for NAT traversal | +| `UseZstd` | Enable Zstd compression | +| `AllowTrans` | Allow this peer to relay traffic for other peers | + +## Benchmark (localhost) + +> MacBook Air M1, battery mode + +
+UDP MTU 4096 + +``` goos: darwin goarch: arm64 pkg: github.com/fumiama/WireGold/upper/services/tunnel @@ -102,8 +141,12 @@ BenchmarkTunnelUDP/4096-normal-b14-8 2620 432984 ns/op BenchmarkTunnelUDP/4096-preshared-nob14-8 2750 395736 ns/op 10.35 MB/s 7348747 B/op 315 allocs/op BenchmarkTunnelUDP/4096-preshared-b14-8 2628 431785 ns/op 9.49 MB/s 7961597 B/op 407 allocs/op ``` -### UDP MTU 1024 -```bash +
+ +
+UDP MTU 1024 + +``` goos: darwin goarch: arm64 pkg: github.com/fumiama/WireGold/upper/services/tunnel @@ -133,8 +176,12 @@ BenchmarkTunnelUDPSmallMTU/4096-normal-b14-8 2240 504749 ns/op BenchmarkTunnelUDPSmallMTU/4096-preshared-nob14-8 2594 392716 ns/op 10.43 MB/s 7480678 B/op 460 allocs/op BenchmarkTunnelUDPSmallMTU/4096-preshared-b14-8 2234 506134 ns/op 8.09 MB/s 9066223 B/op 691 allocs/op ``` -### TCP MTU 4096 -```bash +
+ +
+TCP MTU 4096 + +``` goos: darwin goarch: arm64 pkg: github.com/fumiama/WireGold/upper/services/tunnel @@ -164,8 +211,12 @@ BenchmarkTunnelTCP/4096-normal-b14-8 2374 465704 ns/op BenchmarkTunnelTCP/4096-preshared-nob14-8 2532 436310 ns/op 9.39 MB/s 7510565 B/op 477 allocs/op BenchmarkTunnelTCP/4096-preshared-b14-8 2360 459261 ns/op 8.92 MB/s 8037878 B/op 566 allocs/op ``` -### TCP MTU 1024 -```bash +
+ +
+TCP MTU 1024 + +``` goos: darwin goarch: arm64 pkg: github.com/fumiama/WireGold/upper/services/tunnel @@ -195,3 +246,4 @@ BenchmarkTunnelTCPSmallMTU/4096-normal-b14-8 1868 564007 ns/op BenchmarkTunnelTCPSmallMTU/4096-preshared-nob14-8 2263 491698 ns/op 8.33 MB/s 7925404 B/op 869 allocs/op BenchmarkTunnelTCPSmallMTU/4096-preshared-b14-8 2050 559663 ns/op 7.32 MB/s 9211292 B/op 1086 allocs/op ``` +
diff --git a/README_ZH.md b/README_ZH.md new file mode 100644 index 0000000..3674db7 --- /dev/null +++ b/README_ZH.md @@ -0,0 +1,248 @@ +
+ + WireGold-Maria +
+

WireGold

+ Wire Golang Guard = WireGold

+ + [English](README.md) | 中文 +
+ +## 概述 + +WireGold 是一个纯 Go 实现的第 3 层 VPN，灵感来自 WireGuard。 + +### 主要特性 + +- **加密**: XChaCha20-Poly1305 (AEAD) + Curve25519 密钥交换 + BLAKE2B 完整性校验 +- **传输**: 支持 UDP / UDP-Lite / TCP / Raw IP 多种底层传输 +- **编码**: 可选 Base16384 编码以穿越文本过滤 +- **抗审查**: XOR 掩码混淆报头 + 随机 MTU 放缩 + 可选双倍发包 +- **压缩**: 可选 Zstd 数据压缩 +- **NAT 穿透**: 内置 Hello/Query/Notify 协议实现 NAT 保活与穿透 +- **路由转发**: 支持多跳转发 (TTL 递减) 与路由表管理 +- **密钥集**: 支持 32 组预共享密钥混合，随机选择密钥索引 + +## 使用方法 + +> Windows 用户需将对应架构的 `wintun.dll` (位于 `lower/wintun/`) 放在可执行文件同目录下 + +> 高延迟有损链路建议配合 [UDPspeeder](https://github.com/wangyu-/UDPspeeder) 使用 + +```bash +wg [-c config.yaml] [-d|w] [-g] [-h] [-p] [-l log.txt] +``` + +#### 参数说明 + +```bash + -c string + 指定配置文件 (默认 "config.yaml") + -d 输出调试日志 + -g 生成密钥对 + -h 显示帮助 + -l string + 将日志写入文件 (默认 "-") + -p 显示本机公钥 + -pg + 生成预共享密钥 + -w 仅显示 warn 及以上级别日志 +``` + +## 配置文件示例 + +- **macOS Mojave**: 最大 MTU (IPv4 endpoint) 为 `9159` +- **IPv6 endpoint**: 推荐 MTU `1280~1500`，避免大分片被丢弃 + +```yaml +IP: 192.168.233.1 +SubNet: 192.168.233.0/24 +PrivateKey: 暲菉斂狧污爉窫擸紈卆帞蔩慈睠庮扝憚瞼縀 +EndPoint: 0.0.0.0:56789 +MTU: 1504 +SpeedLoop: 4096 +Mask: 0x1234567890abcdef +Base14: true +Peers: + - + IP: "192.168.233.2" + PublicKey: 徯萃嵾爻燸攗窍褃冔蒔犡緇袿屿組待族砇嘀 + PresharedKey: 瀸敀爅崾嘊嵜紼樴稍毯攣矐訷蟷扛嬋庩崛昀 + EndPoint: 1.2.3.4:56789 + AllowedIPs: ["192.168.233.2/32", "x192.168.233.3/32"] + KeepAliveSeconds: 0 + QueryList: ["192.168.233.3"] + MTU: 1400 + MTURandomRange: 128 + UseZstd: true + QuerySeconds: 10 + AllowTrans: true + - + IP: "192.168.233.3" + PublicKey: 牢喨粷詸衭譛浾蘹櫠砙杹蟫瑳叩刋橋経挵蘀 + PresharedKey: 竅琚喫従痸告烈兇厕趭萨假蔛瀇譄施烸蝫瘀 + EndPoint: "" + AllowedIPs: ["192.168.233.3/32", "y192.168.66.1/32"] + MTU: 752 + DoublePacket: true + KeepAliveSeconds: 0 + AllowTrans: false +``` + +### 配置字段说明 + +| 字段 | 说明 | +|------|------| +| `AllowedIPs` | 前缀 `x` 表示只接受该网段报文但不建系统路由；前缀 `y` 表示只添加内部路由表条目 | +| `Mask` | XOR 掩码，用于混淆报头 | +| `Base14` | 启用 Base16384 编码 | +| `MTURandomRange` | 随机缩小 MTU 的范围 (只减不增)，增加流量特征随机性 | +| `DoublePacket` | 双倍发包以对抗强丢包链路 | +| `KeepAliveSeconds` | NAT 保活间隔 (秒)，0 为不保活 | +| `QueryList` | NAT 穿透时查询的对端 IP 列表 | +| `UseZstd` | 启用 Zstd 压缩 | +| `AllowTrans` | 是否允许为其他 Peer 转发流量 | + +## 本地基准测试 + +> Mac Book Air M1，电池供电模式 + +
+UDP MTU 4096 + +``` +goos: darwin +goarch: arm64 +pkg: github.com/fumiama/WireGold/upper/services/tunnel +cpu: Apple M1 +BenchmarkTunnelUDP/1024-plain-nob14-8 4938 228283 ns/op 4.49 MB/s 3642671 B/op 149 allocs/op +BenchmarkTunnelUDP/1024-normal-nob14-8 5100 234118 ns/op 4.37 MB/s 3642409 B/op 147 allocs/op +BenchmarkTunnelUDP/1024-plain-b14-8 4528 249429 ns/op 4.11 MB/s 3825461 B/op 179 allocs/op +BenchmarkTunnelUDP/1024-normal-b14-8 4885 242048 ns/op 4.23 MB/s 3818262 B/op 175 allocs/op +BenchmarkTunnelUDP/1024-preshared-nob14-8 4833 242460 ns/op 4.22 MB/s 3632537 B/op 144 allocs/op +BenchmarkTunnelUDP/1024-preshared-b14-8 4348 239630 ns/op 4.27 MB/s 3820118 B/op 174 allocs/op +BenchmarkTunnelUDP/2048-plain-nob14-8 4766 280419 ns/op 7.30 MB/s 3656588 B/op 148 allocs/op +BenchmarkTunnelUDP/2048-normal-nob14-8 4353 250150 ns/op 8.19 MB/s 3639053 B/op 145 allocs/op +BenchmarkTunnelUDP/2048-plain-b14-8 4136 278223 ns/op 7.36 MB/s 3848032 B/op 178 allocs/op +BenchmarkTunnelUDP/2048-normal-b14-8 4264 268694 ns/op 7.62 MB/s 3842609 B/op 176 allocs/op +BenchmarkTunnelUDP/2048-preshared-nob14-8 4154 262575 ns/op 7.80 MB/s 3640443 B/op 144 allocs/op +BenchmarkTunnelUDP/2048-preshared-b14-8 3932 287082 ns/op 7.13 MB/s 3846167 B/op 176 allocs/op +BenchmarkTunnelUDP/3072-plain-nob14-8 4006 267281 ns/op 11.49 MB/s 3690985 B/op 164 allocs/op +BenchmarkTunnelUDP/3072-normal-nob14-8 3942 271832 ns/op 11.30 MB/s 3670827 B/op 162 allocs/op +BenchmarkTunnelUDP/3072-plain-b14-8 3529 291120 ns/op 10.55 MB/s 3993371 B/op 211 allocs/op +BenchmarkTunnelUDP/3072-normal-b14-8 3614 298778 ns/op 10.28 MB/s 3994267 B/op 211 allocs/op +BenchmarkTunnelUDP/3072-preshared-nob14-8 4036 297819 ns/op 10.31 MB/s 3674026 B/op 162 allocs/op +BenchmarkTunnelUDP/3072-preshared-b14-8 3705 300820 ns/op 10.21 MB/s 3989965 B/op 210 allocs/op +BenchmarkTunnelUDP/4096-plain-nob14-8 2604 398308 ns/op 10.28 MB/s 7389986 B/op 320 allocs/op +BenchmarkTunnelUDP/4096-normal-nob14-8 2744 399739 ns/op 10.25 MB/s 7348911 B/op 316 allocs/op +BenchmarkTunnelUDP/4096-plain-b14-8 2788 430813 ns/op 9.51 MB/s 7965100 B/op 410 allocs/op +BenchmarkTunnelUDP/4096-normal-b14-8 2620 432984 ns/op 9.46 MB/s 7957374 B/op 407 allocs/op +BenchmarkTunnelUDP/4096-preshared-nob14-8 2750 395736 ns/op 10.35 MB/s 7348747 B/op 315 allocs/op +BenchmarkTunnelUDP/4096-preshared-b14-8 2628 431785 ns/op 9.49 MB/s 7961597 B/op 407 allocs/op +``` +
+ +
+UDP MTU 1024 + +``` +goos: darwin +goarch: arm64 +pkg: github.com/fumiama/WireGold/upper/services/tunnel +cpu: Apple M1 +BenchmarkTunnelUDPSmallMTU/1024-plain-nob14-8 4770 256794 ns/op 3.99 MB/s 3715458 B/op 193 allocs/op +BenchmarkTunnelUDPSmallMTU/1024-normal-nob14-8 4945 242538 ns/op 4.22 MB/s 3681420 B/op 188 allocs/op +BenchmarkTunnelUDPSmallMTU/1024-plain-b14-8 4137 269202 ns/op 3.80 MB/s 4101089 B/op 254 allocs/op +BenchmarkTunnelUDPSmallMTU/1024-normal-b14-8 4592 253461 ns/op 4.04 MB/s 4109262 B/op 253 allocs/op +BenchmarkTunnelUDPSmallMTU/1024-preshared-nob14-8 4764 243752 ns/op 4.20 MB/s 3675691 B/op 186 allocs/op +BenchmarkTunnelUDPSmallMTU/1024-preshared-b14-8 4086 282682 ns/op 3.62 MB/s 4107240 B/op 253 allocs/op +BenchmarkTunnelUDPSmallMTU/2048-plain-nob14-8 4728 252759 ns/op 8.10 MB/s 3762231 B/op 234 allocs/op +BenchmarkTunnelUDPSmallMTU/2048-normal-nob14-8 4245 257036 ns/op 7.97 MB/s 3729842 B/op 232 allocs/op +BenchmarkTunnelUDPSmallMTU/2048-plain-b14-8 3615 308642 ns/op 6.64 MB/s 4469625 B/op 342 allocs/op +BenchmarkTunnelUDPSmallMTU/2048-normal-b14-8 3624 311780 ns/op 6.57 MB/s 4487346 B/op 345 allocs/op +BenchmarkTunnelUDPSmallMTU/2048-preshared-nob14-8 3999 260043 ns/op 7.88 MB/s 3723444 B/op 231 allocs/op +BenchmarkTunnelUDPSmallMTU/2048-preshared-b14-8 3558 315744 ns/op 6.49 MB/s 4476565 B/op 343 allocs/op +BenchmarkTunnelUDPSmallMTU/3072-plain-nob14-8 3814 265654 ns/op 11.56 MB/s 3802900 B/op 280 allocs/op +BenchmarkTunnelUDPSmallMTU/3072-normal-nob14-8 4380 291992 ns/op 10.52 MB/s 3760254 B/op 276 allocs/op +BenchmarkTunnelUDPSmallMTU/3072-plain-b14-8 3340 338760 ns/op 9.07 MB/s 4849826 B/op 434 allocs/op +BenchmarkTunnelUDPSmallMTU/3072-normal-b14-8 3302 345620 ns/op 8.89 MB/s 4852322 B/op 434 allocs/op +BenchmarkTunnelUDPSmallMTU/3072-preshared-nob14-8 4424 265290 ns/op 11.58 MB/s 3761816 B/op 277 allocs/op +BenchmarkTunnelUDPSmallMTU/3072-preshared-b14-8 3148 344490 ns/op 8.92 MB/s 4849613 B/op 434 allocs/op +BenchmarkTunnelUDPSmallMTU/4096-plain-nob14-8 2586 399489 ns/op 10.25 MB/s 7570823 B/op 467 allocs/op +BenchmarkTunnelUDPSmallMTU/4096-normal-nob14-8 2576 402297 ns/op 10.18 MB/s 7504731 B/op 464 allocs/op +BenchmarkTunnelUDPSmallMTU/4096-plain-b14-8 2240 484812 ns/op 8.45 MB/s 9081331 B/op 696 allocs/op +BenchmarkTunnelUDPSmallMTU/4096-normal-b14-8 2240 504749 ns/op 8.11 MB/s 9069168 B/op 693 allocs/op +BenchmarkTunnelUDPSmallMTU/4096-preshared-nob14-8 2594 392716 ns/op 10.43 MB/s 7480678 B/op 460 allocs/op +BenchmarkTunnelUDPSmallMTU/4096-preshared-b14-8 2234 506134 ns/op 8.09 MB/s 9066223 B/op 691 allocs/op +``` +
+ +
+TCP MTU 4096 + +``` +goos: darwin +goarch: arm64 +pkg: github.com/fumiama/WireGold/upper/services/tunnel +cpu: Apple M1 +BenchmarkTunnelTCP/1024-plain-nob14-8 4627 246837 ns/op 4.15 MB/s 3684040 B/op 201 allocs/op +BenchmarkTunnelTCP/1024-normal-nob14-8 4833 257150 ns/op 3.98 MB/s 3682260 B/op 199 allocs/op +BenchmarkTunnelTCP/1024-plain-b14-8 4396 272838 ns/op 3.75 MB/s 3850134 B/op 231 allocs/op +BenchmarkTunnelTCP/1024-normal-b14-8 4104 252293 ns/op 4.06 MB/s 3844674 B/op 226 allocs/op +BenchmarkTunnelTCP/1024-preshared-nob14-8 4530 264767 ns/op 3.87 MB/s 3680243 B/op 197 allocs/op +BenchmarkTunnelTCP/1024-preshared-b14-8 4231 287111 ns/op 3.57 MB/s 3847164 B/op 227 allocs/op +BenchmarkTunnelTCP/2048-plain-nob14-8 4275 276425 ns/op 7.41 MB/s 3698728 B/op 200 allocs/op +BenchmarkTunnelTCP/2048-normal-nob14-8 4033 261234 ns/op 7.84 MB/s 3701433 B/op 200 allocs/op +BenchmarkTunnelTCP/2048-plain-b14-8 3680 303246 ns/op 6.75 MB/s 3875541 B/op 231 allocs/op +BenchmarkTunnelTCP/2048-normal-b14-8 3626 288219 ns/op 7.11 MB/s 3878505 B/op 230 allocs/op +BenchmarkTunnelTCP/2048-preshared-nob14-8 3868 287679 ns/op 7.12 MB/s 3696931 B/op 200 allocs/op +BenchmarkTunnelTCP/2048-preshared-b14-8 3586 305008 ns/op 6.71 MB/s 3878416 B/op 230 allocs/op +BenchmarkTunnelTCP/3072-plain-nob14-8 3666 298452 ns/op 10.29 MB/s 3767509 B/op 246 allocs/op +BenchmarkTunnelTCP/3072-normal-nob14-8 3450 304848 ns/op 10.08 MB/s 3761811 B/op 246 allocs/op +BenchmarkTunnelTCP/3072-plain-b14-8 3549 315641 ns/op 9.73 MB/s 4032830 B/op 291 allocs/op +BenchmarkTunnelTCP/3072-normal-b14-8 3440 327234 ns/op 9.39 MB/s 4038470 B/op 292 allocs/op +BenchmarkTunnelTCP/3072-preshared-nob14-8 3522 302663 ns/op 10.15 MB/s 3760304 B/op 245 allocs/op +BenchmarkTunnelTCP/3072-preshared-b14-8 3390 326384 ns/op 9.41 MB/s 4040489 B/op 293 allocs/op +BenchmarkTunnelTCP/4096-plain-nob14-8 2431 435457 ns/op 9.41 MB/s 7515476 B/op 480 allocs/op +BenchmarkTunnelTCP/4096-normal-nob14-8 2500 433178 ns/op 9.46 MB/s 7511114 B/op 478 allocs/op +BenchmarkTunnelTCP/4096-plain-b14-8 2337 457177 ns/op 8.96 MB/s 8033760 B/op 568 allocs/op +BenchmarkTunnelTCP/4096-normal-b14-8 2374 465704 ns/op 8.80 MB/s 8040812 B/op 567 allocs/op +BenchmarkTunnelTCP/4096-preshared-nob14-8 2532 436310 ns/op 9.39 MB/s 7510565 B/op 477 allocs/op +BenchmarkTunnelTCP/4096-preshared-b14-8 2360 459261 ns/op 8.92 MB/s 8037878 B/op 566 allocs/op +``` +
+ +
+TCP MTU 1024 + +``` +goos: darwin +goarch: arm64 +pkg: github.com/fumiama/WireGold/upper/services/tunnel +cpu: Apple M1 +BenchmarkTunnelTCPSmallMTU/1024-plain-nob14-8 3318 312084 ns/op 3.28 MB/s 3797015 B/op 307 allocs/op +BenchmarkTunnelTCPSmallMTU/1024-normal-nob14-8 4102 303641 ns/op 3.37 MB/s 3795618 B/op 308 allocs/op +BenchmarkTunnelTCPSmallMTU/1024-plain-b14-8 3746 314102 ns/op 3.26 MB/s 4147318 B/op 368 allocs/op +BenchmarkTunnelTCPSmallMTU/1024-normal-b14-8 3609 315252 ns/op 3.25 MB/s 4152014 B/op 368 allocs/op +BenchmarkTunnelTCPSmallMTU/1024-preshared-nob14-8 3826 300693 ns/op 3.41 MB/s 3793725 B/op 304 allocs/op +BenchmarkTunnelTCPSmallMTU/1024-preshared-b14-8 3628 327852 ns/op 3.12 MB/s 4150869 B/op 367 allocs/op +BenchmarkTunnelTCPSmallMTU/2048-plain-nob14-8 3553 315709 ns/op 6.49 MB/s 3945193 B/op 426 allocs/op +BenchmarkTunnelTCPSmallMTU/2048-normal-nob14-8 3254 329794 ns/op 6.21 MB/s 3933224 B/op 427 allocs/op +BenchmarkTunnelTCPSmallMTU/2048-plain-b14-8 3222 357250 ns/op 5.73 MB/s 4538189 B/op 529 allocs/op +BenchmarkTunnelTCPSmallMTU/2048-normal-b14-8 3080 359401 ns/op 5.70 MB/s 4555108 B/op 535 allocs/op +BenchmarkTunnelTCPSmallMTU/2048-preshared-nob14-8 3463 320078 ns/op 6.40 MB/s 3936771 B/op 426 allocs/op +BenchmarkTunnelTCPSmallMTU/2048-preshared-b14-8 2990 363645 ns/op 5.63 MB/s 4555897 B/op 535 allocs/op +BenchmarkTunnelTCPSmallMTU/3072-plain-nob14-8 3228 336736 ns/op 9.12 MB/s 4090750 B/op 550 allocs/op +BenchmarkTunnelTCPSmallMTU/3072-normal-nob14-8 3076 347067 ns/op 8.85 MB/s 4084480 B/op 554 allocs/op +BenchmarkTunnelTCPSmallMTU/3072-plain-b14-8 2798 395353 ns/op 7.77 MB/s 4952186 B/op 700 allocs/op +BenchmarkTunnelTCPSmallMTU/3072-normal-b14-8 2725 403959 ns/op 7.60 MB/s 4965324 B/op 705 allocs/op +BenchmarkTunnelTCPSmallMTU/3072-preshared-nob14-8 3366 344086 ns/op 8.93 MB/s 4080821 B/op 549 allocs/op +BenchmarkTunnelTCPSmallMTU/3072-preshared-b14-8 2797 403142 ns/op 7.62 MB/s 4962100 B/op 703 allocs/op +BenchmarkTunnelTCPSmallMTU/4096-plain-nob14-8 2360 490867 ns/op 8.34 MB/s 7940290 B/op 871 allocs/op +BenchmarkTunnelTCPSmallMTU/4096-normal-nob14-8 2223 486839 ns/op 8.41 MB/s 7927235 B/op 872 allocs/op +BenchmarkTunnelTCPSmallMTU/4096-plain-b14-8 2002 557560 ns/op 7.35 MB/s 9201342 B/op 1087 allocs/op +BenchmarkTunnelTCPSmallMTU/4096-normal-b14-8 1868 564007 ns/op 7.26 MB/s 9216972 B/op 1091 allocs/op +BenchmarkTunnelTCPSmallMTU/4096-preshared-nob14-8 2263 491698 ns/op 8.33 MB/s 7925404 B/op 869 allocs/op +BenchmarkTunnelTCPSmallMTU/4096-preshared-b14-8 2050 559663 ns/op 7.32 MB/s 9211292 B/op 1086 allocs/op +``` +
diff --git a/go.mod b/go.mod index 70276b2..1547e3b 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/fumiama/WireGold go 1.25.0 require ( - github.com/FloatTech/ttl v0.0.0-20250224045156-012b1463287d + github.com/FloatTech/ttl v0.0.0-20260408173819-76cac20073ab github.com/RomiChan/syncx v0.0.0-20240418144900-b7402ffdebc7 github.com/fumiama/blake2b-simd v0.0.0-20250228045919-a5dcaba5419a github.com/fumiama/go-base16384 v1.7.1 @@ -18,6 +18,6 @@ require ( require ( github.com/fumiama/wintun v0.0.0-20211229152851-8bc97c8034c0 // indirect - golang.org/x/sys v0.42.0 // indirect + golang.org/x/sys v0.43.0 // indirect golang.org/x/text v0.35.0 // indirect ) diff --git a/go.sum b/go.sum index 5f2bf25..4c5675d 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/FloatTech/ttl v0.0.0-20250224045156-012b1463287d h1:mUQ/c3wXKsUGa4Sg9DBy01APXKB68PmobhxOyaJI7lY= -github.com/FloatTech/ttl v0.0.0-20250224045156-012b1463287d/go.mod h1:fHZFWGquNXuHttu9dUYoKuNbm3dzLETnIOnm1muSfDs= +github.com/FloatTech/ttl v0.0.0-20260408173819-76cac20073ab h1:V1izfoG5S2Q6LivnKvCVl4xMZYnmf+dGGxK3rCxeGuI= +github.com/FloatTech/ttl v0.0.0-20260408173819-76cac20073ab/go.mod h1:fHZFWGquNXuHttu9dUYoKuNbm3dzLETnIOnm1muSfDs= github.com/RomiChan/syncx v0.0.0-20240418144900-b7402ffdebc7 h1:S/ferNiehVjNaBMNNBxUjLtVmP/YWD6Yh79RfPv4ehU= github.com/RomiChan/syncx v0.0.0-20240418144900-b7402ffdebc7/go.mod h1:vD7Ra3Q9onRtojoY5sMCLQ7JBgjUsrXDnDKyFxqpf9w= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -35,8 +35,8 @@ golang.org/x/crypto v0.49.0/go.mod h1:ErX4dUh2UM+CFYiXZRTcMpEcN8b/1gxEuv3nODoYtC golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo= -golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI= +golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= diff --git a/gold/link/link.go b/gold/link/link.go index d804d9e..6f30897 100644 --- a/gold/link/link.go +++ b/gold/link/link.go @@ -5,7 +5,6 @@ import ( "errors" "net" "sync/atomic" - "time" "github.com/fumiama/WireGold/config" "github.com/fumiama/WireGold/gold/head" @@ -46,8 +45,8 @@ type Link struct { keys [32]cipher.AEAD // 本机信息 me *Me - // 最后一次收到报文的时间 - lastalive *time.Time + // 最后一次收到报文的时间 (UnixNano) + lastalive atomic.Int64 // 是否允许转发 allowtrans bool // 是否对数据进行 zstd 压缩 diff --git a/gold/link/nat.go b/gold/link/nat.go index 40f1e90..fa56694 100644 --- a/gold/link/nat.go +++ b/gold/link/nat.go @@ -2,9 +2,7 @@ package link import ( "encoding/json" - "sync/atomic" "time" - "unsafe" "github.com/sirupsen/logrus" @@ -23,8 +21,8 @@ func (l *Link) keepAlive(dur int64) { if l.me.connections == nil { return } - la := (*time.Time)(atomic.LoadPointer((*unsafe.Pointer)(unsafe.Pointer(&l.lastalive)))) - if la != nil && time.Since(*la) > 10*time.Second*time.Duration(dur) { // 可能已经被阻断， 断开重连 + la := l.lastalive.Load() + if la != 0 && time.Since(time.Unix(0, la)) > 10*time.Second*time.Duration(dur) { // 可能已经被阻断， 断开重连 logrus.Warnln(file.Header(), "no response after 10 keep alive tries, re-connecting...") err := l.me.Restart() if err != nil { diff --git a/gold/link/peer.go b/gold/link/peer.go index d4a3e97..479941e 100644 --- a/gold/link/peer.go +++ b/gold/link/peer.go @@ -2,9 +2,7 @@ package link import ( "net" - "sync/atomic" "time" - "unsafe" curve "github.com/fumiama/go-x25519" "github.com/sirupsen/logrus" @@ -148,7 +146,6 @@ func (m *Me) extractPeer(srcip, dstip net.IP, addr p2p.EndPoint) *Link { p.endpoint = addr } } - now := time.Now() - atomic.StorePointer((*unsafe.Pointer)(unsafe.Pointer(&p.lastalive)), unsafe.Pointer(&now)) + p.lastalive.Store(time.Now().UnixNano()) return p } diff --git a/gold/link/recv.go b/gold/link/recv.go index 457fe11..c1b79fc 100644 --- a/gold/link/recv.go +++ b/gold/link/recv.go @@ -152,10 +152,18 @@ func (m *Me) wait(data []byte, addr p2p.EndPoint) (h head.PacketBytes) { h, got := m.recving.GetOrSet(uint16(seq), header) if got { - if h == header { + if !h.HasInit() { + // GetOrSet found an expired entry: it deleted it and + // returned zero-value while reporting got=true, but did + // NOT store our header. Re-store it now. + m.recving.Set(uint16(seq), header) + h = header + got = false + } else if h == header { panic("unexpected multi-put found") + } else { + header.ManualDestroy() } - header.ManualDestroy() } if config.ShowDebugLog { logrus.Debugln("[recv]", strconv.FormatUint(uint64(seq&0xffff), 16), "get frag part isnew:", !got)