Commit fdf1bdd0 authored by Jamal Hadi Salim's avatar Jamal Hadi Salim Committed by Stephen Hemminger

tc simple action update and breakage

Brings it closer to more serious actions (adding branching
and allowing for late binding)

Unfortunately this breaks old syntax of the simple action.
But because simple is a pedagogical example unlikely to be used
in production environments (i.e its role is to serve as an example
on how to write actions), then this is ok.

New syntax for simple has new keyword "sdata". Example usage is:

sudo tc actions add action simple sdata "foobar" index 1
or
tc filter add dev $DEV parent ffff: protocol ip prio 1 u32\
match ip dst 17.0.0.1/32 flowid 1:10 action simple sdata "foobar"
Signed-off-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
parent 43726b75
...@@ -81,9 +81,10 @@ ...@@ -81,9 +81,10 @@
#endif #endif
static void explain(void) static void explain(void)
{ {
fprintf(stderr, "Usage: ... simple STRING\n" fprintf(stderr, "Usage:... simple [sdata STRING] [CONTROL] [index INDEX]\n");
"STRING being an arbitrary string\n" fprintf(stderr, "\tSTRING being an arbitrary string\n"
"example: \"simple blah\"\n"); "\tCONTROL := reclassify|pipe|drop|continue|ok\n"
"\tINDEX := optional index value used\n");
} }
static void usage(void) static void usage(void)
...@@ -99,56 +100,85 @@ parse_simple(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, ...@@ -99,56 +100,85 @@ parse_simple(struct action_util *a, int *argc_p, char ***argv_p, int tca_id,
struct tc_defact sel = {}; struct tc_defact sel = {};
int argc = *argc_p; int argc = *argc_p;
char **argv = *argv_p; char **argv = *argv_p;
int ok = 0; int ok = 0, maybe_bind = 0;
struct rtattr *tail; struct rtattr *tail;
char *simpdata = NULL; char *simpdata = NULL;
while (argc > 0) { while (argc > 0) {
if (matches(*argv, "simple") == 0) { if (matches(*argv, "simple") == 0) {
NEXT_ARG(); NEXT_ARG();
} else if (matches(*argv, "sdata") == 0) {
NEXT_ARG();
ok += 1;
simpdata = *argv; simpdata = *argv;
ok = 1;
argc--; argc--;
argv++; argv++;
break;
} else if (matches(*argv, "help") == 0) { } else if (matches(*argv, "help") == 0) {
usage(); usage();
} else { } else {
break; break;
} }
} }
if (!ok) { if (argc) {
explain(); if (matches(*argv, "reclassify") == 0) {
return -1; sel.action = TC_ACT_RECLASSIFY;
argc--;
argv++;
} else if (matches(*argv, "pipe") == 0) {
sel.action = TC_ACT_PIPE;
argc--;
argv++;
} else if (matches(*argv, "drop") == 0 ||
matches(*argv, "shot") == 0) {
sel.action = TC_ACT_SHOT;
argc--;
argv++;
} else if (matches(*argv, "continue") == 0) {
sel.action = TC_ACT_UNSPEC;
argc--;
argv++;
} else if (matches(*argv, "pass") == 0 ||
matches(*argv, "ok") == 0) {
sel.action = TC_ACT_OK;
argc--;
argv++;
}
} }
if (argc) { if (argc) {
if (matches(*argv, "index") == 0) { if (matches(*argv, "index") == 0) {
NEXT_ARG(); NEXT_ARG();
if (get_u32(&sel.index, *argv, 10)) { if (get_u32(&sel.index, *argv, 10)) {
fprintf(stderr, "simple: Illegal \"index\"\n"); fprintf(stderr, "simple: Illegal \"index\"\n",
*argv);
return -1; return -1;
} }
ok += 1;
argc--; argc--;
argv++; argv++;
} }
} }
if (strlen(simpdata) > (SIMP_MAX_DATA - 1)) { if (!ok) {
explain();
return -1;
}
if (simpdata && (strlen(simpdata) > (SIMP_MAX_DATA - 1))) {
fprintf(stderr, "simple: Illegal string len %zu <%s>\n", fprintf(stderr, "simple: Illegal string len %zu <%s>\n",
strlen(simpdata), simpdata); strlen(simpdata), simpdata);
return -1; return -1;
} }
sel.action = TC_ACT_PIPE; sel.action = TC_ACT_PIPE;
tail = NLMSG_TAIL(n); tail = NLMSG_TAIL(n);
addattr_l(n, MAX_MSG, tca_id, NULL, 0); addattr_l(n, MAX_MSG, tca_id, NULL, 0);
addattr_l(n, MAX_MSG, TCA_DEF_PARMS, &sel, sizeof(sel)); addattr_l(n, MAX_MSG, TCA_DEF_PARMS, &sel, sizeof(sel));
addattr_l(n, MAX_MSG, TCA_DEF_DATA, simpdata, SIMP_MAX_DATA); if (simpdata)
addattr_l(n, MAX_MSG, TCA_DEF_DATA, simpdata, SIMP_MAX_DATA);
tail->rta_len = (char *)NLMSG_TAIL(n) - (char *)tail; tail->rta_len = (char *)NLMSG_TAIL(n) - (char *)tail;
*argc_p = argc; *argc_p = argc;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment