add json support on tc u32
Subsystems (2)
v2 cover add json support on tc u32
This adds support for json output on tc u32.
- The first patch is replacing with proper json functions in u32_print_opt()
- The second patch is fixing the json support in u32 print_raw(), print_ipv4() and print_ipv6()
Wen Liang (2):
tc: u32: add support for json output
tc: u32: add json support in print_raw, print_ipv4, print_ipv6
tc/f_u32.c | 152 ++++++++++++++++++++++++++--------------------------- 1 file changed, 76 insertions(+), 76 deletions(-)
Signature · 1 line
2.26.3
PATCH v2 1/2 tc: u32: add support for json output
Currently u32 filter output does not support json. This commit uses proper json functions to add support for it.
--- tc/f_u32.c | 66 ++++++++++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 34 deletions(-)
tc/f_u32.c +32 -34
@@ -1213,11 +1213,11 @@ static int u32_print_opt(struct filter_util *qu, FILE *f, struct rtattr *opt,if (handle) {SPRINT_BUF (b1); -fprintf (f,"fh %s " ,sprint_u32_handle (handle, b1)); +print_string (PRINT_ANY ,"fh" ,"fh %s " ,sprint_u32_handle (handle, b1)); }if (TC_U32_NODE (handle)) -fprintf (f,"order %d " ,TC_U32_NODE (handle)); +print_int (PRINT_ANY ,"order" ,"order %d " ,TC_U32_NODE (handle));if (tb[TCA_U32_SEL ]) {if (RTA_PAYLOAD (tb[TCA_U32_SEL ]) <sizeof (*sel))
@@ -1227,15 +1227,13 @@ static int u32_print_opt(struct filter_util *qu, FILE *f, struct rtattr *opt, }if (tb[TCA_U32_DIVISOR ]) { -fprintf (f,"ht divisor %d " , -rta_getattr_u32 (tb[TCA_U32_DIVISOR ])); +print_int (PRINT_ANY ,"ht_divisor" ,"ht divisor %d " ,rta_getattr_u32 (tb[TCA_U32_DIVISOR ])); }else if (tb[TCA_U32_HASH ]) {__u32 htid =rta_getattr_u32 (tb[TCA_U32_HASH ]); - -fprintf (f,"key ht %x bkt %x " ,TC_U32_USERHTID (htid), -TC_U32_HASH (htid)); +print_hex (PRINT_ANY ,"key_ht" ,"key ht %x " ,TC_U32_USERHTID (htid)); +print_hex (PRINT_ANY ,"bkt" ,"bkt %x " ,TC_U32_HASH (htid)); }else { -fprintf (f,"??? " ); +fprintf (f,"divisor and hash missing " ); }if (tb[TCA_U32_CLASSID ]) {SPRINT_BUF (b1);
@@ -1244,12 +1242,11 @@ static int u32_print_opt(struct filter_util *qu, FILE *f, struct rtattr *opt,sprint_tc_classid (rta_getattr_u32 (tb[TCA_U32_CLASSID ]), b1)); }else if (sel && sel->flags &TC_U32_TERMINAL ) { -fprintf (f,"terminal flowid ??? " ); +print_bool (PRINT_ANY ,"terminal_flowid" ,"terminal flowid ??? " , true); }if (tb[TCA_U32_LINK ]) {SPRINT_BUF (b1); -fprintf (f,"link %s " , -sprint_u32_handle (rta_getattr_u32 (tb[TCA_U32_LINK ]), +print_string (PRINT_ANY ,"link" ,"link %s " ,sprint_u32_handle (rta_getattr_u32 (tb[TCA_U32_LINK ]), b1)); }
@@ -1257,14 +1254,14 @@ static int u32_print_opt(struct filter_util *qu, FILE *f, struct rtattr *opt,__u32 flags =rta_getattr_u32 (tb[TCA_U32_FLAGS ]);if (flags &TCA_CLS_FLAGS_SKIP_HW ) -fprintf (f,"skip_hw " ); +print_bool (PRINT_ANY ,"skip_hw" ,"skip_hw " , true);if (flags &TCA_CLS_FLAGS_SKIP_SW ) -fprintf (f,"skip_sw " ); +print_bool (PRINT_ANY ,"skip_sw" ,"skip_sw " , true);if (flags &TCA_CLS_FLAGS_IN_HW ) -fprintf (f,"in_hw " ); +print_bool (PRINT_ANY ,"in_hw" ,"in_hw " , true);else if (flags &TCA_CLS_FLAGS_NOT_IN_HW ) -fprintf (f,"not_in_hw " ); +print_bool (PRINT_ANY ,"not_in_hw" ,"not_in_hw " , true); }if (tb[TCA_U32_PCNT ]) {
@@ -1275,10 +1272,10 @@ static int u32_print_opt(struct filter_util *qu, FILE *f, struct rtattr *opt, pf =RTA_DATA (tb[TCA_U32_PCNT ]); } -if (sel && show_stats &&NULL != pf) -fprintf (f," (rule hit %llu success %llu)" , - (unsigned long long ) pf->rcnt, - (unsigned long long ) pf->rhit); +if (sel && show_stats &&NULL != pf) { +print_u64 (PRINT_ANY ,"rule_hit" ,"(rule hit %llu " , pf->rcnt); +print_u64 (PRINT_ANY ,"success" ,"success %llu)" , pf->rhit); + }if (tb[TCA_U32_MARK ]) {struct tc_u32_mark *mark =RTA_DATA (tb[TCA_U32_MARK ]);
@@ -1286,8 +1283,9 @@ static int u32_print_opt(struct filter_util *qu, FILE *f, struct rtattr *opt,if (RTA_PAYLOAD (tb[TCA_U32_MARK ]) <sizeof (*mark)) {fprintf (f,"\n Invalid mark (kernel&iproute2 mismatch)\n" ); }else { -fprintf (f,"\n mark 0x%04x 0x%04x (success %d)" , - mark->val, mark->mask, mark->success); +print_0xhex (PRINT_ANY ,"fwmark_value" ,"\n mark 0x%04x " , mark->val); +print_0xhex (PRINT_ANY ,"fwmark_mask" ,"0x%04x " , mark->mask); +print_int (PRINT_ANY ,"fwmark_success" ,"(success %d)" , mark->success); } }
@@ -1298,38 +1296,38 @@ static int u32_print_opt(struct filter_util *qu, FILE *f, struct rtattr *opt,for (i =0 ; i < sel->nkeys; i++) {show_keys (f, sel->keys + i);if (show_stats &&NULL != pf) -fprintf (f," (success %llu ) " , - (unsigned long long ) pf->kcnts[i]); +print_u64 (PRINT_ANY ,"success" ," (success %llu ) " , pf->kcnts[i]); } }if (sel->flags & (TC_U32_VAROFFSET |TC_U32_OFFSET )) { -fprintf (f,"\n offset " ); -if (sel->flags &TC_U32_VAROFFSET ) -fprintf (f,"%04x>>%d at %d " , -ntohs (sel->offmask), - sel->offshift, sel->offoff); +print_string (PRINT_ANY ,NULL ,"%s" ,"\n offset " ); +if (sel->flags &TC_U32_VAROFFSET ) { +print_hex (PRINT_ANY ,"offset_mask" ,"%04x" ,ntohs (sel->offmask)); +print_int (PRINT_ANY ,"offset_shift" ,">>%d " , sel->offshift); +print_int (PRINT_ANY ,"offset_off" ,"at %d " , sel->offoff); + }if (sel->off) -fprintf (f,"plus %d " , sel->off); +print_int (PRINT_ANY ,"plus" ,"plus %d " , sel->off); }if (sel->flags &TC_U32_EAT ) -fprintf (f," eat " ); +print_string (PRINT_ANY ,NULL ,"%s" ," eat " );if (sel->hmask) { -fprintf (f,"\n hash mask %08x at %d " , - (unsigned int )htonl (sel->hmask), sel->hoff); +print_hex (PRINT_ANY ,"hash_mask" ,"\n hash mask %08x " , (unsigned int )htonl (sel->hmask)); +print_int (PRINT_ANY ,"hash_off" ,"at %d " , sel->hoff); } }if (tb[TCA_U32_POLICE ]) { -fprintf (f,"\n" ); +print_nl ();tc_print_police (f, tb[TCA_U32_POLICE ]); }if (tb[TCA_U32_INDEV ]) {struct rtattr *idev = tb[TCA_U32_INDEV ]; -fprintf (f,"\n input dev %s\n" ,rta_getattr_str (idev)); +print_string (PRINT_ANY ,"input_dev" ,"\n input dev %s\n" ,rta_getattr_str (idev)); }if (tb[TCA_U32_ACT ])
Signature · 1 line
2.26.3
Re: [PATCH iproute2 v2 1/2] tc: u32: add support for json output
tc/f_u32.c static int u32_print_opt(struct filter_util *qu, FILE *f, struct rtattr *opt, · line 1236
Quoted 2 lines · On Thu, 28 Oct 2021 11:25:01 -0400 Wen Liang <[email protected]> wrote:
tc/f_u32.c +1
-1-fprintf (f,"??? " ); +fprintf (f,"divisor and hash missing " );
print errors to stderr, not f handle.
Re: [PATCH iproute2 v2 1/2] tc: u32: add support for json output
In reply to Wen Liangtc/f_u32.c static int u32_print_opt(struct filter_util *qu, FILE *f, struct rtattr *opt, · line 1287
Quoted 2 lines · On Thu, 28 Oct 2021 11:25:01 -0400 Wen Liang <[email protected]> wrote:
tc/f_u32.c +2
-0+print_0xhex (PRINT_ANY ,"fwmark_value" ,"\n mark 0x%04x " , mark->val); +print_0xhex (PRINT_ANY ,"fwmark_mask" ,"0x%04x " , mark->mask);
Use print_nl() which handles oneline mode rather than explicit newline print
PATCH v2 2/2 tc: u32: add json support in `print_raw`, `print_ipv4`, `print_ipv6`
In reply to Wen Liang--- tc/f_u32.c | 86 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 44 insertions(+), 42 deletions(-)
tc/f_u32.c +44 -42
@@ -824,23 +824,21 @@ static void print_ipv4(FILE *f, const struct tc_u32_key *key) {char abuf[256 ]; +open_json_object ("match" );switch (key->off) {case 0 :switch (ntohl (key->mask)) {case 0x0f000000 : -fprintf (f,"\n match IP ihl %u" , -ntohl (key->val) >>24 ); +print_uint (PRINT_ANY ,"ip_ihl" ,"\n match IP ihl %u" ,ntohl (key->val) >>24 );return ;case 0x00ff0000 : -fprintf (f,"\n match IP dsfield %#x" , -ntohl (key->val) >>16 ); +print_0xhex (PRINT_ANY ,"ip_dsfield" ,"\n match IP dsfield %#x" ,ntohl (key->val) >>16 );return ; }break ;case 8 :if (ntohl (key->mask) ==0x00ff0000 ) { -fprintf (f,"\n match IP protocol %d" , -ntohl (key->val) >>16 ); +print_int (PRINT_ANY ,"ip_protocol" ,"\n match IP protocol %d" ,ntohl (key->val) >>16 );return ; }break ;
@@ -849,11 +847,16 @@ static void print_ipv4(FILE *f, const struct tc_u32_key *key)int bits =mask2bits (key->mask);if (bits >=0 ) { -fprintf (f,"\n %s %s/%d" , - key->off ==12 ?"match IP src" :"match IP dst" , -inet_ntop (AF_INET , &key->val, - abuf,sizeof (abuf)), - bits); +if (key->off ==12 ) { +print_null (PRINT_FP ,NULL ,"\n match IP src " ,NULL ); +open_json_object ("src" ); + }else { +print_null (PRINT_FP ,NULL ,"\n match IP dst " ,NULL ); +open_json_object ("dst" ); + } +print_string (PRINT_ANY ,"address" ,"%s" ,inet_ntop (AF_INET , &key->val, abuf,sizeof (abuf))); +print_int (PRINT_ANY ,"prefixlen" ,"/%d" , bits); +close_json_object ();return ; } }
@@ -862,45 +865,40 @@ static void print_ipv4(FILE *f, const struct tc_u32_key *key)case 20 :switch (ntohl (key->mask)) {case 0x0000ffff : -fprintf (f,"\n match dport %u" , -ntohl (key->val) &0xffff ); +print_uint (PRINT_ANY ,"dport" ,"match dport %u" ,ntohl (key->val) &0xffff );return ;case 0xffff0000 : -fprintf (f,"\n match sport %u" , -ntohl (key->val) >>16 ); +print_uint (PRINT_ANY ,"sport" ,"\n match sport %u" ,ntohl (key->val) >>16 );return ;case 0xffffffff : -fprintf (f,"\n match dport %u, match sport %u" , -ntohl (key->val) &0xffff , -ntohl (key->val) >>16 ); - +print_uint (PRINT_ANY ,"dport" ,"\n match dport %u, " ,ntohl (key->val) &0xffff ); +print_uint (PRINT_ANY ,"sport" ,"match sport %u" ,ntohl (key->val) >>16 );return ; }/* XXX: Default print_raw */ } +close_json_object (); }static void print_ipv6 (FILE *f,const struct tc_u32_key *key) {char abuf[256 ]; +open_json_object ("match" );switch (key->off) {case 0 :switch (ntohl (key->mask)) {case 0x0f000000 : -fprintf (f,"\n match IP ihl %u" , -ntohl (key->val) >>24 ); +print_uint (PRINT_ANY ,"ip_ihl" ,"\n match IP ihl %u" ,ntohl (key->val) >>24 );return ;case 0x00ff0000 : -fprintf (f,"\n match IP dsfield %#x" , -ntohl (key->val) >>16 ); +print_0xhex (PRINT_ANY ,"ip_dsfield" ,"\n match IP dsfield %#x" ,ntohl (key->val) >>16 );return ; }break ;case 8 :if (ntohl (key->mask) ==0x00ff0000 ) { -fprintf (f,"\n match IP protocol %d" , -ntohl (key->val) >>16 ); +print_int (PRINT_ANY ,"ip_protocol" ,"\n match IP protocol %d" ,ntohl (key->val) >>16 );return ; }break ;
@@ -909,11 +907,16 @@ static void print_ipv6(FILE *f, const struct tc_u32_key *key)int bits =mask2bits (key->mask);if (bits >=0 ) { -fprintf (f,"\n %s %s/%d" , - key->off ==12 ?"match IP src" :"match IP dst" , -inet_ntop (AF_INET , &key->val, - abuf,sizeof (abuf)), - bits); +if (key->off ==12 ) { +print_null (PRINT_FP ,NULL ,"\n match IP src " ,NULL ); +open_json_object ("src" ); + }else { +print_null (PRINT_FP ,NULL ,"\n match IP dst " ,NULL ); +open_json_object ("dst" ); + } +print_string (PRINT_ANY ,"address" ,"%s" ,inet_ntop (AF_INET , &key->val, abuf,sizeof (abuf))); +print_int (PRINT_ANY ,"prefixlen" ,"/%d" , bits); +close_json_object ();return ; } }
@@ -922,31 +925,30 @@ static void print_ipv6(FILE *f, const struct tc_u32_key *key)case 20 :switch (ntohl (key->mask)) {case 0x0000ffff : -fprintf (f,"\n match sport %u" , -ntohl (key->val) &0xffff ); +print_uint (PRINT_ANY ,"sport" ,"\n match sport %u" ,ntohl (key->val) &0xffff );return ;case 0xffff0000 : -fprintf (f,"\n match dport %u" , -ntohl (key->val) >>16 ); +print_uint (PRINT_ANY ,"dport" ,"match dport %u" ,ntohl (key->val) >>16 );return ;case 0xffffffff : -fprintf (f,"\n match sport %u, match dport %u" , -ntohl (key->val) &0xffff , -ntohl (key->val) >>16 ); +print_uint (PRINT_ANY ,"sport" ,"\n match sport %u, " ,ntohl (key->val) &0xffff ); +print_uint (PRINT_ANY ,"dport" ,"match dport %u" ,ntohl (key->val) >>16 );return ; }/* XXX: Default print_raw */ } +close_json_object (); }static void print_raw (FILE *f,const struct tc_u32_key *key) { -fprintf (f,"\n match %08x/%08x at %s%d" , - (unsigned int )ntohl (key->val), - (unsigned int )ntohl (key->mask), - key->offmask ?"nexthdr+" :"" , - key->off); +open_json_object ("match" ); +print_hex (PRINT_ANY ,"value" ,"\n match %08x" , (unsigned int )ntohl (key->val)); +print_hex (PRINT_ANY ,"mask" ,"/%08x " , (unsigned int )ntohl (key->mask)); +print_string (PRINT_ANY ,"offmask" ,"at %s" , key->offmask ?"nexthdr+" :"" ); +print_int (PRINT_ANY ,"off" ,"%d" , key->off); +close_json_object (); } static const struct {
Signature · 1 line
2.26.3