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

Merge branch 'master' into net-next

This commit is contained in:
Stephen Hemminger 2017-10-25 12:39:18 +02:00
parent a5e3f41b4d 35f2a7639d
commit 2ac0c6c2c1
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tc/m_gact.c
View File

@ -46,18 +46,20 @@ explain(void)
fprintf(stderr, "Usage: ... gact <ACTION> [RAND] [INDEX]\n"); fprintf(stderr, "Usage: ... gact <ACTION> [RAND] [INDEX]\n");
fprintf(stderr, fprintf(stderr,
"Where: \tACTION := reclassify | drop | continue | pass | pipe |\n" "Where: \tACTION := reclassify | drop | continue | pass | pipe |\n"
" \t goto chain <CHAIN_INDEX>\n" " \t goto chain <CHAIN_INDEX> | jump <JUMP_COUNT>\n"
"\tRAND := random <RANDTYPE> <ACTION> <VAL>\n" "\tRAND := random <RANDTYPE> <ACTION> <VAL>\n"
"\tRANDTYPE := netrand | determ\n" "\tRANDTYPE := netrand | determ\n"
"\tVAL : = value not exceeding 10000\n" "\tVAL : = value not exceeding 10000\n"
"\tJUMP_COUNT := Absolute jump from start of action list\n"
"\tINDEX := index value used\n" "\tINDEX := index value used\n"
"\n"); "\n");
#else #else
fprintf(stderr, "Usage: ... gact <ACTION> [INDEX]\n"); fprintf(stderr, "Usage: ... gact <ACTION> [INDEX]\n");
fprintf(stderr, fprintf(stderr,
"Where: \tACTION := reclassify | drop | continue | pass | pipe |\n" "Where: \tACTION := reclassify | drop | continue | pass | pipe |\n"
" \t goto chain <CHAIN_INDEX>\n" " \t goto chain <CHAIN_INDEX> | jump <JUMP_COUNT>\n"
"\tINDEX := index value used\n" "\tINDEX := index value used\n"
"\tJUMP_COUNT := Absolute jump from start of action list\n"
"\n"); "\n");
#endif #endif
} }

16
tc/tc_util.c
View File

@ -417,6 +417,8 @@ static const char *action_n2a(int action)
if (TC_ACT_EXT_CMP(action, TC_ACT_GOTO_CHAIN)) if (TC_ACT_EXT_CMP(action, TC_ACT_GOTO_CHAIN))
return "goto"; return "goto";
if (TC_ACT_EXT_CMP(action, TC_ACT_JUMP))
return "jump";
switch (action) { switch (action) {
case TC_ACT_UNSPEC: case TC_ACT_UNSPEC:
return "continue"; return "continue";
@ -463,6 +465,7 @@ static int action_a2n(char *arg, int *result, bool allow_num)
{"reclassify", TC_ACT_RECLASSIFY}, {"reclassify", TC_ACT_RECLASSIFY},
{"pipe", TC_ACT_PIPE}, {"pipe", TC_ACT_PIPE},
{"goto", TC_ACT_GOTO_CHAIN}, {"goto", TC_ACT_GOTO_CHAIN},
{"jump", TC_ACT_JUMP},
{"trap", TC_ACT_TRAP}, {"trap", TC_ACT_TRAP},
{ NULL }, { NULL },
}, *iter; }, *iter;
@ -510,6 +513,17 @@ static int __parse_action_control(int *argc_p, char ***argv_p, int *result_p,
} }
result |= chain_index; result |= chain_index;
} }
if (result == TC_ACT_JUMP) {
__u32 jump_cnt = 0;
NEXT_ARG();
if (get_u32(&jump_cnt, *argv, 10) ||
jump_cnt > TC_ACT_EXT_VAL_MASK) {
fprintf(stderr, "Invalid \"jump count\" (%s)\n", *argv);
return -1;
}
result |= jump_cnt;
}
NEXT_ARG_FWD(); NEXT_ARG_FWD();
*argc_p = argc; *argc_p = argc;
*argv_p = argv; *argv_p = argv;
@ -637,6 +651,8 @@ void print_action_control(FILE *f, const char *prefix,
fprintf(f, "%s%s", prefix, action_n2a(action)); fprintf(f, "%s%s", prefix, action_n2a(action));
if (TC_ACT_EXT_CMP(action, TC_ACT_GOTO_CHAIN)) if (TC_ACT_EXT_CMP(action, TC_ACT_GOTO_CHAIN))
fprintf(f, " chain %u", action & TC_ACT_EXT_VAL_MASK); fprintf(f, " chain %u", action & TC_ACT_EXT_VAL_MASK);
if (TC_ACT_EXT_CMP(action, TC_ACT_JUMP))
fprintf(f, " %u", action & TC_ACT_EXT_VAL_MASK);
fprintf(f, "%s", suffix); fprintf(f, "%s", suffix);
} }