Skip to content

Commit ace8f88

Browse files
Zhao-MichaelthezzisuKKRainbowimkivaBlackLuny
authored
Merge 2.3.2 (#6)
* add clear_udp_socket * R2.3.2 to dev (#5) * Update default_port and sni logic to improve reverse proxy reachability (EasyTier#947) * remove LICENSE (EasyTier#950) * Create LICENSE (EasyTier#951) * kcp connect retry (EasyTier#952) * fix(vpn-portal): wireguard peer table should be kept if the client roamed to another endpoint address (EasyTier#954) * Web dual stack (EasyTier#953) * reimplement easytier-web dual stack * add protocol check for dual stack listener current only support tcp and udp * Added RPC portal whitelist function, allowing only local access by default to enhance security (EasyTier#929) * feat: allow using `--proxy-forward-by-system` together with `--enable-exit-node` (EasyTier#957) * ipv4-peerid table should use peer with least hop (EasyTier#958) sometimes route table may not be updated in time, so some dead nodes are still showing in the peer list. when generating ipv4-peer table, we should avoid these dead devices overrides the entry of healthy nodes. * add check for rpc packet fix EasyTier#963 (EasyTier#969) * fix ospf route (EasyTier#970) - **fix deadlock in ospf route introducd by EasyTier#958 ** - **use random peer id for foreign network entry, because ospf route algo need peer id change after peer info version reset. this may interfere route propagation and cause node residual** - **allow multiple nodes broadcast same network ranges for subnet proxy** - **bump version to v2.3.2** * easytier-core支持多配置文件 (EasyTier#964) * 将web和gui允许多网络实例逻辑抽离到NetworkInstanceManager中 * easytier-core支持多配置文件 * FFI复用instance manager * 添加instance manager 单元测试 * internal stun server should use xor mapped addr (EasyTier#975) * remove macos default route on utun device (EasyTier#976) * support mapping subnet proxy (EasyTier#978) - **support mapping subproxy network cidr** - **add command line option for proxy network mapping** - **fix Instance leak in tests. * Fixed the issue where the GUI would panic after using InstanceManager (EasyTier#982) Co-authored-by: Sijie.Sun <sunsijie@buaa.edu.cn> * use bulk compress instead of streaming to reduce mem usage (EasyTier#985) * Update core.yml,use upx4.2.4 (EasyTier#991) * support quic proxy (EasyTier#993) QUIC proxy works like kcp proxy, it can proxy TCP streams and transfer data with QUIC. QUIC has better congestion algorithm (BBR) for network with both high loss rate and high bandwidth. QUIC proxy can be enabled by passing `--enable-quic-proxy` to easytier in the client side. The proxy status can be viewed by `easytier-cli proxy`. * Add conversion method from TomlConfigLoader to NetworkConfig to enhance configuration experience (EasyTier#990) * add method to create NetworkConfig from TomlConfigLoader * allow web export/import toml config file and gui edit toml config * Extract the configuration file dialog into a separate component and allow direct editing of the configuration file on the web * add keepalive option for quic proxy (EasyTier#1008) avoid connection loss when idle * allow set machine uid with command line (EasyTier#1009) * installing by homebrew should use easytier-gui (EasyTier#1004) * Add is_hole_punched flag to PeerConn (EasyTier#1001) * quic uses the bbr congestion control algorithm (EasyTier#1010) * add bps limiter (EasyTier#1015) * add token bucket * remove quinn-proto * bps limit should throttle kcp packet * add api_meta.js to frontend public * Implement custom fmt::Debug for some prost_build generated structs Currently implemented for: 1. common.Ipv4Addr 2. common.Ipv6Addr 3. common.UUID * simplify Textarea class in ConfigGenerator.vue * add Windows Service install script * fix uninstall.cmd (EasyTier#1036) * blacklist the peers which disable p2p in hole-punching client (EasyTier#1038) * limit max conn count in foreign network manager (EasyTier#1041) * fix rpc_portal_whitelist from config file not working (EasyTier#1042) * add clear_udp_socket (#3) * web improve (EasyTier#1047) * add geo info for in web device list (EasyTier#1052) --------- Co-authored-by: Zisu Zhang <thezzisu@gmail.com> Co-authored-by: Sijie.Sun <sunsijie@buaa.edu.cn> Co-authored-by: Kiva <imkiva@islovely.icu> Co-authored-by: BlackLuny <602814112@qq.com> Co-authored-by: Mg Pig <w2xzzpig@hotmail.com> Co-authored-by: tianxiayu007 <1083010692@qq.com> Co-authored-by: liusen373 <52489720+liusen373@users.noreply.github.com> Co-authored-by: chenxudong2020 <872603935@qq.com> Co-authored-by: sijie.sun <sijie.sun@smartx.com> Co-authored-by: dawn-lc <30336566+dawn-lc@users.noreply.github.com> Co-authored-by: zhaochen <zhaochen@sinsegye.com.cn> * merge easytier/src/easytier_core.rs * update Cargo.toml * comment some to fix runtime issue --------- Co-authored-by: Zisu Zhang <thezzisu@gmail.com> Co-authored-by: Sijie.Sun <sunsijie@buaa.edu.cn> Co-authored-by: Kiva <imkiva@islovely.icu> Co-authored-by: BlackLuny <602814112@qq.com> Co-authored-by: Mg Pig <w2xzzpig@hotmail.com> Co-authored-by: tianxiayu007 <1083010692@qq.com> Co-authored-by: liusen373 <52489720+liusen373@users.noreply.github.com> Co-authored-by: chenxudong2020 <872603935@qq.com> Co-authored-by: sijie.sun <sijie.sun@smartx.com> Co-authored-by: dawn-lc <30336566+dawn-lc@users.noreply.github.com> Co-authored-by: zhaochen <zhaochen@sinsegye.com.cn>
1 parent a80531a commit ace8f88

119 files changed

Lines changed: 7673 additions & 1718 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/origin_wfs/core.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -175,14 +175,14 @@ jobs:
175175
fi
176176
177177
if [[ $OS =~ ^ubuntu.*$ && $TARGET =~ ^mips.*$ ]]; then
178-
cargo +nightly build -r --verbose --target $TARGET -Z build-std=std,panic_abort --no-default-features --features mips --package=easytier
178+
cargo +nightly build -r --target $TARGET -Z build-std=std,panic_abort --package=easytier
179179
else
180180
if [[ $OS =~ ^windows.*$ ]]; then
181181
SUFFIX=.exe
182182
fi
183-
cargo build --release --verbose --target $TARGET --package=easytier-web --features=embed
183+
cargo build --release --target $TARGET --package=easytier-web --features=embed
184184
mv ./target/$TARGET/release/easytier-web"$SUFFIX" ./target/$TARGET/release/easytier-web-embed"$SUFFIX"
185-
cargo build --release --verbose --target $TARGET
185+
cargo build --release --target $TARGET
186186
fi
187187
188188
# Copied and slightly modified from @lmq8267 (https://github.com/lmq8267)
@@ -244,7 +244,7 @@ jobs:
244244
fi
245245
246246
if [[ $OS =~ ^ubuntu.*$ && ! $TARGET =~ ^.*freebsd$ ]]; then
247-
UPX_VERSION=5.0.1
247+
UPX_VERSION=4.2.4
248248
curl -L https://github.com/upx/upx/releases/download/v${UPX_VERSION}/upx-${UPX_VERSION}-amd64_linux.tar.xz -s | tar xJvf -
249249
cp upx-${UPX_VERSION}-amd64_linux/upx .
250250
./upx --lzma --best ./target/$TARGET/release/easytier-core"$SUFFIX"
@@ -316,4 +316,4 @@ jobs:
316316
./easytier-contrib/easytier-magisk
317317
!./easytier-contrib/easytier-magisk/build.sh
318318
!./easytier-contrib/easytier-magisk/magisk_update.json
319-
if-no-files-found: error
319+
if-no-files-found: error

.github/origin_wfs/docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
image_tag:
1212
description: 'Tag for this image build'
1313
type: string
14-
default: 'v2.3.1'
14+
default: 'v2.3.2'
1515
required: true
1616
mark_latest:
1717
description: 'Mark this image as latest'

.github/origin_wfs/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ on:
2121
version:
2222
description: 'Version for this release'
2323
type: string
24-
default: 'v2.3.1'
24+
default: 'v2.3.2'
2525
required: true
2626
make_latest:
2727
description: 'Mark this release as latest'

.github/origin_wfs/test.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ jobs:
9191

9292
- name: Run tests
9393
run: |
94-
sudo -E env "PATH=$PATH" cargo test --no-default-features --features=full --verbose -- --test-threads=1 --nocapture
94+
sudo prlimit --pid $$ --nofile=1048576:1048576
95+
sudo -E env "PATH=$PATH" cargo test --no-default-features --features=full --verbose -- --test-threads=1
9596
sudo chown -R $USER:$USER ./target
9697
sudo chown -R $USER:$USER ~/.cargo

0 commit comments

Comments
 (0)