On Mon, 6 Feb 2017 15:19:21 +0200
Yotam Gigi <yot...@mellanox.com> wrote:
> 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 <yot...@mellanox.com>
This patch does not apply cleanly to current iproute2 net-next tree.
Please rebase and resubmit the whole series again.
$ cat bash-completion/tc.rej
--- bash-completion/tc
+++ bash-completion/tc
@@ -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
