proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2025-10-04 21:03:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tc: skip actions that don't have options attribute when printing

Browse Source 
Modify implementations that return error from action_until->print_aopt()
callback to silently skip actions that don't have their corresponding
TCA_ACT_OPTIONS attribute set (some actions already behave like this).
Print action kind before returning from action_until->print_aopt()
callbacks. This is necessary to support terse dump mode in following patch
in the series.

Signed-off-by: Vlad Buslov <vladbu@mellanox.com>
Suggested-by: Jamal Hadi Salim <jhs@mojatatu.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David Ahern <dsahern@gmail.com>
This commit is contained in:
Vlad Buslov 2020-10-23 17:55:35 +03:00 committed by David Ahern
parent eb12cc9ae1
commit a99ebeeef2
20 changed files with 35 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tc/m_bpf.c
View File

@ -161,8 +161,9 @@ static int bpf_print_opt(struct action_util *au, FILE *f, struct rtattr *arg)
struct tc_act_bpf *parm; struct tc_act_bpf *parm;
int d_ok = 0; int d_ok = 0;
print_string(PRINT_ANY, "kind", "%s ", "bpf");
if (arg == NULL) if (arg == NULL)
return -1; return 0;
parse_rtattr_nested(tb, TCA_ACT_BPF_MAX, arg); parse_rtattr_nested(tb, TCA_ACT_BPF_MAX, arg);
@ -172,7 +173,6 @@ static int bpf_print_opt(struct action_util *au, FILE *f, struct rtattr *arg)
} }
parm = RTA_DATA(tb[TCA_ACT_BPF_PARMS]); parm = RTA_DATA(tb[TCA_ACT_BPF_PARMS]);
print_string(PRINT_ANY, "kind", "%s ", "bpf");
if (tb[TCA_ACT_BPF_NAME]) if (tb[TCA_ACT_BPF_NAME])
print_string(PRINT_ANY, "bpf_name", "%s ", print_string(PRINT_ANY, "bpf_name", "%s ",

4
tc/m_connmark.c
View File

@ -110,8 +110,9 @@ static int print_connmark(struct action_util *au, FILE *f, struct rtattr *arg)
struct rtattr *tb[TCA_CONNMARK_MAX + 1]; struct rtattr *tb[TCA_CONNMARK_MAX + 1];
struct tc_connmark *ci; struct tc_connmark *ci;
print_string(PRINT_ANY, "kind", "%s ", "connmark");
if (arg == NULL) if (arg == NULL)
return -1; return 0;
parse_rtattr_nested(tb, TCA_CONNMARK_MAX, arg); parse_rtattr_nested(tb, TCA_CONNMARK_MAX, arg);
if (tb[TCA_CONNMARK_PARMS] == NULL) { if (tb[TCA_CONNMARK_PARMS] == NULL) {
@ -121,7 +122,6 @@ static int print_connmark(struct action_util *au, FILE *f, struct rtattr *arg)
ci = RTA_DATA(tb[TCA_CONNMARK_PARMS]); ci = RTA_DATA(tb[TCA_CONNMARK_PARMS]);
print_string(PRINT_ANY, "kind", "%s ", "connmark");
print_uint(PRINT_ANY, "zone", "zone %u", ci->zone); print_uint(PRINT_ANY, "zone", "zone %u", ci->zone);
print_action_control(f, " ", ci->action, ""); print_action_control(f, " ", ci->action, "");

4
tc/m_csum.c
View File

@ -166,8 +166,9 @@ print_csum(struct action_util *au, FILE *f, struct rtattr *arg)
int uflag_count = 0; int uflag_count = 0;
print_string(PRINT_ANY, "kind", "%s ", "csum");
if (arg == NULL) if (arg == NULL)
return -1; return 0;
parse_rtattr_nested(tb, TCA_CSUM_MAX, arg); parse_rtattr_nested(tb, TCA_CSUM_MAX, arg);
@ -199,7 +200,6 @@ print_csum(struct action_util *au, FILE *f, struct rtattr *arg)
uflag_1 = "?empty"; uflag_1 = "?empty";
} }
print_string(PRINT_ANY, "kind", "%s ", "csum");
snprintf(buf, sizeof(buf), "%s%s%s%s%s%s%s", snprintf(buf, sizeof(buf), "%s%s%s%s%s%s%s",
uflag_1, uflag_2, uflag_3, uflag_1, uflag_2, uflag_3,
uflag_4, uflag_5, uflag_6, uflag_7); uflag_4, uflag_5, uflag_6, uflag_7);

5
tc/m_ct.c
View File

@ -443,8 +443,9 @@ static int print_ct(struct action_util *au, FILE *f, struct rtattr *arg)
struct tc_ct *p; struct tc_ct *p;
int ct_action = 0; int ct_action = 0;
print_string(PRINT_ANY, "kind", "%s", "ct");
if (arg == NULL) if (arg == NULL)
return -1; return 0;
parse_rtattr_nested(tb, TCA_CT_MAX, arg); parse_rtattr_nested(tb, TCA_CT_MAX, arg);
if (tb[TCA_CT_PARMS] == NULL) { if (tb[TCA_CT_PARMS] == NULL) {
@ -454,8 +455,6 @@ static int print_ct(struct action_util *au, FILE *f, struct rtattr *arg)
p = RTA_DATA(tb[TCA_CT_PARMS]); p = RTA_DATA(tb[TCA_CT_PARMS]);
print_string(PRINT_ANY, "kind", "%s", "ct");
if (tb[TCA_CT_ACTION]) if (tb[TCA_CT_ACTION])
ct_action = rta_getattr_u16(tb[TCA_CT_ACTION]); ct_action = rta_getattr_u16(tb[TCA_CT_ACTION]);
if (ct_action & TCA_CT_ACT_COMMIT) { if (ct_action & TCA_CT_ACT_COMMIT) {

4
tc/m_ctinfo.c
View File

@ -188,8 +188,9 @@ static int print_ctinfo(struct action_util *au, FILE *f, struct rtattr *arg)
unsigned short zone = 0; unsigned short zone = 0;
struct tc_ctinfo *ci; struct tc_ctinfo *ci;
print_string(PRINT_ANY, "kind", "%s ", "ctinfo");
if (arg == NULL) if (arg == NULL)
return -1; return 0;
parse_rtattr_nested(tb, TCA_CTINFO_MAX, arg); parse_rtattr_nested(tb, TCA_CTINFO_MAX, arg);
if (!tb[TCA_CTINFO_ACT]) { if (!tb[TCA_CTINFO_ACT]) {
@ -234,7 +235,6 @@ static int print_ctinfo(struct action_util *au, FILE *f, struct rtattr *arg)
sizeof(__u16)) sizeof(__u16))
zone = rta_getattr_u16(tb[TCA_CTINFO_ZONE]); zone = rta_getattr_u16(tb[TCA_CTINFO_ZONE]);
print_string(PRINT_ANY, "kind", "%s ", "ctinfo");
print_hu(PRINT_ANY, "zone", "zone %u", zone); print_hu(PRINT_ANY, "zone", "zone %u", zone);
print_action_control(f, " ", ci->action, ""); print_action_control(f, " ", ci->action, "");

4
tc/m_gact.c
View File

@ -171,8 +171,9 @@ print_gact(struct action_util *au, FILE *f, struct rtattr *arg)
struct tc_gact *p = NULL; struct tc_gact *p = NULL;
struct rtattr *tb[TCA_GACT_MAX + 1]; struct rtattr *tb[TCA_GACT_MAX + 1];
print_string(PRINT_ANY, "kind", "%s ", "gact");
if (arg == NULL) if (arg == NULL)
return -1; return 0;
parse_rtattr_nested(tb, TCA_GACT_MAX, arg); parse_rtattr_nested(tb, TCA_GACT_MAX, arg);
@ -182,7 +183,6 @@ print_gact(struct action_util *au, FILE *f, struct rtattr *arg)
} }
p = RTA_DATA(tb[TCA_GACT_PARMS]); p = RTA_DATA(tb[TCA_GACT_PARMS]);
print_string(PRINT_ANY, "kind", "%s ", "gact");
print_action_control(f, "action ", p->action, ""); print_action_control(f, "action ", p->action, "");
#ifdef CONFIG_GACT_PROB #ifdef CONFIG_GACT_PROB
if (tb[TCA_GACT_PROB] != NULL) { if (tb[TCA_GACT_PROB] != NULL) {

4
tc/m_ife.c
View File

@ -227,8 +227,9 @@ static int print_ife(struct action_util *au, FILE *f, struct rtattr *arg)
int has_optional = 0; int has_optional = 0;
SPRINT_BUF(b2); SPRINT_BUF(b2);
print_string(PRINT_ANY, "kind", "%s ", "ife");
if (arg == NULL) if (arg == NULL)
return -1; return 0;
parse_rtattr_nested(tb, TCA_IFE_MAX, arg); parse_rtattr_nested(tb, TCA_IFE_MAX, arg);
@ -238,7 +239,6 @@ static int print_ife(struct action_util *au, FILE *f, struct rtattr *arg)
} }
p = RTA_DATA(tb[TCA_IFE_PARMS]); p = RTA_DATA(tb[TCA_IFE_PARMS]);
print_string(PRINT_ANY, "kind", "%s ", "ife");
print_string(PRINT_ANY, "mode", "%s ", print_string(PRINT_ANY, "mode", "%s ",
p->flags & IFE_ENCODE ? "encode" : "decode"); p->flags & IFE_ENCODE ? "encode" : "decode");
print_action_control(f, "action ", p->action, " "); print_action_control(f, "action ", p->action, " ");

2
tc/m_ipt.c
View File

@ -433,7 +433,7 @@ print_ipt(struct action_util *au, FILE * f, struct rtattr *arg)
__u32 hook; __u32 hook;
if (arg == NULL) if (arg == NULL)
return -1; return 0;
lib_dir = getenv("IPTABLES_LIB_DIR"); lib_dir = getenv("IPTABLES_LIB_DIR");
if (!lib_dir) if (!lib_dir)

4
tc/m_mirred.c
View File

@ -281,8 +281,9 @@ print_mirred(struct action_util *au, FILE *f, struct rtattr *arg)
struct rtattr *tb[TCA_MIRRED_MAX + 1]; struct rtattr *tb[TCA_MIRRED_MAX + 1];
const char *dev; const char *dev;
print_string(PRINT_ANY, "kind", "%s ", "mirred");
if (arg == NULL) if (arg == NULL)
return -1; return 0;
parse_rtattr_nested(tb, TCA_MIRRED_MAX, arg); parse_rtattr_nested(tb, TCA_MIRRED_MAX, arg);
@ -298,7 +299,6 @@ print_mirred(struct action_util *au, FILE *f, struct rtattr *arg)
return -1; return -1;
} }
print_string(PRINT_ANY, "kind", "%s ", "mirred");
print_string(PRINT_FP, NULL, "(%s", mirred_n2a(p->eaction)); print_string(PRINT_FP, NULL, "(%s", mirred_n2a(p->eaction));
print_string(PRINT_JSON, "mirred_action", NULL, print_string(PRINT_JSON, "mirred_action", NULL,
mirred_action(p->eaction)); mirred_action(p->eaction));

4
tc/m_mpls.c
View File

@ -213,8 +213,9 @@ static int print_mpls(struct action_util *au, FILE *f, struct rtattr *arg)
SPRINT_BUF(b1); SPRINT_BUF(b1);
__u32 val; __u32 val;
print_string(PRINT_ANY, "kind", "%s ", "mpls");
if (!arg) if (!arg)
return -1; return 0;
parse_rtattr_nested(tb, TCA_MPLS_MAX, arg); parse_rtattr_nested(tb, TCA_MPLS_MAX, arg);
@ -224,7 +225,6 @@ static int print_mpls(struct action_util *au, FILE *f, struct rtattr *arg)
} }
parm = RTA_DATA(tb[TCA_MPLS_PARMS]); parm = RTA_DATA(tb[TCA_MPLS_PARMS]);
print_string(PRINT_ANY, "kind", "%s ", "mpls");
print_string(PRINT_ANY, "mpls_action", " %s", print_string(PRINT_ANY, "mpls_action", " %s",
action_names[parm->m_action]); action_names[parm->m_action]);

4
tc/m_nat.c
View File

@ -146,8 +146,9 @@ print_nat(struct action_util *au, FILE * f, struct rtattr *arg)
SPRINT_BUF(buf2); SPRINT_BUF(buf2);
int len; int len;
print_string(PRINT_ANY, "type", " %s ", "nat");
if (arg == NULL) if (arg == NULL)
return -1; return 0;
parse_rtattr_nested(tb, TCA_NAT_MAX, arg); parse_rtattr_nested(tb, TCA_NAT_MAX, arg);
@ -160,7 +161,6 @@ print_nat(struct action_util *au, FILE * f, struct rtattr *arg)
len = ffs(sel->mask); len = ffs(sel->mask);
len = len ? 33 - len : 0; len = len ? 33 - len : 0;
print_string(PRINT_ANY, "type", " %s ", "nat");
print_string(PRINT_ANY, "direction", "%s", print_string(PRINT_ANY, "direction", "%s",
sel->flags & TCA_NAT_FLAG_EGRESS ? "egress" : "ingress"); sel->flags & TCA_NAT_FLAG_EGRESS ? "egress" : "ingress");

4
tc/m_pedit.c
View File

@ -745,8 +745,9 @@ static int print_pedit(struct action_util *au, FILE *f, struct rtattr *arg)
struct m_pedit_key_ex *keys_ex = NULL; struct m_pedit_key_ex *keys_ex = NULL;
int err; int err;
print_string(PRINT_ANY, "kind", " %s ", "pedit");
if (arg == NULL) if (arg == NULL)
return -1; return 0;
parse_rtattr_nested(tb, TCA_PEDIT_MAX, arg); parse_rtattr_nested(tb, TCA_PEDIT_MAX, arg);
@ -783,7 +784,6 @@ static int print_pedit(struct action_util *au, FILE *f, struct rtattr *arg)
} }
} }
print_string(PRINT_ANY, "kind", " %s ", "pedit");
print_action_control(f, "action ", sel->action, " "); print_action_control(f, "action ", sel->action, " ");
print_uint(PRINT_ANY, "nkeys", "keys %d\n", sel->nkeys); print_uint(PRINT_ANY, "nkeys", "keys %d\n", sel->nkeys);
print_uint(PRINT_ANY, "index", " \t index %u", sel->index); print_uint(PRINT_ANY, "index", " \t index %u", sel->index);

