Merge branch 'tc-ets-qdisc' into next

[mirror_iproute2.git] / tc / f_route.c

diff --git a/tc/f_route.c b/tc/f_route.c
index f13c28b5d3dcbb2c922218eefe96d0da7608dd99..31fa96a0565e35a6d45c2b700bf0234e13ba55a5 100644 (file)
--- a/tc/f_route.c
+++ b/tc/f_route.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>
@@ -22,28 +21,27 @@
 
 #include "utils.h"
 #include "rt_names.h"
+#include "tc_common.h"
 #include "tc_util.h"
 
 static void explain(void)
 {
-       fprintf(stderr, "Usage: ... route [ from REALM | fromif TAG ] [ to REALM ]\n");
-       fprintf(stderr, "                [ flowid CLASSID ] [ police POLICE_SPEC ]\n");
-       fprintf(stderr, "       POLICE_SPEC := ... look at TBF\n");
-       fprintf(stderr, "       CLASSID := X:Y\n");
+       fprintf(stderr,
+               "Usage: ... route [ from REALM | fromif TAG ] [ to REALM ]\n"
+               "                [ classid CLASSID ] [ action ACTION_SPEC ]\n"
+               "       ACTION_SPEC := ... look at individual actions\n"
+               "       CLASSID := X:Y\n"
+               "\n"
+               "NOTE: CLASSID is parsed as hexadecimal input.\n");
 }
 
