u32: fix TC_U32_TERMINAL printing

We previously printed an asterisk if there was no 'sel' or
'TC_U32_TERMINAL' flag. However,
 commit 1ff227545ce1 ("u32: fix json formatting of flowid")
changed the logic to print an asterisk only if there is a
'TC_U32_TERMINAL' flag. Therefore, we need to fix this
regression.

Before the fix, the tdc u32 test failed:

1..11
not ok 1 afa9 - Add u32 with source match
        Could not match regex pattern. Verify command output:
filter protocol ip pref 1 u32 chain 0
filter protocol ip pref 1 u32 chain 0 fh 800: ht divisor 1
filter protocol ip pref 1 u32 chain 0 fh 800::800 order 2048 key ht 800 bkt 0 *flowid 1:1 not_in_hw
  match 7f000001/ffffffff at 12
        action order 1: gact action pass
         random type none pass val 0
         index 1 ref 1 bind 1

After fix, the test passed:
1..11
ok 1 afa9 - Add u32 with source match

Fixes: 1ff227545ce1 ("u32: fix json formatting of flowid")
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Reviewed-by: Victor Nogueira <victor@mojatatu.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/tc/f_u32.c b/tc/f_u32.c
index bfe9e5f98de4e914a0d0ab609510d61d92cc0e4c..de2d0c9efdad60353797dffeec186f93f46a063c 100644 (file)
--- a/tc/f_u32.c
+++ b/tc/f_u32.c
@@ -1273,7 +1273,7 @@ static int u32_print_opt(struct filter_util *qu, FILE *f, struct rtattr *opt,
        if (tb[TCA_U32_CLASSID]) {
                __u32 classid = rta_getattr_u32(tb[TCA_U32_CLASSID]);
                SPRINT_BUF(b1);
-               if (sel && (sel->flags & TC_U32_TERMINAL))
+               if (!sel || !(sel->flags & TC_U32_TERMINAL))
                        print_string(PRINT_FP, NULL, "*", NULL);
 
                print_string(PRINT_ANY, "flowid", "flowid %s ",