matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

actions: Get vlan action to work in pipeline 

When specified in a graph such as:
action vlan ... action foobar
the vlan action chewed more than it can swallow

Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
This commit is contained in:
Jamal Hadi Salim 2015-01-11 09:31:30 -05:00 committed by Stephen Hemminger
parent ee0067a918
commit 564663b4ca
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tc/m_vlan.c
View File

@ -103,20 +103,25 @@ static int parse_vlan(struct action_util *a, int *argc_p, char ***argv_p,
if (argc) { if (argc) {
if (matches(*argv, "reclassify") == 0) { if (matches(*argv, "reclassify") == 0) {
parm.action = TC_ACT_RECLASSIFY; parm.action = TC_ACT_RECLASSIFY;
NEXT_ARG(); argc--;
argv++;
} else if (matches(*argv, "pipe") == 0) { } else if (matches(*argv, "pipe") == 0) {
parm.action = TC_ACT_PIPE; parm.action = TC_ACT_PIPE;
NEXT_ARG(); argc--;
argv++;
} else if (matches(*argv, "drop") == 0 || } else if (matches(*argv, "drop") == 0 ||
matches(*argv, "shot") == 0) { matches(*argv, "shot") == 0) {
parm.action = TC_ACT_SHOT; parm.action = TC_ACT_SHOT;
NEXT_ARG(); argc--;
argv++;
} else if (matches(*argv, "continue") == 0) { } else if (matches(*argv, "continue") == 0) {
parm.action = TC_ACT_UNSPEC; parm.action = TC_ACT_UNSPEC;
NEXT_ARG(); argc--;
argv++;
} else if (matches(*argv, "pass") == 0) { } else if (matches(*argv, "pass") == 0) {
parm.action = TC_ACT_OK; parm.action = TC_ACT_OK;
NEXT_ARG(); argc--;
argv++;
} }
} }
@ -198,6 +203,7 @@ static int print_vlan(struct action_util *au, FILE *f, struct rtattr *arg)
} }
break; break;
} }
fprintf(f, " %s", action_n2a(parm->action, b1, sizeof (b1)));
fprintf(f, "\n\t index %d ref %d bind %d", parm->index, parm->refcnt, fprintf(f, "\n\t index %d ref %d bind %d", parm->index, parm->refcnt,
parm->bindcnt); parm->bindcnt);