#include "tc_util.h"
#include <linux/tc_act/tc_vlan.h>
+static const char * const action_names[] = {
+ [TCA_VLAN_ACT_POP] = "pop",
+ [TCA_VLAN_ACT_PUSH] = "push",
+ [TCA_VLAN_ACT_MODIFY] = "modify",
+};
+
static void explain(void)
{
- fprintf(stderr, "Usage: vlan pop\n");
- fprintf(stderr, " vlan push [ protocol VLANPROTO ] id VLANID\n");
- fprintf(stderr, " VLANPROTO is one of 802.1Q or 802.1AD\n");
- fprintf(stderr, " with default: 802.1Q\n");
+ fprintf(stderr,
+ "Usage: vlan pop\n"
+ " vlan push [ protocol VLANPROTO ] id VLANID [ priority VLANPRIO ] [CONTROL]\n"
+ " vlan modify [ protocol VLANPROTO ] id VLANID [ priority VLANPRIO ] [CONTROL]\n"
+ " VLANPROTO is one of 802.1Q or 802.1AD\n"
+ " with default: 802.1Q\n"
+ " CONTROL := reclassify | pipe | drop | continue | pass |\n"
+ " goto chain <CHAIN_INDEX>\n");
}
static void usage(void)
exit(-1);
}
+static bool has_push_attribs(int action)
+{
+ return action == TCA_VLAN_ACT_PUSH || action == TCA_VLAN_ACT_MODIFY;
+}
+
+static void unexpected(const char *arg)
+{
+ fprintf(stderr,
+ "unexpected \"%s\" - action already specified\n",
+ arg);
+ explain();
+}
+
static int parse_vlan(struct action_util *a, int *argc_p, char ***argv_p,
int tca_id, struct nlmsghdr *n)
{
int id_set = 0;
__u16 proto;
int proto_set = 0;
- struct tc_vlan parm = { 0 };
+ __u8 prio;
+ int prio_set = 0;
+ struct tc_vlan parm = {};
if (matches(*argv, "vlan") != 0)
return -1;
while (argc > 0) {
if (matches(*argv, "pop") == 0) {
if (action) {
- fprintf(stderr, "unexpected \"%s\" - action already specified\n",
- *argv);
- explain();
+ unexpected(*argv);
return -1;
}
action = TCA_VLAN_ACT_POP;
} else if (matches(*argv, "push") == 0) {
if (action) {
- fprintf(stderr, "unexpected \"%s\" - action already specified\n",
- *argv);
- explain();
+ unexpected(*argv);
return -1;
}
action = TCA_VLAN_ACT_PUSH;
- } else if (matches(*argv, "id") == 0) {
- if (action != TCA_VLAN_ACT_PUSH) {
- fprintf(stderr, "\"%s\" is only valid for push\n",
- *argv);
- explain();
+ } else if (matches(*argv, "modify") == 0) {
+ if (action) {
+ unexpected(*argv);
return -1;
}
+ action = TCA_VLAN_ACT_MODIFY;
+ } else if (matches(*argv, "id") == 0) {
+ if (!has_push_attribs(action))
+ invarg("only valid for push/modify", *argv);
+
NEXT_ARG();
if (get_u16(&id, *argv, 0))
invarg("id is invalid", *argv);
id_set = 1;
} else if (matches(*argv, "protocol") == 0) {
- if (action != TCA_VLAN_ACT_PUSH) {
- fprintf(stderr, "\"%s\" is only valid for push\n",
- *argv);
- explain();
- return -1;
- }
+ if (!has_push_attribs(action))
+ invarg("only valid for push/modify", *argv);
+
NEXT_ARG();
if (ll_proto_a2n(&proto, *argv))
invarg("protocol is invalid", *argv);
proto_set = 1;
+ } else if (matches(*argv, "priority") == 0) {
+ if (!has_push_attribs(action))
+ invarg("only valid for push/modify", *argv);
+
+ NEXT_ARG();
+ if (get_u8(&prio, *argv, 0) || (prio & ~0x7))
+ invarg("prio is invalid", *argv);
+ prio_set = 1;
} else if (matches(*argv, "help") == 0) {
usage();
} else {
argv++;
}
- parm.action = TC_ACT_PIPE;
- if (argc) {
- if (matches(*argv, "reclassify") == 0) {
- parm.action = TC_ACT_RECLASSIFY;
- NEXT_ARG();
- } else if (matches(*argv, "pipe") == 0) {
- parm.action = TC_ACT_PIPE;
- NEXT_ARG();
- } else if (matches(*argv, "drop") == 0 ||
- matches(*argv, "shot") == 0) {
- parm.action = TC_ACT_SHOT;
- NEXT_ARG();
- } else if (matches(*argv, "continue") == 0) {
- parm.action = TC_ACT_UNSPEC;
- NEXT_ARG();
- } else if (matches(*argv, "pass") == 0) {
- parm.action = TC_ACT_OK;
- NEXT_ARG();
- }
- }
+ parse_action_control_dflt(&argc, &argv, &parm.action,
+ false, TC_ACT_PIPE);
if (argc) {
if (matches(*argv, "index") == 0) {
}
}
- if (action == TCA_VLAN_ACT_PUSH && !id_set) {
- fprintf(stderr, "id needs to be set for push\n");
+ if (has_push_attribs(action) && !id_set) {
+ fprintf(stderr, "id needs to be set for %s\n",
+ action_names[action]);
explain();
return -1;
}
parm.v_action = action;
- tail = NLMSG_TAIL(n);
- addattr_l(n, MAX_MSG, tca_id, NULL, 0);
+ tail = addattr_nest(n, MAX_MSG, tca_id);
addattr_l(n, MAX_MSG, TCA_VLAN_PARMS, &parm, sizeof(parm));
if (id_set)
addattr_l(n, MAX_MSG, TCA_VLAN_PUSH_VLAN_ID, &id, 2);
addattr_l(n, MAX_MSG, TCA_VLAN_PUSH_VLAN_PROTOCOL, &proto, 2);
}
- tail->rta_len = (char *)NLMSG_TAIL(n) - (char *)tail;
+ if (prio_set)
+ addattr8(n, MAX_MSG, TCA_VLAN_PUSH_VLAN_PRIORITY, prio);
+
+ addattr_nest_end(n, tail);
*argc_p = argc;
*argv_p = argv;
parse_rtattr_nested(tb, TCA_VLAN_MAX, arg);
if (!tb[TCA_VLAN_PARMS]) {
- fprintf(f, "[NULL vlan parameters]");
+ print_string(PRINT_FP, NULL, "%s", "[NULL vlan parameters]");
return -1;
}
parm = RTA_DATA(tb[TCA_VLAN_PARMS]);
- fprintf(f, " vlan");
+ print_string(PRINT_ANY, "kind", "%s ", "vlan");
+ print_string(PRINT_ANY, "vlan_action", " %s",
+ action_names[parm->v_action]);
- switch(parm->v_action) {
- case TCA_VLAN_ACT_POP:
- fprintf(f, " pop");
- break;
+ switch (parm->v_action) {
case TCA_VLAN_ACT_PUSH:
- fprintf(f, " push");
+ case TCA_VLAN_ACT_MODIFY:
if (tb[TCA_VLAN_PUSH_VLAN_ID]) {
val = rta_getattr_u16(tb[TCA_VLAN_PUSH_VLAN_ID]);
- fprintf(f, " id %u", val);
+ print_uint(PRINT_ANY, "id", " id %u", val);
}
if (tb[TCA_VLAN_PUSH_VLAN_PROTOCOL]) {
- fprintf(f, " protocol %s",
- ll_proto_n2a(rta_getattr_u16(tb[TCA_VLAN_PUSH_VLAN_PROTOCOL]),
- b1, sizeof(b1)));
+ __u16 proto;
+
+ proto = rta_getattr_u16(tb[TCA_VLAN_PUSH_VLAN_PROTOCOL]);
+ print_string(PRINT_ANY, "protocol", " protocol %s",
+ ll_proto_n2a(proto, b1, sizeof(b1)));
+ }
+ if (tb[TCA_VLAN_PUSH_VLAN_PRIORITY]) {
+ val = rta_getattr_u8(tb[TCA_VLAN_PUSH_VLAN_PRIORITY]);
+ print_uint(PRINT_ANY, "priority", " priority %u", val);
}
break;
}
+ print_action_control(f, " ", parm->action, "");
- fprintf(f, "\n\t index %d ref %d bind %d", parm->index, parm->refcnt,
- parm->bindcnt);
+ print_uint(PRINT_ANY, "index", "\n\t index %u", parm->index);
+ print_int(PRINT_ANY, "ref", " ref %d", parm->refcnt);
+ print_int(PRINT_ANY, "bind", " bind %d", parm->bindcnt);
if (show_stats) {
if (tb[TCA_VLAN_TM]) {
struct tcf_t *tm = RTA_DATA(tb[TCA_VLAN_TM]);
+
print_tm(f, tm);
}
}
- fprintf(f, "\n ");
+ print_string(PRINT_FP, NULL, "%s", "\n");
return 0;
}