proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2025-12-29 20:25:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tc: bash-completion: Prepare action autocomplete to support several actions

Browse Source 
The action autocomplete routine (_tc_action_options) currently does not
support several actions statements in one tc command line as it uses the
_tc_once_attr and _tc_one_from_list.

For example, in that case:

$ tc filter add dev eth0 handle ffff: u32 [...]  \
	   action sample group 5 rate 12 	 \
	   action sample <TAB>

the _tc_once_attr function, when invoked with "group rate" will not
suggest those as they already exist on the command line.

Fix the function to use the _from variant, thus allowing each action
autocomplete start from the action keyword, and not from the beginning of
the command line.

Signed-off-by: Yotam Gigi <yotamg@mellanox.com>
This commit is contained in:
Yotam Gigi 2017-02-07 15:50:49 +02:00 committed by Stephen Hemminger
parent 26e0996a87
commit f62b54a106
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
bash-completion/tc
View File

@ -454,26 +454,28 @@ _tc_filter_options()
# Returns 0 is completion should stop after running this function, 1 otherwise.
_tc_action_options()
{
case $1 in
local from=$1
local action=${words[from]}
case $action in
bpf)
_tc_bpf_options
return 0
;;
mirred)
_tc_one_of_list 'ingress egress'
_tc_one_of_list 'mirror redirect'
_tc_once_attr 'index dev'
_tc_one_of_list_from $from 'ingress egress'
_tc_one_of_list_from $from 'mirror redirect'
_tc_once_attr_from $from 'index dev'
return 0
;;
sample)
_tc_once_attr 'rate'
_tc_once_attr 'trunc'
_tc_once_attr 'group'
_tc_once_attr_from $from 'rate'
_tc_once_attr_from $from 'trunc'
_tc_once_attr_from $from 'group'
return 0
;;
gact)
_tc_one_of_list 'reclassify drop continue pass'
_tc_once_attr 'random'
_tc_one_of_list_from $from 'reclassify drop continue pass'
_tc_once_attr_from $from 'random'
return 0
;;
esac
@ -715,8 +717,7 @@ _tc()
local action acwd ACTION_KIND=' gact mirred bpf sample '
for ((acwd=$subcword; acwd < ${#words[@]}-1; acwd++)); do
if [[ $ACTION_KIND =~ ' '${words[acwd]}' ' ]]; then
action=${words[acwd]}
_tc_action_options $action && return 0
_tc_action_options $acwd && return 0
fi
done
_tc_one_of_list $ACTION_KIND