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 1a2583372c34ea30bb074668c025b89a45f1665c..33f326f823d1edb8dd54853df937b5fb36aa01a7 100644 (file)
--- a/tc/m_gact.c
+++ b/tc/m_gact.c
@@ -13,7 +13,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <syslog.h>
 #include <fcntl.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -46,18 +45,19 @@ explain(void)
        fprintf(stderr, "Usage: ... gact <ACTION> [RAND] [INDEX]\n");
        fprintf(stderr,
                "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"
                        "\tRANDTYPE := netrand | determ\n"
                        "\tVAL : = value not exceeding 10000\n"
+                       "\tJUMP_COUNT := Absolute jump from start of action list\n"
                        "\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>\n"
+               "       \t          goto chain <CHAIN_INDEX> | jump <JUMP_COUNT>\n"
                "\tINDEX := index value used\n"
+               "\tJUMP_COUNT := Absolute jump from start of action list\n"
                "\n");
 #endif
 }
@@ -76,7 +76,6 @@ parse_gact(struct action_util *a, int *argc_p, char ***argv_p,
 {
        int argc = *argc_p;
        char **argv = *argv_p;
-       int ok = 0;
        struct tc_gact p = { 0 };
 #ifdef CONFIG_GACT_PROB
        int rd = 0;
@@ -87,19 +86,16 @@ parse_gact(struct action_util *a, int *argc_p, char ***argv_p,
        if (argc < 0)
                return -1;
 
-
-       if (matches(*argv, "gact") == 0) {
-               ok++;
-               argc--;
-               argv++;
-       } else {
-               if (parse_action_control(&argc, &argv, &p.action, false) == -1)
-                       usage();
-               ok++;
-       }
+       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 */
 
 #ifdef CONFIG_GACT_PROB
-       if (ok && argc > 0) {
+       if (argc > 0) {
                if (matches(*argv, "random") == 0) {
                        rd = 1;
                        NEXT_ARG();
@@ -118,23 +114,28 @@ parse_gact(struct action_util *a, int *argc_p, char ***argv_p,
                                                 &pp.paction, false) == -1)
                                usage();
                        if (get_u16(&pp.pval, *argv, 10)) {
-                               fprintf(stderr, "Illegal probability val 0x%x\n", pp.pval);
+                               fprintf(stderr,
+                                       "Illegal probability val 0x%x\n",
+                                       pp.pval);
                                return -1;
                        }
                        if (pp.pval > 10000) {
-                               fprintf(stderr, "Illegal probability val  0x%x\n", pp.pval);
+                               fprintf(stderr,
+                                       "Illegal probability val  0x%x\n",
+                                       pp.pval);
                                return -1;
                        }
                        argc--;
                        argv++;
                } else if (matches(*argv, "help") == 0) {
-                               usage();
+                       usage();
                }
        }
 #endif
 
        if (argc > 0) {
                if (matches(*argv, "index") == 0) {
+skip_args:
                        NEXT_ARG();
                        if (get_u32(&p.index, *argv, 10)) {
                                fprintf(stderr, "Illegal \"index\"\n");
@@ -142,24 +143,18 @@ parse_gact(struct action_util *a, int *argc_p, char ***argv_p,
                        }
                        argc--;
                        argv++;
-                       ok++;
                } else if (matches(*argv, "help") == 0) {
-                               usage();
+                       usage();
                }
        }
 
-       if (!ok)
-               return -1;
-
-       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) {
+       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;
@@ -167,7 +162,7 @@ parse_gact(struct action_util *a, int *argc_p, char ***argv_p,
 }
 
 static int
-print_gact(struct action_util *au, FILE * f, struct rtattr *arg)
+print_gact(struct action_util *au, FILE *f, struct rtattr *arg)
 {
 #ifdef CONFIG_GACT_PROB
        struct tc_gact_p *pp = NULL;
@@ -182,12 +177,12 @@ 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) {
-               fprintf(f, "[NULL gact parameters]");
+               fprintf(stderr, "Missing gact parameters\n");
                return -1;
        }
        p = RTA_DATA(tb[TCA_GACT_PARMS]);
 
-       fprintf(f, "gact ");
+       print_string(PRINT_ANY, "kind", "%s ", "gact");
        print_action_control(f, "action ", p->action, "");
 #ifdef CONFIG_GACT_PROB
        if (tb[TCA_GACT_PROB] != NULL) {
@@ -197,12 +192,18 @@ print_gact(struct action_util *au, FILE * f, struct rtattr *arg)
                memset(&pp_dummy, 0, sizeof(pp_dummy));
                pp = &pp_dummy;
        }
-       fprintf(f, "\n\t random type %s", prob_n2a(pp->ptype));
+       open_json_object("prob");
+       print_nl();
+       print_string(PRINT_ANY, "random_type", "\t random type %s",
+                    prob_n2a(pp->ptype));
        print_action_control(f, " ", pp->paction, " ");
-       fprintf(f, "val %d", pp->pval);
+       print_int(PRINT_ANY, "val", "val %d", pp->pval);
+       close_json_object();
 #endif
-       fprintf(f, "\n\t index %u ref %d bind %d", p->index, p->refcnt,
-               p->bindcnt);
+       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) {
                if (tb[TCA_GACT_TM]) {
                        struct tcf_t *tm = RTA_DATA(tb[TCA_GACT_TM]);
@@ -210,7 +211,7 @@ print_gact(struct action_util *au, FILE * f, struct rtattr *arg)
                        print_tm(f, tm);
                }
        }
-       fprintf(f, "\n ");
+       print_nl();
        return 0;
 }