Merge branch 'main' into next

[mirror_iproute2.git] / tc / m_sample.c

diff --git a/tc/m_sample.c b/tc/m_sample.c
index 01763cb4c3561fa347ffe39bf3b049b305da1933..696d76095ae6d0df9e016ea518381379f0c5debf 100644 (file)
--- a/tc/m_sample.c
+++ b/tc/m_sample.c
@@ -18,15 +18,16 @@
 
 static void explain(void)
 {
-       fprintf(stderr, "Usage: sample SAMPLE_CONF\n");
-       fprintf(stderr, "where:\n");
-       fprintf(stderr, "\tSAMPLE_CONF := SAMPLE_PARAMS | SAMPLE_INDEX\n");
-       fprintf(stderr, "\tSAMPLE_PARAMS := rate RATE group GROUP [trunc SIZE] [SAMPLE_INDEX]\n");
-       fprintf(stderr, "\tSAMPLE_INDEX := index INDEX\n");
-       fprintf(stderr, "\tRATE := The ratio of packets observed at the data source to the samples generated.\n");
-       fprintf(stderr, "\tGROUP := the psample sampling group\n");
-       fprintf(stderr, "\tSIZE := the truncation size\n");
-       fprintf(stderr, "\tINDEX := integer index of the sample action\n");
+       fprintf(stderr,
+               "Usage: sample SAMPLE_CONF\n"
+               "where:\n"
+               "\tSAMPLE_CONF := SAMPLE_PARAMS | SAMPLE_INDEX\n"
+               "\tSAMPLE_PARAMS := rate RATE group GROUP [trunc SIZE] [SAMPLE_INDEX]\n"
+               "\tSAMPLE_INDEX := index INDEX\n"
+               "\tRATE := The ratio of packets observed at the data source to the samples generated.\n"
+               "\tGROUP := the psample sampling group\n"
+               "\tSIZE := the truncation size\n"
+               "\tINDEX := integer index of the sample action\n");
 }
 
 static void usage(void)
@@ -121,8 +122,7 @@ static int parse_sample(struct action_util *a, int *argc_p, char ***argv_p,
                usage();
        }
 
-       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_SAMPLE_PARMS, &p, sizeof(p));
        if (rate_set)
                addattr32(n, MAX_MSG, TCA_SAMPLE_RATE, rate);
@@ -131,7 +131,7 @@ static int parse_sample(struct action_util *a, int *argc_p, char ***argv_p,
        if (trunc_set)
                addattr32(n, MAX_MSG, TCA_SAMPLE_TRUNC_SIZE, trunc);
 
-       tail->rta_len = (char *)NLMSG_TAIL(n) - (char *)tail;
+       addattr_nest_end(n, tail);
 
        *argc_p = argc;
        *argv_p = argv;
@@ -143,30 +143,34 @@ static int print_sample(struct action_util *au, FILE *f, struct rtattr *arg)
        struct rtattr *tb[TCA_SAMPLE_MAX + 1];
        struct tc_sample *p;
 
+       print_string(PRINT_ANY, "kind", "%s ", "sample");
        if (arg == NULL)
-               return -1;
+               return 0;
 
        parse_rtattr_nested(tb, TCA_SAMPLE_MAX, arg);
 
        if (!tb[TCA_SAMPLE_PARMS] || !tb[TCA_SAMPLE_RATE] ||
            !tb[TCA_SAMPLE_PSAMPLE_GROUP]) {
-               fprintf(f, "[NULL sample parameters]");
+               fprintf(stderr, "Missing sample parameters\n");
                return -1;
        }
        p = RTA_DATA(tb[TCA_SAMPLE_PARMS]);
 
-       fprintf(f, "sample rate 1/%d group %d",
-               rta_getattr_u32(tb[TCA_SAMPLE_RATE]),
-               rta_getattr_u32(tb[TCA_SAMPLE_PSAMPLE_GROUP]));
+       print_uint(PRINT_ANY, "rate", "rate 1/%u ",
+                  rta_getattr_u32(tb[TCA_SAMPLE_RATE]));
+       print_uint(PRINT_ANY, "group", "group %u",
+                  rta_getattr_u32(tb[TCA_SAMPLE_PSAMPLE_GROUP]));
 
        if (tb[TCA_SAMPLE_TRUNC_SIZE])
-               fprintf(f, " trunc_size %d",
-                       rta_getattr_u32(tb[TCA_SAMPLE_TRUNC_SIZE]));
+               print_uint(PRINT_ANY, "trunc_size", " trunc_size %u",
+                          rta_getattr_u32(tb[TCA_SAMPLE_TRUNC_SIZE]));
 
        print_action_control(f, " ", p->action, "");
 
-       fprintf(f, "\n\tindex %d 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_SAMPLE_TM]) {
@@ -175,7 +179,7 @@ static int print_sample(struct action_util *au, FILE *f, struct rtattr *arg)
                        print_tm(f, tm);
                }
        }
-       fprintf(f, "\n");
+       print_nl();
        return 0;
 }