-#define usage() return(-1)
-
 static int route_parse_opt(struct filter_util *qu, char *handle, int argc, char **argv, struct nlmsghdr *n)
 {
-       struct tc_police tp;
        struct tcmsg *t = NLMSG_DATA(n);
        struct rtattr *tail;
        __u32 fh = 0xFFFF8000;
        __u32 order = 0;
 
-       memset(&tp, 0, sizeof(tp));
-
        if (handle) {
                if (get_u32(&t->tcm_handle, handle, 0)) {
                        fprintf(stderr, "Illegal \"handle\"\n");
@@ -54,12 +52,12 @@ static int route_parse_opt(struct filter_util *qu, char *handle, int argc, char
        if (argc == 0)
                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 > 0) {
                if (matches(*argv, "to") == 0) {
                        __u32 id;
+
                        NEXT_ARG();
                        if (rtnl_rtrealm_a2n(&id, *argv)) {
                                fprintf(stderr, "Illegal \"to\"\n");
@@ -70,6 +68,7 @@ static int route_parse_opt(struct filter_util *qu, char *handle, int argc, char
                        fh |= id&0xFF;
                } else if (matches(*argv, "from") == 0) {
                        __u32 id;
+
                        NEXT_ARG();
                        if (rtnl_rtrealm_a2n(&id, *argv)) {
                                fprintf(stderr, "Illegal \"from\"\n");
@@ -79,14 +78,11 @@ static int route_parse_opt(struct filter_util *qu, char *handle, int argc, char
                        fh &= 0xFFFF;
                        fh |= id<<16;
                } else if (matches(*argv, "fromif") == 0) {
-                       struct rtnl_handle rth;
                        __u32 id;
+
                        NEXT_ARG();
-                       if (rtnl_open(&rth, 0) == 0) {
-                               ll_init_map(&rth);
-                               rtnl_close(&rth);
-                       }
-                       if ((id=ll_name_to_index(*argv)) <= 0) {
+                       ll_init_map(&rth);
+                       if ((id = ll_name_to_index(*argv)) <= 0) {
                                fprintf(stderr, "Illegal \"fromif\"\n");
                                return -1;
                        }
@@ -95,7 +91,8 @@ static int route_parse_opt(struct filter_util *qu, char *handle, int argc, char
                        fh |= (0x8000|id)<<16;
                } else if (matches(*argv, "classid") == 0 ||
                           strcmp(*argv, "flowid") == 0) {
-                       unsigned handle;
+                       unsigned int handle;
+
                        NEXT_ARG();
                        if (get_tc_classid(&handle, *argv)) {
                                fprintf(stderr, "Illegal \"classid\"\n");
@@ -109,6 +106,13 @@ static int route_parse_opt(struct filter_util *qu, char *handle, int argc, char
                                return -1;
                        }
                        continue;
+               } else if (matches(*argv, "action") == 0) {
+                       NEXT_ARG();
+                       if (parse_action(&argc, &argv, TCA_ROUTE4_ACT, n)) {
+                               fprintf(stderr, "Illegal \"action\"\n");
+                               return -1;
+                       }
+                       continue;
                } else if (matches(*argv, "order") == 0) {
                        NEXT_ARG();
                        if (get_u32(&order, *argv, 0)) {
@@ -125,7 +129,7 @@ static int route_parse_opt(struct filter_util *qu, char *handle, int argc, char
                }
                argc--; argv++;
        }
-       tail->rta_len = (((void*)n)+n->nlmsg_len) - (void*)tail;
+       addattr_nest_end(n, tail);
        if (order) {
                fh &= ~0x7F00;
                fh |= (order<<8)&0x7F00;
@@ -138,14 +142,13 @@ static int route_parse_opt(struct filter_util *qu, char *handle, int argc, char
 static int route_print_opt(struct filter_util *qu, FILE *f, struct rtattr *opt, __u32 handle)
 {
        struct rtattr *tb[TCA_ROUTE4_MAX+1];
+
        SPRINT_BUF(b1);
 
        if (opt == NULL)
                return 0;
 
-       memset(tb, 0, sizeof(tb));
-       if (opt)
-               parse_rtattr(tb, TCA_ROUTE4_MAX, RTA_DATA(opt), RTA_PAYLOAD(opt));
+       parse_rtattr_nested(tb, TCA_ROUTE4_MAX, opt);
 
        if (handle)
                fprintf(f, "fh 0x%08x ", handle);
@@ -154,22 +157,23 @@ static int route_print_opt(struct filter_util *qu, FILE *f, struct rtattr *opt,
 
        if (tb[TCA_ROUTE4_CLASSID]) {
                SPRINT_BUF(b1);
-               fprintf(f, "flowid %s ", sprint_tc_classid(*(__u32*)RTA_DATA(tb[TCA_ROUTE4_CLASSID]), b1));
+               fprintf(f, "flowid %s ", sprint_tc_classid(rta_getattr_u32(tb[TCA_ROUTE4_CLASSID]), b1));
        }
        if (tb[TCA_ROUTE4_TO])
-               fprintf(f, "to %s ", rtnl_rtrealm_n2a(*(__u32*)RTA_DATA(tb[TCA_ROUTE4_TO]), b1, sizeof(b1)));
+               fprintf(f, "to %s ", rtnl_rtrealm_n2a(rta_getattr_u32(tb[TCA_ROUTE4_TO]), b1, sizeof(b1)));
        if (tb[TCA_ROUTE4_FROM])
-               fprintf(f, "from %s ", rtnl_rtrealm_n2a(*(__u32*)RTA_DATA(tb[TCA_ROUTE4_FROM]), b1, sizeof(b1)));
+               fprintf(f, "from %s ", rtnl_rtrealm_n2a(rta_getattr_u32(tb[TCA_ROUTE4_FROM]), b1, sizeof(b1)));
        if (tb[TCA_ROUTE4_IIF])
-               fprintf(f, "fromif %s", ll_index_to_name(*(int*)RTA_DATA(tb[TCA_ROUTE4_IIF])));
+               fprintf(f, "fromif %s", ll_index_to_name(rta_getattr_u32(tb[TCA_ROUTE4_IIF])));
        if (tb[TCA_ROUTE4_POLICE])
                tc_print_police(f, tb[TCA_ROUTE4_POLICE]);
+       if (tb[TCA_ROUTE4_ACT])
+               tc_print_action(f, tb[TCA_ROUTE4_ACT], 0);
        return 0;
 }
 
-struct filter_util route_util = {
-       NULL,
-       "route",
-       route_parse_opt,
-       route_print_opt,
+struct filter_util route_filter_util = {
+       .id = "route",
+       .parse_fopt = route_parse_opt,
+       .print_fopt = route_print_opt,
 };