luckyimnotanigger/tun2proxy
1
0
Fork 0
mirror of https://github.com/tun2proxy/tun2proxy.git synced 2025-06-25 02:20:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Bump version 0.2.6

Browse source
This commit is contained in:
ssrlive 2024-02-10 20:21:28 +08:00
parent 9a4bd9f800
commit 2434c62524
4 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
.github/workflows/publish-exe.yml vendored
View file

@ -62,14 +62,15 @@ jobs:
else else
cargo build --all-features --release --target ${{ matrix.target }} cargo build --all-features --release --target ${{ matrix.target }}
fi fi
cbindgen --config cbindgen.toml -l C -o target/tun2proxy-ffi.h
if [[ "${{ matrix.host_os }}" == "windows-latest" ]]; then if [[ "${{ matrix.host_os }}" == "windows-latest" ]]; then
powershell -Command "(Get-Item README.md).LastWriteTime = Get-Date" powershell -Command "(Get-Item README.md).LastWriteTime = Get-Date"
powershell -Command "(Get-Item target/${{ matrix.target }}/release/wintun.dll).LastWriteTime = Get-Date" powershell -Command "(Get-Item target/${{ matrix.target }}/release/wintun.dll).LastWriteTime = Get-Date"
powershell Compress-Archive -Path target/${{ matrix.target }}/release/tun2proxy.exe, README.md, target/${{ matrix.target }}/release/wintun.dll -DestinationPath mypubdir4/tun2proxy-${{ matrix.target }}.zip powershell Compress-Archive -Path target/${{ matrix.target }}/release/tun2proxy.exe, README.md, target/tun2proxy-ffi.h, target/${{ matrix.target }}/release/tun2proxy.dll, target/${{ matrix.target }}/release/wintun.dll -DestinationPath mypubdir4/tun2proxy-${{ matrix.target }}.zip
elif [[ "${{ matrix.host_os }}" == "macos-latest" ]]; then elif [[ "${{ matrix.host_os }}" == "macos-latest" ]]; then
zip -j mypubdir4/tun2proxy-${{ matrix.target }}.zip target/${{ matrix.target }}/release/tun2proxy README.md zip -j mypubdir4/tun2proxy-${{ matrix.target }}.zip target/${{ matrix.target }}/release/tun2proxy README.md target/tun2proxy-ffi.h target/${{ matrix.target }}/release/libtun2proxy.dylib
elif [[ "${{ matrix.host_os }}" == "ubuntu-latest" ]]; then elif [[ "${{ matrix.host_os }}" == "ubuntu-latest" ]]; then
zip -j mypubdir4/tun2proxy-${{ matrix.target }}.zip target/${{ matrix.target }}/release/tun2proxy README.md zip -j mypubdir4/tun2proxy-${{ matrix.target }}.zip target/${{ matrix.target }}/release/tun2proxy README.md target/tun2proxy-ffi.h target/${{ matrix.target }}/release/libtun2proxy.so
fi fi
- name: Publish - name: Publish

2
Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "tun2proxy" name = "tun2proxy"
version = "0.2.5" version = "0.2.6"
edition = "2021" edition = "2021"
license = "MIT" license = "MIT"
repository = "https://github.com/blechschmidt/tun2proxy" repository = "https://github.com/blechschmidt/tun2proxy"

6
apple/tun2proxy/Tun2proxyWrapper.m
View file

@ -15,8 +15,10 @@
+ (void)startWithConfig:(NSString *)proxy_url + (void)startWithConfig:(NSString *)proxy_url
tun_fd:(int)tun_fd tun_fd:(int)tun_fd
tun_mtu:(uint32_t)tun_mtu tun_mtu:(uint32_t)tun_mtu
dns_strategy:(ArgDns)dns_strategy dns_over_tcp:(bool)dns_over_tcp
verbosity:(ArgVerbosity)verbosity { verbose:(bool)verbose {
ArgDns dns_strategy = dns_over_tcp ? OverTcp : Direct;
ArgVerbosity verbosity = verbose ? Trace : Info;
tun2proxy_run(proxy_url.UTF8String, tun_fd, tun_mtu, dns_strategy, verbosity); tun2proxy_run(proxy_url.UTF8String, tun_fd, tun_mtu, dns_strategy, verbosity);
} }

2
src/lib.rs
View file

@ -4,10 +4,10 @@ use crate::{
session_info::{IpProtocol, SessionInfo}, session_info::{IpProtocol, SessionInfo},
virtual_dns::VirtualDns, virtual_dns::VirtualDns,
}; };
pub use clap;
use ipstack::stream::{IpStackStream, IpStackTcpStream, IpStackUdpStream}; use ipstack::stream::{IpStackStream, IpStackTcpStream, IpStackUdpStream};
use proxy_handler::{ProxyHandler, ProxyHandlerManager}; use proxy_handler::{ProxyHandler, ProxyHandlerManager};
use socks::SocksProxyManager; use socks::SocksProxyManager;
pub use socks5_impl::protocol::UserKey;
use std::{collections::VecDeque, future::Future, net::SocketAddr, pin::Pin, sync::Arc}; use std::{collections::VecDeque, future::Future, net::SocketAddr, pin::Pin, sync::Arc};
use tokio::{ use tokio::{
io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt}, io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt},