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

actions ife: Introduce encoding and decoding of tcindex metadata 

Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
This commit is contained in:
Jamal Hadi Salim 2016-10-11 07:00:43 -04:00 committed by Stephen Hemminger
parent 1b600f4b54
commit 8da6ff35cd
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tc/m_ife.c
View File

@ -67,6 +67,8 @@ static int parse_ife(struct action_util *a, int *argc_p, char ***argv_p,
__u32 ife_prio_v = 0; __u32 ife_prio_v = 0;
__u32 ife_mark = 0; __u32 ife_mark = 0;
__u32 ife_mark_v = 0; __u32 ife_mark_v = 0;
__u16 ife_tcindex = 0;
__u16 ife_tcindex_v = 0;
char *daddr = NULL; char *daddr = NULL;
char *saddr = NULL; char *saddr = NULL;
@ -89,6 +91,8 @@ static int parse_ife(struct action_util *a, int *argc_p, char ***argv_p,
ife_mark = IFE_META_SKBMARK; ife_mark = IFE_META_SKBMARK;
} else if (matches(*argv, "prio") == 0) { } else if (matches(*argv, "prio") == 0) {
ife_prio = IFE_META_PRIO; ife_prio = IFE_META_PRIO;
} else if (matches(*argv, "tcindex") == 0) {
ife_prio = IFE_META_TCINDEX;
} else { } else {
fprintf(stderr, "Illegal meta define <%s>\n", fprintf(stderr, "Illegal meta define <%s>\n",
*argv); *argv);
@ -106,6 +110,11 @@ static int parse_ife(struct action_util *a, int *argc_p, char ***argv_p,
if (get_u32(&ife_prio_v, *argv, 0)) if (get_u32(&ife_prio_v, *argv, 0))
invarg("ife prio val is invalid", invarg("ife prio val is invalid",
*argv); *argv);
} else if (matches(*argv, "tcindex") == 0) {
NEXT_ARG();
if (get_u16(&ife_tcindex_v, *argv, 0))
invarg("ife tcindex val is invalid",
*argv);
} else { } else {
fprintf(stderr, "Illegal meta use type <%s>\n", fprintf(stderr, "Illegal meta use type <%s>\n",
*argv); *argv);
@ -196,6 +205,13 @@ static int parse_ife(struct action_util *a, int *argc_p, char ***argv_p,
else else
addattr_l(n, MAX_MSG, IFE_META_PRIO, NULL, 0); addattr_l(n, MAX_MSG, IFE_META_PRIO, NULL, 0);
} }
if (ife_tcindex || ife_tcindex_v) {
if (ife_tcindex_v)
addattr_l(n, MAX_MSG, IFE_META_TCINDEX, &ife_tcindex_v,
2);
else
addattr_l(n, MAX_MSG, IFE_META_TCINDEX, NULL, 0);
}
tail2->rta_len = (void *)NLMSG_TAIL(n) - (void *)tail2; tail2->rta_len = (void *)NLMSG_TAIL(n) - (void *)tail2;
@ -213,7 +229,7 @@ static int print_ife(struct action_util *au, FILE *f, struct rtattr *arg)
struct rtattr *tb[TCA_IFE_MAX + 1]; struct rtattr *tb[TCA_IFE_MAX + 1];
__u16 ife_type = 0; __u16 ife_type = 0;
__u32 mmark = 0; __u32 mmark = 0;
__u32 mhash = 0; __u16 mtcindex = 0;
__u32 mprio = 0; __u32 mprio = 0;
int has_optional = 0; int has_optional = 0;
SPRINT_BUF(b2); SPRINT_BUF(b2);
@ -258,13 +274,14 @@ static int print_ife(struct action_util *au, FILE *f, struct rtattr *arg)
fprintf(f, "allow mark "); fprintf(f, "allow mark ");
} }
if (metalist[IFE_META_HASHID]) { if (metalist[IFE_META_TCINDEX]) {
len = RTA_PAYLOAD(metalist[IFE_META_HASHID]); len = RTA_PAYLOAD(metalist[IFE_META_TCINDEX]);
if (len) { if (len) {
mhash = rta_getattr_u32(metalist[IFE_META_HASHID]); mtcindex =
fprintf(f, "use hash %u ", mhash); rta_getattr_u16(metalist[IFE_META_TCINDEX]);
fprintf(f, "use tcindex %d ", mtcindex);
} else } else
fprintf(f, "allow hash "); fprintf(f, "allow tcindex ");
} }
if (metalist[IFE_META_PRIO]) { if (metalist[IFE_META_PRIO]) {