diff --git a/Cargo.toml b/Cargo.toml index 4ca6380..d86b722 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,8 +1,8 @@ [package] authors = ["B. Blechschmidt"] -edition = "2018" +edition = "2021" name = "tun2proxy" -version = "0.1.5" +version = "0.1.6" [lib] crate-type = ["cdylib", "lib"] @@ -19,7 +19,7 @@ httparse = "1.8" libc = "0.2" log = "0.4" mio = { version = "0.8", features = ["os-poll", "net", "os-ext"] } -nix = { version = "0.26", features = ["process", "signal"] } +nix = { version = "0.27", features = ["process", "signal"] } prctl = "1.0" smoltcp = { version = "0.10", features = ["std", "phy-tuntap_interface"] } socks5-impl = { version = "0.5", default-features = false } diff --git a/README.md b/README.md index 09981ec..4b245e0 100644 --- a/README.md +++ b/README.md @@ -91,13 +91,18 @@ Tunnel interface to proxy. Usage: tun2proxy [OPTIONS] --proxy Options: - -t, --tun Name of the tun interface [default: tun0] - -p, --proxy Proxy URL in the form proto://[username[:password]@]host:port - -d, --dns DNS handling [default: virtual] [possible values: virtual, none] - -s, --setup Routing and system setup [possible values: auto] - --bypass-ip Public proxy IP used in routing setup which should bypassing the tunnel - -h, --help Print help - -V, --version Print version + -t, --tun Name of the tun interface [default: tun0] + --tun-fd File descriptor of the tun interface + --tun-mtu MTU of the tun interface (only with tunnel file descriptor) [default: 1500] + -p, --proxy Proxy URL in the form proto://[username[:password]@]host:port + -d, --dns DNS handling strategy [default: virtual] [possible values: virtual, over-tcp, direct] + --dns-addr DNS resolver address [default: 8.8.8.8] + -6, --ipv6-enabled IPv6 enabled + -s, --setup Routing and system setup [possible values: auto] + --bypass-ip Public proxy IP used in routing setup which should bypassing the tunnel + -v, --verbosity Verbosity level [default: info] [possible values: off, error, warn, info, debug, trace] + -h, --help Print help + -V, --version Print version ``` Currently, tun2proxy supports HTTP, SOCKS4/SOCKS4a and SOCKS5. A proxy is supplied to the `--proxy` argument in the URL format. For example, an HTTP proxy at `1.2.3.4:3128` with a username of `john.doe` and a password of `secret` is