]> git.proxmox.com Git - mirror_iproute2.git/blobdiff - tc/f_tcindex.c
lib: introduce print_nl
[mirror_iproute2.git] / tc / f_tcindex.c
index 45f0db22a8c84ba7cc82b982cb454e1a14f8996a..159cf41461b5b35c02a415a384668dafc78f7a47 100644 (file)
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * f_tcindex.c         Traffic control index filter
  *
@@ -7,7 +8,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <syslog.h>
 #include <fcntl.h>
 #include <string.h>
 #include <netinet/in.h>
 
 static void explain(void)
 {
-       fprintf(stderr," Usage: ... tcindex [ hash SIZE ] [ mask MASK ]"
-           " [ shift SHIFT ]\n");
-       fprintf(stderr,"                    [ pass_on | fall_through ]\n");
-       fprintf(stderr,"                    [ classid CLASSID ] "
-           "[ police POLICE_SPEC ]\n");
+       fprintf(stderr," Usage: ... tcindex [ hash SIZE ] [ mask MASK ] [ shift SHIFT ]\n");
+       fprintf(stderr, "                    [ pass_on | fall_through ]\n");
+       fprintf(stderr,"                    [ classid CLASSID ] [ action ACTION_SPEC ]\n");
 }
 
-
-#define usage() return(-1)
-
-
 static int tcindex_parse_opt(struct filter_util *qu, char *handle, int argc,
-    char **argv, struct nlmsghdr *n)
+                            char **argv, struct nlmsghdr *n)
 {
        struct tcmsg *t = NLMSG_DATA(n);
        struct rtattr *tail;
        char *end;
 
        if (handle) {
-               t->tcm_handle = strtoul(handle,&end,0);
+               t->tcm_handle = strtoul(handle, &end, 0);
                if (*end) {
                        fprintf(stderr, "Illegal filter ID\n");
                        return -1;
                }
        }
        if (!argc) return 0;
-       tail = (struct rtattr*)(((void*)n)+NLMSG_ALIGN(n->nlmsg_len));
-       addattr_l(n,4096,TCA_OPTIONS,NULL,0);
+       tail = addattr_nest(n, 4096, TCA_OPTIONS);
        while (argc) {
-               if (!strcmp(*argv,"hash")) {
+               if (!strcmp(*argv, "hash")) {
                        int hash;
 
                        NEXT_ARG();
-                       hash = strtoul(*argv,&end,0);
+                       hash = strtoul(*argv, &end, 0);
                        if (*end || !hash || hash > 0x10000) {
                                explain();
                                return -1;
                        }
-                       addattr_l(n,4096,TCA_TCINDEX_HASH,&hash,sizeof(hash));
-               }
-               else if (!strcmp(*argv,"mask")) {
+                       addattr_l(n, 4096, TCA_TCINDEX_HASH, &hash,
+                                 sizeof(hash));
+               else if (!strcmp(*argv,"mask")) {
                        __u16 mask;
 
                        NEXT_ARG();
-                       mask = strtoul(*argv,&end,0);
+                       mask = strtoul(*argv, &end, 0);
                        if (*end) {
                                explain();
                                return -1;
                        }
-                       addattr_l(n,4096,TCA_TCINDEX_MASK,&mask,sizeof(mask));
-               }
-               else if (!strcmp(*argv,"shift")) {
+                       addattr_l(n, 4096, TCA_TCINDEX_MASK, &mask,
+                                 sizeof(mask));
+               else if (!strcmp(*argv,"shift")) {
                        int shift;
 
                        NEXT_ARG();
-                       shift = strtoul(*argv,&end,0);
+                       shift = strtoul(*argv, &end, 0);
                        if (*end) {
                                explain();
                                return -1;
                        }
-                       addattr_l(n,4096,TCA_TCINDEX_SHIFT,&shift,
+                       addattr_l(n, 4096, TCA_TCINDEX_SHIFT, &shift,
                            sizeof(shift));
-               }
-               else if (!strcmp(*argv,"fall_through")) {
+               } else if (!strcmp(*argv,"fall_through")) {
                        int value = 1;
 
-                       addattr_l(n,4096,TCA_TCINDEX_FALL_THROUGH,&value,
+                       addattr_l(n, 4096, TCA_TCINDEX_FALL_THROUGH, &value,
                            sizeof(value));
-               }
-               else if (!strcmp(*argv,"pass_on")) {
+               } else if (!strcmp(*argv,"pass_on")) {
                        int value = 0;
 
-                       addattr_l(n,4096,TCA_TCINDEX_FALL_THROUGH,&value,
+                       addattr_l(n, 4096, TCA_TCINDEX_FALL_THROUGH, &value,
                            sizeof(value));
-               }
-               else if (!strcmp(*argv,"classid")) {
+               } else if (!strcmp(*argv,"classid")) {
                        __u32 handle;
 
                        NEXT_ARG();
-                       if (get_tc_classid(&handle,*argv)) {
+                       if (get_tc_classid(&handle, *argv)) {
                                fprintf(stderr, "Illegal \"classid\"\n");
                                return -1;
                        }
                        addattr_l(n, 4096, TCA_TCINDEX_CLASSID, &handle, 4);
-               }
-               else if (!strcmp(*argv,"police")) {
+               } else if (!strcmp(*argv,"police")) {
                        NEXT_ARG();
                        if (parse_police(&argc, &argv, TCA_TCINDEX_POLICE, n)) {
                                fprintf(stderr, "Illegal \"police\"\n");
                                return -1;
                        }
                        continue;
-               }
-               else {
+               } else if (!strcmp(*argv,"action")) {
+                       NEXT_ARG();
+                       if (parse_action(&argc, &argv, TCA_TCINDEX_ACT, n)) {
+                               fprintf(stderr, "Illegal \"action\"\n");
+                               return -1;
+                       }
+                       continue;
+               } else {
                        explain();
                        return -1;
                }
                argc--;
                argv++;
        }
-       tail->rta_len = (((void*)n)+n->nlmsg_len) - (void*)tail;
+       addattr_nest_end(n, tail);
        return 0;
 }
 
 
 static int tcindex_print_opt(struct filter_util *qu, FILE *f,
-     struct rtattr *opt, __u32 handle)
+                            struct rtattr *opt, __u32 handle)
 {
        struct rtattr *tb[TCA_TCINDEX_MAX+1];
 
-       if (!opt) return 0;
+       if (opt == NULL)
+               return 0;
 
-       memset(tb, 0, sizeof(tb));
-       parse_rtattr(tb, TCA_TCINDEX_MAX, RTA_DATA(opt), RTA_PAYLOAD(opt));
+       parse_rtattr_nested(tb, TCA_TCINDEX_MAX, opt);
 
-       if (handle != ~0) fprintf(f,"handle 0x%04x ",handle);
+       if (handle != ~0) fprintf(f, "handle 0x%04x ", handle);
        if (tb[TCA_TCINDEX_HASH]) {
                __u16 hash;
 
                if (RTA_PAYLOAD(tb[TCA_TCINDEX_HASH]) < sizeof(hash))
                        return -1;
-               hash = *(__u16 *) RTA_DATA(tb[TCA_TCINDEX_HASH]);
-               fprintf(f,"hash %d ",hash);
+               hash = rta_getattr_u16(tb[TCA_TCINDEX_HASH]);
+               fprintf(f, "hash %d ", hash);
        }
        if (tb[TCA_TCINDEX_MASK]) {
                __u16 mask;
 
                if (RTA_PAYLOAD(tb[TCA_TCINDEX_MASK]) < sizeof(mask))
                        return -1;
-               mask = *(__u16 *) RTA_DATA(tb[TCA_TCINDEX_MASK]);
-               fprintf(f,"mask 0x%04x ",mask);
+               mask = rta_getattr_u16(tb[TCA_TCINDEX_MASK]);
+               fprintf(f, "mask 0x%04x ", mask);
        }
        if (tb[TCA_TCINDEX_SHIFT]) {
                int shift;
 
                if (RTA_PAYLOAD(tb[TCA_TCINDEX_SHIFT]) < sizeof(shift))
                        return -1;
-               shift = *(int *) RTA_DATA(tb[TCA_TCINDEX_SHIFT]);
-               fprintf(f,"shift %d ",shift);
+               shift = rta_getattr_u32(tb[TCA_TCINDEX_SHIFT]);
+               fprintf(f, "shift %d ", shift);
        }
        if (tb[TCA_TCINDEX_FALL_THROUGH]) {
                int fall_through;
@@ -163,18 +158,22 @@ static int tcindex_print_opt(struct filter_util *qu, FILE *f,
                if (RTA_PAYLOAD(tb[TCA_TCINDEX_FALL_THROUGH]) <
                    sizeof(fall_through))
                        return -1;
-               fall_through = *(int *) RTA_DATA(tb[TCA_TCINDEX_FALL_THROUGH]);
-               fprintf(f,fall_through ? "fall_through " : "pass_on ");
+               fall_through = rta_getattr_u32(tb[TCA_TCINDEX_FALL_THROUGH]);
+               fprintf(f, fall_through ? "fall_through " : "pass_on ");
        }
        if (tb[TCA_TCINDEX_CLASSID]) {
                SPRINT_BUF(b1);
-               fprintf(f, "classid %s ",sprint_tc_classid(*(__u32 *)
+               fprintf(f, "classid %s ", sprint_tc_classid(*(__u32 *)
                    RTA_DATA(tb[TCA_TCINDEX_CLASSID]), b1));
        }
        if (tb[TCA_TCINDEX_POLICE]) {
                fprintf(f, "\n");
                tc_print_police(f, tb[TCA_TCINDEX_POLICE]);
        }
+       if (tb[TCA_TCINDEX_ACT]) {
+               fprintf(f, "\n");
+               tc_print_action(f, tb[TCA_TCINDEX_ACT], 0);
+       }
        return 0;
 }