projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename ECDSA to Ed25519.
[tinc]
/
bash_completion.d
/
tinc
diff --git
a/bash_completion.d/tinc
b/bash_completion.d/tinc
index
dd41874
..
c79e4ee
100644
(file)
--- a/
bash_completion.d/tinc
+++ b/
bash_completion.d/tinc
@@
-4,8
+4,8
@@
_tinc() {
cur="${COMP_WORDS[COMP_CWORD]}"
prev="${COMP_WORDS[COMP_CWORD-1]}"
opts="-c -d -D -K -n -o -L -R -U --config --no-detach --debug --net --option --mlock --logfile --pidfile --chroot --user --help --version"
cur="${COMP_WORDS[COMP_CWORD]}"
prev="${COMP_WORDS[COMP_CWORD-1]}"
opts="-c -d -D -K -n -o -L -R -U --config --no-detach --debug --net --option --mlock --logfile --pidfile --chroot --user --help --version"
- confvars="Address AddressFamily BindToAddress BindToInterface Broadcast Cipher ClampMSS Compression ConnectTo DecrementTTL Device DeviceType Digest DirectOnly E
CDSAPrivateKeyFile ECDSAPublicKey ECDSAPublicKeyFile ExperimentalProtocol Forwarding GraphDumpFile Hostnames IffOneQueue IndirectData Interface KeyExpire
LocalDiscovery MACExpire MACLength MaxOutputBufferSize MaxTimeout Mode Name PMTU PMTUDiscovery PingInterval PingTimeout Port PriorityInheritance PrivateKeyFile ProcessPriority Proxy PublicKeyFile ReplayWindow StrictSubnets Subnet TCPOnly TunnelServer UDPRcvBuf UDPSndBuf VDEGroup VDEPort Weight"
- commands="
config connect debug disconnect dump edit export export-all generate-ecdsa-keys generate-keys generate-rsa-keys help import info init log pcap pid purge reload restart retry
start stop top version"
+ confvars="Address AddressFamily BindToAddress BindToInterface Broadcast Cipher ClampMSS Compression ConnectTo DecrementTTL Device DeviceType Digest DirectOnly E
d25519PrivateKeyFile Ed25519PublicKey Ed25519PublicKeyFile ExperimentalProtocol Forwarding GraphDumpFile Hostnames IffOneQueue IndirectData Interface KeyExpire ListenAddress
LocalDiscovery MACExpire MACLength MaxOutputBufferSize MaxTimeout Mode Name PMTU PMTUDiscovery PingInterval PingTimeout Port PriorityInheritance PrivateKeyFile ProcessPriority Proxy PublicKeyFile ReplayWindow StrictSubnets Subnet TCPOnly TunnelServer UDPRcvBuf UDPSndBuf VDEGroup VDEPort Weight"
+ commands="
add connect debug del disconnect dump edit export export-all generate-ed25519-keys generate-keys generate-rsa-keys get help import info init invite join log network pcap pid purge reload restart retry set
start stop top version"
case ${prev} in
-c|--config)
case ${prev} in
-c|--config)
@@
-53,17
+53,26
@@
_tinc() {
fi
COMPREPLY=( $(compgen -W "${commands}" -- ${cur}) )
case $prev in
fi
COMPREPLY=( $(compgen -W "${commands}" -- ${cur}) )
case $prev in
- config)
- COMPREPLY=( $(compgen -W "get set add del ${confvars}" -- ${cur}) )
- return 0
- ;;
get|set|add|del)
COMPREPLY=( $(compgen -W "${confvars}" -- ${cur}) )
get|set|add|del)
COMPREPLY=( $(compgen -W "${confvars}" -- ${cur}) )
+ return 0
;;
dump|reachable)
COMPREPLY=( $(compgen -W "reachable nodes edges subnets connections graph" -- ${cur}) )
return 0
;;
;;
dump|reachable)
COMPREPLY=( $(compgen -W "reachable nodes edges subnets connections graph" -- ${cur}) )
return 0
;;
+ network)
+ nets=""
+ pushd /etc/tinc >/dev/null 2>/dev/null
+ for dir in *; do
+ if [[ -f "$dir/tinc.conf" ]]; then
+ nets="$nets $dir"
+ fi
+ done
+ popd >/dev/null 2>/dev/null
+ COMPREPLY=( $(compgen -W "${nets}" -- ${cur}) )
+ return 0
+ ;;
esac
if [[ -z ${cur} ]] ; then
COMPREPLY=( $(compgen -W "${opts} ${commands}" -- ${cur}) )
esac
if [[ -z ${cur} ]] ; then
COMPREPLY=( $(compgen -W "${opts} ${commands}" -- ${cur}) )
@@
-80,4
+89,4
@@
_tincctl() {
}
complete -F _tincd tincd
}
complete -F _tincd tincd
-complete -F _tincctl tinc
ctl
+complete -F _tincctl tinc