tc: m_tunnel_key: add options support for vxlan

[mirror_iproute2.git] / tc / m_gact.c

diff --git a/tc/m_gact.c b/tc/m_gact.c
index b30b0420bb1e14ff202c2ca0539afbfd28a1103e..33f326f823d1edb8dd54853df937b5fb36aa01a7 100644 (file)
--- a/tc/m_gact.c
+++ b/tc/m_gact.c
@@ -53,8 +53,7 @@ explain(void)
                        "\tINDEX := index value used\n"
                        "\n");
 #else
-       fprintf(stderr, "Usage: ... gact <ACTION> [INDEX]\n");
-       fprintf(stderr,
+       fprintf(stderr, "Usage: ... gact <ACTION> [INDEX]\n"
                "Where: \tACTION := reclassify | drop | continue | pass | pipe |\n"
                "       \t          goto chain <CHAIN_INDEX> | jump <JUMP_COUNT>\n"
                "\tINDEX := index value used\n"
@@ -87,12 +86,13 @@ parse_gact(struct action_util *a, int *argc_p, char ***argv_p,
        if (argc < 0)
                return -1;
 
-       if (matches(*argv, "gact") != 0 &&
-               parse_action_control(&argc, &argv, &p.action, false) == -1) {
+       if (!matches(*argv, "gact"))
+               NEXT_ARG();
+       /* we're binding existing gact action to filter by index. */
+       if (!matches(*argv, "index"))
+               goto skip_args;
+       if (parse_action_control(&argc, &argv, &p.action, false))
                usage();        /* does not return */
-       }
-
-       NEXT_ARG_FWD();
 
 #ifdef CONFIG_GACT_PROB
        if (argc > 0) {
@@ -113,7 +113,6 @@ parse_gact(struct action_util *a, int *argc_p, char ***argv_p,
                        if (parse_action_control(&argc, &argv,
                                                 &pp.paction, false) == -1)
                                usage();
-                       NEXT_ARG_FWD();
                        if (get_u16(&pp.pval, *argv, 10)) {
                                fprintf(stderr,
                                        "Illegal probability val 0x%x\n",
@@ -136,6 +135,7 @@ parse_gact(struct action_util *a, int *argc_p, char ***argv_p,
 
        if (argc > 0) {
                if (matches(*argv, "index") == 0) {
+skip_args:
                        NEXT_ARG();
                        if (get_u32(&p.index, *argv, 10)) {
                                fprintf(stderr, "Illegal \"index\"\n");
@@ -148,14 +148,13 @@ parse_gact(struct action_util *a, int *argc_p, char ***argv_p,
                }
        }
 
-       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_GACT_PARMS, &p, sizeof(p));
 #ifdef CONFIG_GACT_PROB
        if (rd)
                addattr_l(n, MAX_MSG, TCA_GACT_PROB, &pp, sizeof(pp));
 #endif
-       tail->rta_len = (void *) NLMSG_TAIL(n) - (void *) tail;
+       addattr_nest_end(n, tail);
 
        *argc_p = argc;
        *argv_p = argv;
@@ -178,7 +177,7 @@ print_gact(struct action_util *au, FILE *f, struct rtattr *arg)
        parse_rtattr_nested(tb, TCA_GACT_MAX, arg);
 
        if (tb[TCA_GACT_PARMS] == NULL) {
-               print_string(PRINT_FP, NULL, "%s", "[NULL gact parameters]");
+               fprintf(stderr, "Missing gact parameters\n");
                return -1;
        }
        p = RTA_DATA(tb[TCA_GACT_PARMS]);
@@ -194,13 +193,15 @@ print_gact(struct action_util *au, FILE *f, struct rtattr *arg)
                pp = &pp_dummy;
        }
        open_json_object("prob");
-       print_string(PRINT_ANY, "random_type", "\n\t random type %s",
+       print_nl();
+       print_string(PRINT_ANY, "random_type", "\t random type %s",
                     prob_n2a(pp->ptype));
        print_action_control(f, " ", pp->paction, " ");
        print_int(PRINT_ANY, "val", "val %d", pp->pval);
        close_json_object();
 #endif
-       print_uint(PRINT_ANY, "index", "\n\t index %u", p->index);
+       print_nl();
+       print_uint(PRINT_ANY, "index", "\t index %u", p->index);
        print_int(PRINT_ANY, "ref", " ref %d", p->refcnt);
        print_int(PRINT_ANY, "bind", " bind %d", p->bindcnt);
        if (show_stats) {
@@ -210,7 +211,7 @@ print_gact(struct action_util *au, FILE *f, struct rtattr *arg)
                        print_tm(f, tm);
                }
        }
-       print_string(PRINT_FP, NULL, "%s", "\n");
+       print_nl();
        return 0;
 }