meta: release v1.4.0-beta.2

pull/121/head v1.4.0-beta.2
Jake McGinty 2021-06-14 23:53:02 +09:00
parent d6ab8e6653
commit 93b4b0b43c
21 changed files with 115 additions and 21 deletions

10
Cargo.lock generated
View File

@ -151,7 +151,7 @@ dependencies = [
[[package]]
name = "client"
version = "1.4.0-beta.1"
version = "1.4.0-beta.2"
dependencies = [
"anyhow",
"colored",
@ -926,7 +926,7 @@ dependencies = [
[[package]]
name = "server"
version = "1.4.0-beta.1"
version = "1.4.0-beta.2"
dependencies = [
"anyhow",
"bytes",
@ -959,7 +959,7 @@ dependencies = [
[[package]]
name = "shared"
version = "1.4.0-beta.1"
version = "1.4.0-beta.2"
dependencies = [
"anyhow",
"atty",
@ -1318,7 +1318,7 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
[[package]]
name = "wgctrl"
version = "1.4.0-beta.1"
version = "1.4.0-beta.2"
dependencies = [
"base64",
"hex",
@ -1331,7 +1331,7 @@ dependencies = [
[[package]]
name = "wgctrl-sys"
version = "1.4.0-beta.1"
version = "1.4.0-beta.2"
dependencies = [
"bindgen",
"cc",

View File

@ -204,10 +204,10 @@ brew install tonarino/innernet/innernet
```sh
# to install innernet:
cargo install --git https://github.com/tonarino/innernet --tag v1.4.0-beta.1 client
cargo install --git https://github.com/tonarino/innernet --tag v1.4.0-beta.2 client
# to install innernet-server:
cargo install --git https://github.com/tonarino/innernet --tag v1.4.0-beta.1 server
cargo install --git https://github.com/tonarino/innernet --tag v1.4.0-beta.2 server
```
Note that you'll be responsible for updating manually.

View File

@ -7,7 +7,7 @@ license = "MIT"
name = "client"
publish = false
repository = "https://github.com/tonarino/innernet"
version = "1.4.0-beta.1"
version = "1.4.0-beta.2"
[[bin]]
name = "innernet"

View File

@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.3.
.TH INNERNET-SERVER "8" "June 2021" "innernet-server 1.4.0-beta.1" "System Administration Utilities"
.TH INNERNET-SERVER "8" "June 2021" "innernet-server 1.4.0-beta.2" "System Administration Utilities"
.SH NAME
innernet-server \- manual page for innernet-server 1.4.0-beta.1
innernet-server \- manual page for innernet-server 1.4.0-beta.2
.SH DESCRIPTION
innernet\-server 1.4.0\-beta.1
innernet\-server 1.4.0\-beta.2
A server to coordinate innernet networks.
.SS "USAGE:"
.IP
@ -18,6 +18,9 @@ babeld
Specify a WireGuard backend to use. If not set, innernet will auto\-select based on
availability [default: kernel] [possible values: kernel, userspace]
.TP
\fB\-\-mtu\fR <mtu>
Specify the desired MTU for your interface (default: 1420 for IPv4 and 1400 for IPv6)
.TP
\fB\-h\fR, \fB\-\-help\fR
Prints help information
.TP

Binary file not shown.

View File

@ -50,7 +50,7 @@ _innernet-server() {
case "${cmd}" in
innernet-server)
opts=" -h -V --no-routing --help --version --backend new uninstall serve add-peer rename-peer add-cidr delete-cidr completions help init init"
opts=" -h -V --no-routing --help --version --backend --mtu new uninstall serve add-peer rename-peer add-cidr delete-cidr completions help init init"
if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
return 0
@ -61,6 +61,10 @@ _innernet-server() {
COMPREPLY=($(compgen -W "kernel userspace" -- "${cur}"))
return 0
;;
--mtu)
COMPREPLY=($(compgen -f "${cur}"))
return 0
;;
*)
COMPREPLY=()
;;
@ -270,7 +274,7 @@ _innernet-server() {
return 0
;;
innernet__server__serve)
opts=" -h -V --no-routing --help --version --backend <interface> "
opts=" -h -V --no-routing --help --version --backend --mtu <interface> "
if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
return 0
@ -281,6 +285,10 @@ _innernet-server() {
COMPREPLY=($(compgen -W "kernel userspace" -- "${cur}"))
return 0
;;
--mtu)
COMPREPLY=($(compgen -f "${cur}"))
return 0
;;
*)
COMPREPLY=()
;;

View File

@ -16,6 +16,7 @@ edit:completion:arg-completer[innernet-server] = [@words]{
completions = [
&'innernet-server'= {
cand --backend 'Specify a WireGuard backend to use. If not set, innernet will auto-select based on availability'
cand --mtu 'Specify the desired MTU for your interface (default: 1420 for IPv4 and 1400 for IPv6)'
cand --no-routing 'Whether the routing should be done by innernet or is done by an external tool like e.g. babeld'
cand -h 'Prints help information'
cand --help 'Prints help information'
@ -50,6 +51,7 @@ edit:completion:arg-completer[innernet-server] = [@words]{
}
&'innernet-server;serve'= {
cand --backend 'Specify a WireGuard backend to use. If not set, innernet will auto-select based on availability'
cand --mtu 'Specify the desired MTU for your interface (default: 1420 for IPv4 and 1400 for IPv6)'
cand --no-routing 'Whether the routing should be done by innernet or is done by an external tool like e.g. babeld'
cand -h 'Prints help information'
cand --help 'Prints help information'

View File

@ -1,4 +1,5 @@
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'
complete -c innernet-server -n "__fish_use_subcommand" -s V -l version -d 'Prints version information'
@ -21,6 +22,7 @@ complete -c innernet-server -n "__fish_seen_subcommand_from new" -s V -l version
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 "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'
complete -c innernet-server -n "__fish_seen_subcommand_from serve" -s V -l version -d 'Prints version information'

View File

@ -21,6 +21,7 @@ Register-ArgumentCompleter -Native -CommandName 'innernet-server' -ScriptBlock {
$completions = @(switch ($command) {
'innernet-server' {
[CompletionResult]::new('--backend', 'backend', [CompletionResultType]::ParameterName, 'Specify a WireGuard backend to use. If not set, innernet will auto-select based on availability')
[CompletionResult]::new('--mtu', 'mtu', [CompletionResultType]::ParameterName, 'Specify the desired MTU for your interface (default: 1420 for IPv4 and 1400 for IPv6)')
[CompletionResult]::new('--no-routing', 'no-routing', [CompletionResultType]::ParameterName, 'Whether the routing should be done by innernet or is done by an external tool like e.g. babeld')
[CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information')
[CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Prints help information')
@ -58,6 +59,7 @@ Register-ArgumentCompleter -Native -CommandName 'innernet-server' -ScriptBlock {
}
'innernet-server;serve' {
[CompletionResult]::new('--backend', 'backend', [CompletionResultType]::ParameterName, 'Specify a WireGuard backend to use. If not set, innernet will auto-select based on availability')
[CompletionResult]::new('--mtu', 'mtu', [CompletionResultType]::ParameterName, 'Specify the desired MTU for your interface (default: 1420 for IPv4 and 1400 for IPv6)')
[CompletionResult]::new('--no-routing', 'no-routing', [CompletionResultType]::ParameterName, 'Whether the routing should be done by innernet or is done by an external tool like e.g. babeld')
[CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information')
[CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Prints help information')

View File

@ -16,6 +16,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]: :(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]' \
'--help[Prints help information]' \
@ -81,6 +82,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]: :(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]' \
'--help[Prints help information]' \

View File

@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.3.
.TH INNERNET "8" "June 2021" "innernet 1.4.0-beta.1" "System Administration Utilities"
.TH INNERNET "8" "June 2021" "innernet 1.4.0-beta.2" "System Administration Utilities"
.SH NAME
innernet \- manual page for innernet 1.4.0-beta.1
innernet \- manual page for innernet 1.4.0-beta.2
.SH DESCRIPTION
innernet 1.4.0\-beta.1
innernet 1.4.0\-beta.2
A client to manage innernet network interfaces.
.SS "USAGE:"
.IP
@ -23,6 +23,10 @@ Whether the routing should be done by innernet or is done by an external tool li
Specify a WireGuard backend to use. If not set, innernet will auto\-select based on availability [default:
kernel] [possible values: kernel, userspace]
.HP
\fB\-\-mtu\fR <mtu>
.IP
Specify the desired MTU for your interface (default: 1420 for IPv4 and 1400 for IPv6)
.HP
\fB\-h\fR, \fB\-\-help\fR
.IP
Prints help information
@ -62,6 +66,9 @@ Add a new CIDR
delete\-cidr
Delete a CIDR
.TP
list\-cidrs
List CIDRs
.TP
disable\-peer
Disable an enabled peer
.TP

Binary file not shown.

View File

@ -55,6 +55,9 @@ _innernet() {
list-associations)
cmd+="__list__associations"
;;
list-cidrs)
cmd+="__list__cidrs"
;;
override-endpoint)
cmd+="__override__endpoint"
;;
@ -83,7 +86,7 @@ _innernet() {
case "${cmd}" in
innernet)
opts=" -v -h -V --verbose --no-routing --help --version --backend install show up fetch uninstall down add-peer rename-peer add-cidr delete-cidr disable-peer enable-peer add-association delete-association list-associations set-listen-port override-endpoint completions help redeem redeem list list"
opts=" -v -h -V --verbose --no-routing --help --version --backend --mtu install show up fetch uninstall down add-peer rename-peer add-cidr delete-cidr list-cidrs disable-peer enable-peer add-association delete-association list-associations set-listen-port override-endpoint completions help redeem redeem list list"
if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
return 0
@ -94,6 +97,10 @@ _innernet() {
COMPREPLY=($(compgen -W "kernel userspace" -- "${cur}"))
return 0
;;
--mtu)
COMPREPLY=($(compgen -f "${cur}"))
return 0
;;
*)
COMPREPLY=()
;;
@ -364,6 +371,21 @@ _innernet() {
COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
return 0
;;
innernet__list__cidrs)
opts=" -t -h -V --tree --help --version <interface> "
if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
return 0
fi
case "${prev}" in
*)
COMPREPLY=()
;;
esac
COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
return 0
;;
innernet__override__endpoint)
opts=" -u -h -V --unset --help --version <interface> "
if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then

View File

@ -16,6 +16,7 @@ edit:completion:arg-completer[innernet] = [@words]{
completions = [
&'innernet'= {
cand --backend 'Specify a WireGuard backend to use. If not set, innernet will auto-select based on availability'
cand --mtu 'Specify the desired MTU for your interface (default: 1420 for IPv4 and 1400 for IPv6)'
cand -v 'Verbose output, use -vv for even higher verbositude'
cand --verbose 'Verbose output, use -vv for even higher verbositude'
cand --no-routing 'Whether the routing should be done by innernet or is done by an external tool like e.g. babeld'
@ -33,6 +34,7 @@ edit:completion:arg-completer[innernet] = [@words]{
cand rename-peer 'Rename a peer'
cand add-cidr 'Add a new CIDR'
cand delete-cidr 'Delete a CIDR'
cand list-cidrs 'List CIDRs'
cand disable-peer 'Disable an enabled peer'
cand enable-peer 'Enable a disabled peer'
cand add-association 'Add an association between CIDRs'
@ -137,6 +139,14 @@ edit:completion:arg-completer[innernet] = [@words]{
cand -V 'Prints version information'
cand --version 'Prints version information'
}
&'innernet;list-cidrs'= {
cand -t 'Display CIDRs in tree format'
cand --tree 'Display CIDRs in tree format'
cand -h 'Prints help information'
cand --help 'Prints help information'
cand -V 'Prints version information'
cand --version 'Prints version information'
}
&'innernet;disable-peer'= {
cand -h 'Prints help information'
cand --help 'Prints help information'

View File

@ -1,4 +1,5 @@
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'
complete -c innernet -n "__fish_use_subcommand" -s h -l help -d 'Prints help information'
@ -13,6 +14,7 @@ complete -c innernet -n "__fish_use_subcommand" -f -a "add-peer" -d 'Add a new p
complete -c innernet -n "__fish_use_subcommand" -f -a "rename-peer" -d 'Rename a peer'
complete -c innernet -n "__fish_use_subcommand" -f -a "add-cidr" -d 'Add a new CIDR'
complete -c innernet -n "__fish_use_subcommand" -f -a "delete-cidr" -d 'Delete a CIDR'
complete -c innernet -n "__fish_use_subcommand" -f -a "list-cidrs" -d 'List CIDRs'
complete -c innernet -n "__fish_use_subcommand" -f -a "disable-peer" -d 'Disable an enabled peer'
complete -c innernet -n "__fish_use_subcommand" -f -a "enable-peer" -d 'Enable a disabled peer'
complete -c innernet -n "__fish_use_subcommand" -f -a "add-association" -d 'Add an association between CIDRs'
@ -72,6 +74,9 @@ complete -c innernet -n "__fish_seen_subcommand_from delete-cidr" -l name -d 'Th
complete -c innernet -n "__fish_seen_subcommand_from delete-cidr" -l yes -d 'Bypass confirmation'
complete -c innernet -n "__fish_seen_subcommand_from delete-cidr" -s h -l help -d 'Prints help information'
complete -c innernet -n "__fish_seen_subcommand_from delete-cidr" -s V -l version -d 'Prints version information'
complete -c innernet -n "__fish_seen_subcommand_from list-cidrs" -s t -l tree -d 'Display CIDRs in tree format'
complete -c innernet -n "__fish_seen_subcommand_from list-cidrs" -s h -l help -d 'Prints help information'
complete -c innernet -n "__fish_seen_subcommand_from list-cidrs" -s V -l version -d 'Prints version information'
complete -c innernet -n "__fish_seen_subcommand_from disable-peer" -s h -l help -d 'Prints help information'
complete -c innernet -n "__fish_seen_subcommand_from disable-peer" -s V -l version -d 'Prints version information'
complete -c innernet -n "__fish_seen_subcommand_from enable-peer" -s h -l help -d 'Prints help information'

View File

@ -21,6 +21,7 @@ Register-ArgumentCompleter -Native -CommandName 'innernet' -ScriptBlock {
$completions = @(switch ($command) {
'innernet' {
[CompletionResult]::new('--backend', 'backend', [CompletionResultType]::ParameterName, 'Specify a WireGuard backend to use. If not set, innernet will auto-select based on availability')
[CompletionResult]::new('--mtu', 'mtu', [CompletionResultType]::ParameterName, 'Specify the desired MTU for your interface (default: 1420 for IPv4 and 1400 for IPv6)')
[CompletionResult]::new('-v', 'v', [CompletionResultType]::ParameterName, 'Verbose output, use -vv for even higher verbositude')
[CompletionResult]::new('--verbose', 'verbose', [CompletionResultType]::ParameterName, 'Verbose output, use -vv for even higher verbositude')
[CompletionResult]::new('--no-routing', 'no-routing', [CompletionResultType]::ParameterName, 'Whether the routing should be done by innernet or is done by an external tool like e.g. babeld')
@ -38,6 +39,7 @@ Register-ArgumentCompleter -Native -CommandName 'innernet' -ScriptBlock {
[CompletionResult]::new('rename-peer', 'rename-peer', [CompletionResultType]::ParameterValue, 'Rename a peer')
[CompletionResult]::new('add-cidr', 'add-cidr', [CompletionResultType]::ParameterValue, 'Add a new CIDR')
[CompletionResult]::new('delete-cidr', 'delete-cidr', [CompletionResultType]::ParameterValue, 'Delete a CIDR')
[CompletionResult]::new('list-cidrs', 'list-cidrs', [CompletionResultType]::ParameterValue, 'List CIDRs')
[CompletionResult]::new('disable-peer', 'disable-peer', [CompletionResultType]::ParameterValue, 'Disable an enabled peer')
[CompletionResult]::new('enable-peer', 'enable-peer', [CompletionResultType]::ParameterValue, 'Enable a disabled peer')
[CompletionResult]::new('add-association', 'add-association', [CompletionResultType]::ParameterValue, 'Add an association between CIDRs')
@ -153,6 +155,15 @@ Register-ArgumentCompleter -Native -CommandName 'innernet' -ScriptBlock {
[CompletionResult]::new('--version', 'version', [CompletionResultType]::ParameterName, 'Prints version information')
break
}
'innernet;list-cidrs' {
[CompletionResult]::new('-t', 't', [CompletionResultType]::ParameterName, 'Display CIDRs in tree format')
[CompletionResult]::new('--tree', 'tree', [CompletionResultType]::ParameterName, 'Display CIDRs in tree format')
[CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information')
[CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Prints help information')
[CompletionResult]::new('-V', 'V', [CompletionResultType]::ParameterName, 'Prints version information')
[CompletionResult]::new('--version', 'version', [CompletionResultType]::ParameterName, 'Prints version information')
break
}
'innernet;disable-peer' {
[CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information')
[CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Prints help information')

View File

@ -16,6 +16,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]: :(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]' \
'--no-routing[Whether the routing should be done by innernet or is done by an external tool like e.g. babeld]' \
@ -212,6 +213,17 @@ _arguments "${_arguments_options[@]}" \
':interface:_files' \
&& ret=0
;;
(list-cidrs)
_arguments "${_arguments_options[@]}" \
'-t[Display CIDRs in tree format]' \
'--tree[Display CIDRs in tree format]' \
'-h[Prints help information]' \
'--help[Prints help information]' \
'-V[Prints version information]' \
'--version[Prints version information]' \
':interface:_files' \
&& ret=0
;;
(disable-peer)
_arguments "${_arguments_options[@]}" \
'-h[Prints help information]' \
@ -316,6 +328,7 @@ _innernet_commands() {
"rename-peer:Rename a peer" \
"add-cidr:Add a new CIDR" \
"delete-cidr:Delete a CIDR" \
"list-cidrs:List CIDRs" \
"disable-peer:Disable an enabled peer" \
"enable-peer:Enable a disabled peer" \
"add-association:Add an association between CIDRs" \
@ -433,6 +446,13 @@ _innernet__list-associations_commands() {
)
_describe -t commands 'innernet list-associations commands' commands "$@"
}
(( $+functions[_innernet__list-cidrs_commands] )) ||
_innernet__list-cidrs_commands() {
local commands; commands=(
)
_describe -t commands 'innernet list-cidrs commands' commands "$@"
}
(( $+functions[_innernet__override-endpoint_commands] )) ||
_innernet__override-endpoint_commands() {
local commands; commands=(

View File

@ -6,7 +6,7 @@ license = "MIT"
name = "server"
publish = false
readme = "README.md"
version = "1.4.0-beta.1"
version = "1.4.0-beta.2"
[[bin]]
name = "innernet-server"

View File

@ -4,7 +4,7 @@ edition = "2018"
license = "MIT"
name = "shared"
publish = false
version = "1.4.0-beta.1"
version = "1.4.0-beta.2"
[dependencies]
anyhow = "1"

View File

@ -7,7 +7,7 @@ license = "LGPL-2.1-or-later"
name = "wgctrl"
publish = false
readme = "../README.md"
version = "1.4.0-beta.1"
version = "1.4.0-beta.2"
[dependencies]
base64 = "0.13"

View File

@ -7,7 +7,7 @@ name = "wgctrl-sys"
publish = false
readme = "../README.md"
repository = "https://gitlab.com/K900/wgctrl-rs"
version = "1.4.0-beta.1"
version = "1.4.0-beta.2"
[dependencies]
libc = "0.2"