diff --git a/Cargo.lock b/Cargo.lock index 8ba3c8d..1e2c3a0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -163,7 +163,7 @@ dependencies = [ [[package]] name = "client" -version = "1.5.0-beta.4" +version = "1.5.0-beta.5" dependencies = [ "anyhow", "colored", @@ -975,7 +975,7 @@ dependencies = [ [[package]] name = "server" -version = "1.5.0-beta.4" +version = "1.5.0-beta.5" dependencies = [ "anyhow", "bytes", @@ -1008,7 +1008,7 @@ dependencies = [ [[package]] name = "shared" -version = "1.5.0-beta.4" +version = "1.5.0-beta.5" dependencies = [ "anyhow", "atty", @@ -1391,7 +1391,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "wireguard-control" -version = "1.5.0-beta.4" +version = "1.5.0-beta.5" dependencies = [ "base64", "curve25519-dalek", @@ -1403,7 +1403,7 @@ dependencies = [ [[package]] name = "wireguard-control-sys" -version = "1.5.0-beta.4" +version = "1.5.0-beta.5" dependencies = [ "bindgen", "cc", diff --git a/README.md b/README.md index f5d7543..e6a5ca0 100644 --- a/README.md +++ b/README.md @@ -214,10 +214,10 @@ brew install tonarino/innernet/innernet ```sh # to install innernet: -cargo install --git https://github.com/tonarino/innernet --tag v1.5.0-beta.4 client +cargo install --git https://github.com/tonarino/innernet --tag v1.5.0-beta.5 client # to install innernet-server: -cargo install --git https://github.com/tonarino/innernet --tag v1.5.0-beta.4 server +cargo install --git https://github.com/tonarino/innernet --tag v1.5.0-beta.5 server ``` Note that you'll be responsible for updating manually. diff --git a/client/Cargo.toml b/client/Cargo.toml index d4db095..189849f 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -7,7 +7,7 @@ license = "MIT" name = "client" publish = false repository = "https://github.com/tonarino/innernet" -version = "1.5.0-beta.4" +version = "1.5.0-beta.5" [[bin]] name = "innernet" diff --git a/doc/innernet-server.8 b/doc/innernet-server.8 index f9d6a5c..fca047f 100644 --- a/doc/innernet-server.8 +++ b/doc/innernet-server.8 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.5. -.TH INNERNET-SERVER "8" "September 2021" "innernet-server 1.5.0-beta.4" "System Administration Utilities" +.TH INNERNET-SERVER "8" "September 2021" "innernet-server 1.5.0-beta.5" "System Administration Utilities" .SH NAME -innernet-server \- manual page for innernet-server 1.5.0-beta.4 +innernet-server \- manual page for innernet-server 1.5.0-beta.5 .SH DESCRIPTION -innernet\-server 1.5.0\-beta.4 +innernet\-server 1.5.0\-beta.5 A server to coordinate innernet networks. .SS "USAGE:" .IP @@ -16,7 +16,7 @@ babeld .TP \fB\-\-backend\fR Specify a WireGuard backend to use. If not set, innernet will auto\-select based on -availability [default: userspace] [possible values: userspace] +availability [default: kernel] [possible values: kernel, userspace] .TP \fB\-\-mtu\fR Specify the desired MTU for your interface (default: 1420 for IPv4 and 1400 for IPv6) diff --git a/doc/innernet-server.8.gz b/doc/innernet-server.8.gz index d6c3dc6..aec4f3d 100644 Binary files a/doc/innernet-server.8.gz and b/doc/innernet-server.8.gz differ diff --git a/doc/innernet-server.completions.bash b/doc/innernet-server.completions.bash index ce06e9c..8094976 100644 --- a/doc/innernet-server.completions.bash +++ b/doc/innernet-server.completions.bash @@ -58,7 +58,7 @@ _innernet-server() { case "${prev}" in --backend) - COMPREPLY=($(compgen -W "userspace" -- "${cur}")) + COMPREPLY=($(compgen -W "kernel userspace" -- "${cur}")) return 0 ;; --mtu) @@ -282,7 +282,7 @@ _innernet-server() { case "${prev}" in --backend) - COMPREPLY=($(compgen -W "userspace" -- "${cur}")) + COMPREPLY=($(compgen -W "kernel userspace" -- "${cur}")) return 0 ;; --mtu) diff --git a/doc/innernet-server.completions.fish b/doc/innernet-server.completions.fish index f690722..a5df07a 100644 --- a/doc/innernet-server.completions.fish +++ b/doc/innernet-server.completions.fish @@ -1,4 +1,4 @@ -complete -c innernet-server -n "__fish_use_subcommand" -l backend -d 'Specify a WireGuard backend to use. If not set, innernet will auto-select based on availability' -r -f -a "userspace" +complete -c innernet-server -n "__fish_use_subcommand" -l backend -d 'Specify a WireGuard backend to use. If not set, innernet will auto-select based on availability' -r -f -a "kernel userspace" complete -c innernet-server -n "__fish_use_subcommand" -l mtu -d 'Specify the desired MTU for your interface (default: 1420 for IPv4 and 1400 for IPv6)' complete -c innernet-server -n "__fish_use_subcommand" -l no-routing -d 'Whether the routing should be done by innernet or is done by an external tool like e.g. babeld' complete -c innernet-server -n "__fish_use_subcommand" -s h -l help -d 'Prints help information' @@ -21,7 +21,7 @@ complete -c innernet-server -n "__fish_seen_subcommand_from new" -s h -l help -d complete -c innernet-server -n "__fish_seen_subcommand_from new" -s V -l version -d 'Prints version information' complete -c innernet-server -n "__fish_seen_subcommand_from uninstall" -s h -l help -d 'Prints help information' complete -c innernet-server -n "__fish_seen_subcommand_from uninstall" -s V -l version -d 'Prints version information' -complete -c innernet-server -n "__fish_seen_subcommand_from serve" -l backend -d 'Specify a WireGuard backend to use. If not set, innernet will auto-select based on availability' -r -f -a "userspace" +complete -c innernet-server -n "__fish_seen_subcommand_from serve" -l backend -d 'Specify a WireGuard backend to use. If not set, innernet will auto-select based on availability' -r -f -a "kernel userspace" complete -c innernet-server -n "__fish_seen_subcommand_from serve" -l mtu -d 'Specify the desired MTU for your interface (default: 1420 for IPv4 and 1400 for IPv6)' complete -c innernet-server -n "__fish_seen_subcommand_from serve" -l no-routing -d 'Whether the routing should be done by innernet or is done by an external tool like e.g. babeld' complete -c innernet-server -n "__fish_seen_subcommand_from serve" -s h -l help -d 'Prints help information' diff --git a/doc/innernet-server.completions.zsh b/doc/innernet-server.completions.zsh index 1018263..43bda27 100644 --- a/doc/innernet-server.completions.zsh +++ b/doc/innernet-server.completions.zsh @@ -15,7 +15,7 @@ _innernet-server() { local context curcontext="$curcontext" state line _arguments "${_arguments_options[@]}" \ -'--backend=[Specify a WireGuard backend to use. If not set, innernet will auto-select based on availability]: :(userspace)' \ +'--backend=[Specify a WireGuard backend to use. If not set, innernet will auto-select based on availability]: :(kernel userspace)' \ '--mtu=[Specify the desired MTU for your interface (default: 1420 for IPv4 and 1400 for IPv6)]' \ '--no-routing[Whether the routing should be done by innernet or is done by an external tool like e.g. babeld]' \ '-h[Prints help information]' \ @@ -81,7 +81,7 @@ _arguments "${_arguments_options[@]}" \ ;; (serve) _arguments "${_arguments_options[@]}" \ -'--backend=[Specify a WireGuard backend to use. If not set, innernet will auto-select based on availability]: :(userspace)' \ +'--backend=[Specify a WireGuard backend to use. If not set, innernet will auto-select based on availability]: :(kernel userspace)' \ '--mtu=[Specify the desired MTU for your interface (default: 1420 for IPv4 and 1400 for IPv6)]' \ '--no-routing[Whether the routing should be done by innernet or is done by an external tool like e.g. babeld]' \ '-h[Prints help information]' \ diff --git a/doc/innernet.8 b/doc/innernet.8 index 4f2cbee..b8db165 100644 --- a/doc/innernet.8 +++ b/doc/innernet.8 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.5. -.TH INNERNET "8" "September 2021" "innernet 1.5.0-beta.4" "System Administration Utilities" +.TH INNERNET "8" "September 2021" "innernet 1.5.0-beta.5" "System Administration Utilities" .SH NAME -innernet \- manual page for innernet 1.5.0-beta.4 +innernet \- manual page for innernet 1.5.0-beta.5 .SH DESCRIPTION -innernet 1.5.0\-beta.4 +innernet 1.5.0\-beta.5 A client to manage innernet network interfaces. .SS "USAGE:" .IP @@ -21,7 +21,7 @@ Whether the routing should be done by innernet or is done by an external tool li \fB\-\-backend\fR .IP Specify a WireGuard backend to use. If not set, innernet will auto\-select based on availability [default: -userspace] [possible values: userspace] +kernel] [possible values: kernel, userspace] .HP \fB\-\-mtu\fR .IP diff --git a/doc/innernet.8.gz b/doc/innernet.8.gz index 9adf876..eb8acaa 100644 Binary files a/doc/innernet.8.gz and b/doc/innernet.8.gz differ diff --git a/doc/innernet.completions.bash b/doc/innernet.completions.bash index 25115a1..5034484 100644 --- a/doc/innernet.completions.bash +++ b/doc/innernet.completions.bash @@ -94,7 +94,7 @@ _innernet() { case "${prev}" in --backend) - COMPREPLY=($(compgen -W "userspace" -- "${cur}")) + COMPREPLY=($(compgen -W "kernel userspace" -- "${cur}")) return 0 ;; --mtu) diff --git a/doc/innernet.completions.fish b/doc/innernet.completions.fish index ff0cdc5..8d22b99 100644 --- a/doc/innernet.completions.fish +++ b/doc/innernet.completions.fish @@ -1,4 +1,4 @@ -complete -c innernet -n "__fish_use_subcommand" -l backend -d 'Specify a WireGuard backend to use. If not set, innernet will auto-select based on availability' -r -f -a "userspace" +complete -c innernet -n "__fish_use_subcommand" -l backend -d 'Specify a WireGuard backend to use. If not set, innernet will auto-select based on availability' -r -f -a "kernel userspace" complete -c innernet -n "__fish_use_subcommand" -l mtu -d 'Specify the desired MTU for your interface (default: 1420 for IPv4 and 1400 for IPv6)' complete -c innernet -n "__fish_use_subcommand" -s v -l verbose -d 'Verbose output, use -vv for even higher verbositude' complete -c innernet -n "__fish_use_subcommand" -l no-routing -d 'Whether the routing should be done by innernet or is done by an external tool like e.g. babeld' diff --git a/doc/innernet.completions.zsh b/doc/innernet.completions.zsh index 4ba06f7..ace7220 100644 --- a/doc/innernet.completions.zsh +++ b/doc/innernet.completions.zsh @@ -15,7 +15,7 @@ _innernet() { local context curcontext="$curcontext" state line _arguments "${_arguments_options[@]}" \ -'--backend=[Specify a WireGuard backend to use. If not set, innernet will auto-select based on availability]: :(userspace)' \ +'--backend=[Specify a WireGuard backend to use. If not set, innernet will auto-select based on availability]: :(kernel userspace)' \ '--mtu=[Specify the desired MTU for your interface (default: 1420 for IPv4 and 1400 for IPv6)]' \ '*-v[Verbose output, use -vv for even higher verbositude]' \ '*--verbose[Verbose output, use -vv for even higher verbositude]' \ diff --git a/server/Cargo.toml b/server/Cargo.toml index 2621a42..2f80bd0 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT" name = "server" publish = false readme = "README.md" -version = "1.5.0-beta.4" +version = "1.5.0-beta.5" [[bin]] name = "innernet-server" diff --git a/shared/Cargo.toml b/shared/Cargo.toml index 8b5c3cd..c33f18c 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -4,7 +4,7 @@ edition = "2018" license = "MIT" name = "shared" publish = false -version = "1.5.0-beta.4" +version = "1.5.0-beta.5" [dependencies] anyhow = "1" diff --git a/wireguard-control-sys/Cargo.toml b/wireguard-control-sys/Cargo.toml index 512bf56..6556df6 100644 --- a/wireguard-control-sys/Cargo.toml +++ b/wireguard-control-sys/Cargo.toml @@ -6,7 +6,7 @@ license = "LGPL-2.1-or-later" name = "wireguard-control-sys" readme = "README.md" repository = "https://github.com/tonarino/innernet" -version = "1.5.0-beta.4" +version = "1.5.0-beta.5" [dependencies] libc = "0.2" diff --git a/wireguard-control/Cargo.toml b/wireguard-control/Cargo.toml index c8e6c5f..985eefe 100644 --- a/wireguard-control/Cargo.toml +++ b/wireguard-control/Cargo.toml @@ -7,7 +7,7 @@ license = "LGPL-2.1-or-later" name = "wireguard-control" readme = "README.md" repository = "https://github.com/tonarino/innernet" -version = "1.5.0-beta.4" +version = "1.5.0-beta.5" [dependencies] base64 = "0.13" @@ -15,7 +15,7 @@ hex = "0.4" libc = "0.2" [target.'cfg(target_os = "linux")'.dependencies] -wireguard-control-sys = { path = "../wireguard-control-sys", version = "1.5.0-beta.4" } +wireguard-control-sys = { path = "../wireguard-control-sys", version = "1.5.0-beta.5" } [target.'cfg(not(target_os = "linux"))'.dependencies] rand_core = "0.6"