4
tc/m_sample.c
View File

@ -143,8 +143,9 @@ static int print_sample(struct action_util *au, FILE *f, struct rtattr *arg)
struct rtattr *tb[TCA_SAMPLE_MAX + 1]; struct rtattr *tb[TCA_SAMPLE_MAX + 1];
struct tc_sample *p; struct tc_sample *p;
print_string(PRINT_ANY, "kind", "%s ", "sample");
if (arg == NULL) if (arg == NULL)
return -1; return 0;
parse_rtattr_nested(tb, TCA_SAMPLE_MAX, arg); parse_rtattr_nested(tb, TCA_SAMPLE_MAX, arg);
@ -155,7 +156,6 @@ static int print_sample(struct action_util *au, FILE *f, struct rtattr *arg)
} }
p = RTA_DATA(tb[TCA_SAMPLE_PARMS]); p = RTA_DATA(tb[TCA_SAMPLE_PARMS]);
print_string(PRINT_ANY, "kind", "%s ", "sample");
print_uint(PRINT_ANY, "rate", "rate 1/%u ", print_uint(PRINT_ANY, "rate", "rate 1/%u ",
rta_getattr_u32(tb[TCA_SAMPLE_RATE])); rta_getattr_u32(tb[TCA_SAMPLE_RATE]));
print_uint(PRINT_ANY, "group", "group %u", print_uint(PRINT_ANY, "group", "group %u",

2
tc/m_simple.c
View File

@ -166,7 +166,7 @@ static int print_simple(struct action_util *au, FILE *f, struct rtattr *arg)
char *simpdata; char *simpdata;
if (arg == NULL) if (arg == NULL)
return -1; return 0;
parse_rtattr_nested(tb, TCA_DEF_MAX, arg); parse_rtattr_nested(tb, TCA_DEF_MAX, arg);

5
tc/m_skbedit.c
View File

@ -198,8 +198,9 @@ static int print_skbedit(struct action_util *au, FILE *f, struct rtattr *arg)
__u16 ptype; __u16 ptype;
struct tc_skbedit *p; struct tc_skbedit *p;
print_string(PRINT_ANY, "kind", "%s ", "skbedit");
if (arg == NULL) if (arg == NULL)
return -1; return 0;
parse_rtattr_nested(tb, TCA_SKBEDIT_MAX, arg); parse_rtattr_nested(tb, TCA_SKBEDIT_MAX, arg);
@ -209,8 +210,6 @@ static int print_skbedit(struct action_util *au, FILE *f, struct rtattr *arg)
} }
p = RTA_DATA(tb[TCA_SKBEDIT_PARMS]); p = RTA_DATA(tb[TCA_SKBEDIT_PARMS]);
print_string(PRINT_ANY, "kind", "%s ", "skbedit");
if (tb[TCA_SKBEDIT_QUEUE_MAPPING] != NULL) { if (tb[TCA_SKBEDIT_QUEUE_MAPPING] != NULL) {
print_uint(PRINT_ANY, "queue_mapping", "queue_mapping %u", print_uint(PRINT_ANY, "queue_mapping", "queue_mapping %u",
rta_getattr_u16(tb[TCA_SKBEDIT_QUEUE_MAPPING])); rta_getattr_u16(tb[TCA_SKBEDIT_QUEUE_MAPPING]));

2
tc/m_skbmod.c
View File

@ -169,7 +169,7 @@ static int print_skbmod(struct action_util *au, FILE *f, struct rtattr *arg)
SPRINT_BUF(b2); SPRINT_BUF(b2);
if (arg == NULL) if (arg == NULL)
return -1; return 0;
parse_rtattr_nested(tb, TCA_SKBMOD_MAX, arg); parse_rtattr_nested(tb, TCA_SKBMOD_MAX, arg);

5
tc/m_tunnel_key.c
View File

@ -670,8 +670,9 @@ static int print_tunnel_key(struct action_util *au, FILE *f, struct rtattr *arg)
struct rtattr *tb[TCA_TUNNEL_KEY_MAX + 1]; struct rtattr *tb[TCA_TUNNEL_KEY_MAX + 1];
struct tc_tunnel_key *parm; struct tc_tunnel_key *parm;
print_string(PRINT_ANY, "kind", "%s ", "tunnel_key");
if (!arg) if (!arg)
return -1; return 0;
parse_rtattr_nested(tb, TCA_TUNNEL_KEY_MAX, arg); parse_rtattr_nested(tb, TCA_TUNNEL_KEY_MAX, arg);
@ -681,8 +682,6 @@ static int print_tunnel_key(struct action_util *au, FILE *f, struct rtattr *arg)
} }
parm = RTA_DATA(tb[TCA_TUNNEL_KEY_PARMS]); parm = RTA_DATA(tb[TCA_TUNNEL_KEY_PARMS]);
print_string(PRINT_ANY, "kind", "%s ", "tunnel_key");
switch (parm->t_action) { switch (parm->t_action) {
case TCA_TUNNEL_KEY_ACT_RELEASE: case TCA_TUNNEL_KEY_ACT_RELEASE:
print_string(PRINT_ANY, "mode", " %s", "unset"); print_string(PRINT_ANY, "mode", " %s", "unset");

4
tc/m_vlan.c
View File

@ -238,8 +238,9 @@ static int print_vlan(struct action_util *au, FILE *f, struct rtattr *arg)
__u16 val; __u16 val;
struct tc_vlan *parm; struct tc_vlan *parm;
print_string(PRINT_ANY, "kind", "%s ", "vlan");
if (arg == NULL) if (arg == NULL)
return -1; return 0;
parse_rtattr_nested(tb, TCA_VLAN_MAX, arg); parse_rtattr_nested(tb, TCA_VLAN_MAX, arg);
@ -249,7 +250,6 @@ static int print_vlan(struct action_util *au, FILE *f, struct rtattr *arg)
} }
parm = RTA_DATA(tb[TCA_VLAN_PARMS]); parm = RTA_DATA(tb[TCA_VLAN_PARMS]);
print_string(PRINT_ANY, "kind", "%s ", "vlan");
print_string(PRINT_ANY, "vlan_action", " %s", print_string(PRINT_ANY, "vlan_action", " %s",
action_names[parm->v_action]); action_names[parm->v_action]);

2
tc/m_xt.c
View File

@ -320,7 +320,7 @@ print_ipt(struct action_util *au, FILE *f, struct rtattr *arg)
__u32 hook; __u32 hook;
if (arg == NULL) if (arg == NULL)
return -1; return 0;
/* copy tcipt_globals because .opts will be modified by iptables */ /* copy tcipt_globals because .opts will be modified by iptables */
struct xtables_globals tmp_tcipt_globals = tcipt_globals; struct xtables_globals tmp_tcipt_globals = tcipt_globals;

2
tc/m_xt_old.c
View File

@ -358,7 +358,7 @@ print_ipt(struct action_util *au, FILE * f, struct rtattr *arg)
__u32 hook; __u32 hook;
if (arg == NULL) if (arg == NULL)
return -1; return 0;
set_lib_dir(); set_lib_dir();