rdma: Properly mark RDMAtool license

[mirror_iproute2.git] / tc / m_action.c

diff --git a/tc/m_action.c b/tc/m_action.c
index 611f6cc288d9b4816f6ec1f50a13eca5fb1e0b64..b5aff3ab4896d4055f7683434cc9f6140ec7cbcb 100644 (file)
--- a/tc/m_action.c
+++ b/tc/m_action.c
@@ -30,9 +30,9 @@
 
 static struct action_util *action_list;
 #ifdef CONFIG_GACT
-int gact_ld; /* f*ckin backward compatibility */
+static int gact_ld; /* f*ckin backward compatibility */
 #endif
-int tab_flush;
+static int tab_flush;
 
 static void act_usage(void)
 {
@@ -166,9 +166,7 @@ int parse_action(int *argc_p, char ***argv_p, int tca_id, struct nlmsghdr *n)
        if (argc <= 0)
                return -1;
 
-       tail = tail2 = NLMSG_TAIL(n);
-
-       addattr_l(n, MAX_MSG, tca_id, NULL, 0);
+       tail2 = addattr_nest(n, MAX_MSG, tca_id);
 
        while (argc > 0) {
 
@@ -194,7 +192,10 @@ int parse_action(int *argc_p, char ***argv_p, int tca_id, struct nlmsghdr *n)
                } else {
                        struct action_util *a = NULL;
 
-                       strncpy(k, *argv, sizeof(k) - 1);
+                       if (!action_a2n(*argv, NULL, false))
+                               strncpy(k, "gact", sizeof(k) - 1);
+                       else
+                               strncpy(k, *argv, sizeof(k) - 1);
                        eap = 0;
                        if (argc > 0) {
                                a = get_action_kind(k);
@@ -210,8 +211,7 @@ done0:
                                goto bad_val;
 
 
-                       tail = NLMSG_TAIL(n);
-                       addattr_l(n, MAX_MSG, ++prio, NULL, 0);
+                       tail = addattr_nest(n, MAX_MSG, ++prio);
                        addattr_l(n, MAX_MSG, TCA_ACT_KIND, k, strlen(k) + 1);
 
                        ret = a->parse_aopt(a, &argc, &argv, TCA_ACT_OPTIONS,
@@ -249,7 +249,7 @@ done0:
                                addattr_l(n, MAX_MSG, TCA_ACT_COOKIE,
                                          &act_ck, act_ck_len);
 
-                       tail->rta_len = (void *) NLMSG_TAIL(n) - (void *) tail;
+                       addattr_nest_end(n, tail);
                        ok++;
                }
        }
@@ -259,7 +259,7 @@ done0:
                goto bad_val;
        }
 
-       tail2->rta_len = (void *) NLMSG_TAIL(n) - (void *) tail2;
+       addattr_nest_end(n, tail2);
 
 done:
        *argc_p = argc;
@@ -301,19 +301,21 @@ static int tc_print_one_action(FILE *f, struct rtattr *arg)
                return err;
 
        if (show_stats && tb[TCA_ACT_STATS]) {
-               print_string(PRINT_FP, NULL, "\tAction statistics:\n", NULL);
+               print_string(PRINT_FP, NULL, "\tAction statistics:", NULL);
+               print_string(PRINT_FP, NULL, "%s", _SL_);
                open_json_object("stats");
                print_tcstats2_attr(f, tb[TCA_ACT_STATS], "\t", NULL);
                close_json_object();
-               print_string(PRINT_FP, NULL, "\n", NULL);
+               print_string(PRINT_FP, NULL, "%s", _SL_);
        }
        if (tb[TCA_ACT_COOKIE]) {
                int strsz = RTA_PAYLOAD(tb[TCA_ACT_COOKIE]);
                char b1[strsz * 2 + 1];
 
-               print_string(PRINT_ANY, "cookie", "\tcookie %s\n",
+               print_string(PRINT_ANY, "cookie", "\tcookie %s",
                             hexstring_n2a(RTA_DATA(tb[TCA_ACT_COOKIE]),
                                           strsz, b1, sizeof(b1)));
+               print_string(PRINT_FP, NULL, "%s", _SL_);
        }
 
        return 0;
@@ -361,15 +363,16 @@ tc_print_action(FILE *f, const struct rtattr *arg, unsigned short tot_acts)
 
        parse_rtattr_nested(tb, tot_acts, arg);
 
-       if (tab_flush && NULL != tb[0]  && NULL == tb[1])
+       if (tab_flush && tb[0] && !tb[1])
                return tc_print_action_flush(f, tb[0]);
 
        open_json_array(PRINT_JSON, "actions");
-       for (i = 0; i < tot_acts; i++) {
+       for (i = 0; i <= tot_acts; i++) {
                if (tb[i]) {
                        open_json_object(NULL);
+                       print_string(PRINT_FP, NULL, "%s", _SL_);
                        print_uint(PRINT_ANY, "order",
-                                  "\n\taction order %u: ", i);
+                                  "\taction order %u: ", i);
                        if (tc_print_one_action(f, tb[i]) < 0) {
                                print_string(PRINT_FP, NULL,
                                             "Error printing action\n", NULL);
@@ -383,9 +386,7 @@ tc_print_action(FILE *f, const struct rtattr *arg, unsigned short tot_acts)
        return 0;
 }
 
-int print_action(const struct sockaddr_nl *who,
-                          struct nlmsghdr *n,
-                          void *arg)
+int print_action(struct nlmsghdr *n, void *arg)
 {
        FILE *fp = (FILE *)arg;
        struct tcamsg *t = NLMSG_DATA(n);
@@ -405,7 +406,11 @@ int print_action(const struct sockaddr_nl *who,
        if (tb[TCA_ROOT_COUNT])
                tot_acts = RTA_DATA(tb[TCA_ROOT_COUNT]);
 
-       fprintf(fp, "total acts %d\n", tot_acts ? *tot_acts:0);
+       open_json_object(NULL);
+       print_uint(PRINT_ANY, "total acts", "total acts %u",
+                  tot_acts ? *tot_acts : 0);
+       print_string(PRINT_FP, NULL, "%s", _SL_);
+       close_json_object();
        if (tb[TCA_ACT_TAB] == NULL) {
                if (n->nlmsg_type != RTM_GETACTION)
                        fprintf(stderr, "print_action: NULL kind\n");
@@ -430,8 +435,9 @@ int print_action(const struct sockaddr_nl *who,
                }
        }
 
-
+       open_json_object(NULL);
        tc_print_action(fp, tb[TCA_ACT_TAB], tot_acts ? *tot_acts:0);
+       close_json_object();
 
        return 0;
 }
@@ -465,8 +471,7 @@ static int tc_action_gd(int cmd, unsigned int flags,
        argv += 1;
 
 
-       tail = NLMSG_TAIL(&req.n);
-       addattr_l(&req.n, MAX_MSG, TCA_ACT_TAB, NULL, 0);
+       tail = addattr_nest(&req.n, MAX_MSG, TCA_ACT_TAB);
 
        while (argc > 0) {
                if (strcmp(*argv, "action") == 0) {
@@ -515,16 +520,15 @@ static int tc_action_gd(int cmd, unsigned int flags,
                        goto bad_val;
                }
 
-               tail2 = NLMSG_TAIL(&req.n);
-               addattr_l(&req.n, MAX_MSG, ++prio, NULL, 0);
+               tail2 = addattr_nest(&req.n, MAX_MSG, ++prio);
                addattr_l(&req.n, MAX_MSG, TCA_ACT_KIND, k, strlen(k) + 1);
                if (i > 0)
                        addattr32(&req.n, MAX_MSG, TCA_ACT_INDEX, i);
-               tail2->rta_len = (void *) NLMSG_TAIL(&req.n) - (void *) tail2;
+               addattr_nest_end(&req.n, tail2);
 
        }
 
-       tail->rta_len = (void *) NLMSG_TAIL(&req.n) - (void *) tail;
+       addattr_nest_end(&req.n, tail);
 
        req.n.nlmsg_seq = rth.dump = ++rth.seq;
 
@@ -533,10 +537,16 @@ static int tc_action_gd(int cmd, unsigned int flags,
                return 1;
        }
 
-       if (cmd == RTM_GETACTION && print_action(NULL, ans, stdout) < 0) {
-               fprintf(stderr, "Dump terminated\n");
-               free(ans);
-               return 1;
+       if (cmd == RTM_GETACTION) {
+               new_json_obj(json);
+               ret = print_action(ans, stdout);
+               if (ret < 0) {
+                       fprintf(stderr, "Dump terminated\n");
+                       free(ans);
+                       delete_json_obj();
+                       return 1;
+               }
+               delete_json_obj();
        }
        free(ans);
 
@@ -623,8 +633,7 @@ static int tc_act_list_or_flush(int *argc_p, char ***argv_p, int event)
                .t.tca_family = AF_UNSPEC,
        };
 
-       tail = NLMSG_TAIL(&req.n);
-       addattr_l(&req.n, MAX_MSG, TCA_ACT_TAB, NULL, 0);
+       tail = addattr_nest(&req.n, MAX_MSG, TCA_ACT_TAB);
        tail2 = NLMSG_TAIL(&req.n);
 
        strncpy(k, *argv, sizeof(k) - 1);
@@ -656,7 +665,7 @@ static int tc_act_list_or_flush(int *argc_p, char ***argv_p, int event)
        addattr_l(&req.n, MAX_MSG, ++prio, NULL, 0);
        addattr_l(&req.n, MAX_MSG, TCA_ACT_KIND, k, strlen(k) + 1);
        tail2->rta_len = (void *) NLMSG_TAIL(&req.n) - (void *) tail2;
-       tail->rta_len = (void *) NLMSG_TAIL(&req.n) - (void *) tail;
+       addattr_nest_end(&req.n, tail);
 
        tail3 = NLMSG_TAIL(&req.n);
        flag_select.value |= TCA_FLAG_LARGE_DUMP_ON;
@@ -678,7 +687,9 @@ static int tc_act_list_or_flush(int *argc_p, char ***argv_p, int event)
                        perror("Cannot send dump request");
                        return 1;
                }
+               new_json_obj(json);
                ret = rtnl_dump_filter(&rth, print_action, stdout);
+               delete_json_obj();
        }
 
        if (event == RTM_DELACTION) {