* TODO:
* - parse to be passed a filedescriptor for logging purposes
*
-*/
+ */
#include <stdio.h>
#include <stdlib.h>
+#include <stdbool.h>
#include <unistd.h>
#include <fcntl.h>
#include <sys/socket.h>
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)
{
* with any action .so from the old days. But if someone really
* does that, they would know how to fix this ..
*
- */
+ */
fprintf(stderr, "usage: tc actions <ACTSPECOP>*\n");
fprintf(stderr,
"Where: \tACTSPECOP := ACR | GD | FL\n"
return 0;
}
-static int parse_noaopt(struct action_util *au, int *argc_p, char ***argv_p, int code, struct nlmsghdr *n)
+static int parse_noaopt(struct action_util *au, int *argc_p,
+ char ***argv_p, int code, struct nlmsghdr *n)
{
int argc = *argc_p;
char **argv = *argv_p;
- if (argc) {
- fprintf(stderr, "Unknown action \"%s\", hence option \"%s\" is unparsable\n", au->id, *argv);
- } else {
+ if (argc)
+ fprintf(stderr,
+ "Unknown action \"%s\", hence option \"%s\" is unparsable\n",
+ au->id, *argv);
+ else
fprintf(stderr, "Unknown action \"%s\"\n", au->id);
- }
+
return -1;
}
return a;
}
-static int
+static bool
new_cmd(char **argv)
{
- if ((matches(*argv, "change") == 0) ||
+ return (matches(*argv, "change") == 0) ||
(matches(*argv, "replace") == 0) ||
(matches(*argv, "delete") == 0) ||
(matches(*argv, "get") == 0) ||
- (matches(*argv, "add") == 0))
- return 1;
-
- return 0;
-
+ (matches(*argv, "add") == 0);
}
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) {
argv++;
eap = 1;
#ifdef CONFIG_GACT
- if (!gact_ld) {
+ if (!gact_ld)
get_action_kind("gact");
- }
#endif
continue;
} else if (strcmp(*argv, "flowid") == 0) {
} 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);
goto done;
}
- if (a == NULL) {
+ if (a == NULL)
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,
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++;
}
}
goto bad_val;
}
- tail2->rta_len = (void *) NLMSG_TAIL(n) - (void *) tail2;
+ addattr_nest_end(n, tail2);
done:
*argc_p = argc;
return 0;
bad_val:
/* no need to undo things, returning from here should
- * cause enough pain */
+ * cause enough pain
+ */
fprintf(stderr, "parse_action: bad value (%d:%s)!\n", argc, *argv);
return -1;
}
return err;
if (show_stats && tb[TCA_ACT_STATS]) {
-
- fprintf(f, "\tAction statistics:\n");
+ 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);
- if (tb[TCA_ACT_COOKIE]) {
- int strsz = RTA_PAYLOAD(tb[TCA_ACT_COOKIE]);
- char b1[strsz * 2 + 1];
-
- fprintf(f, "\n\tcookie len %d %s ", strsz,
- hexstring_n2a(RTA_DATA(tb[TCA_ACT_COOKIE]),
- strsz, b1, sizeof(b1)));
- }
- fprintf(f, "\n");
+ close_json_object();
+ 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",
+ hexstring_n2a(RTA_DATA(tb[TCA_ACT_COOKIE]),
+ strsz, b1, sizeof(b1)));
+ print_string(PRINT_FP, NULL, "%s", _SL_);
}
return 0;
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]);
- for (i = 0; i < tot_acts; i++) {
+ open_json_array(PRINT_JSON, "actions");
+ for (i = 0; i <= tot_acts; i++) {
if (tb[i]) {
- fprintf(f, "\n\taction order %d: ", i);
+ open_json_object(NULL);
+ print_string(PRINT_FP, NULL, "%s", _SL_);
+ print_uint(PRINT_ANY, "order",
+ "\taction order %u: ", i);
if (tc_print_one_action(f, tb[i]) < 0) {
- fprintf(f, "Error printing action\n");
+ print_string(PRINT_FP, NULL,
+ "Error printing action\n", NULL);
}
+ close_json_object();
}
}
+ close_json_array(PRINT_JSON, NULL);
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);
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");
}
}
-
+ open_json_object(NULL);
tc_print_action(fp, tb[TCA_ACT_TAB], tot_acts ? *tot_acts:0);
+ close_json_object();
return 0;
}
-static int tc_action_gd(int cmd, unsigned int flags, int *argc_p, char ***argv_p)
+static int tc_action_gd(int cmd, unsigned int flags,
+ int *argc_p, char ***argv_p)
{
char k[FILTER_NAMESZ];
struct action_util *a = NULL;
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) {
argc -= 1;
argv += 1;
if (argc <= 0) {
- fprintf(stderr, "Error: no index specified action: %s\n", k);
+ fprintf(stderr,
+ "Error: no index specified action: %s\n", k);
ret = -1;
goto bad_val;
}
argc -= 1;
argv += 1;
} else {
- fprintf(stderr, "Error: no index specified action: %s\n", k);
+ fprintf(stderr,
+ "Error: no index specified action: %s\n", k);
ret = -1;
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;
- if (rtnl_talk(&rth, &req.n, &ans) < 0) {
+ if (rtnl_talk(&rth, &req.n, cmd == RTM_DELACTION ? NULL : &ans) < 0) {
fprintf(stderr, "We have an error talking to the kernel\n");
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);
return ret;
}
-static int tc_action_modify(int cmd, unsigned int flags, int *argc_p, char ***argv_p)
+struct tc_action_req {
+ struct nlmsghdr n;
+ struct tcamsg t;
+ char buf[MAX_MSG];
+};
+
+static int tc_action_modify(int cmd, unsigned int flags,
+ int *argc_p, char ***argv_p,
+ void *buf, size_t buflen)
{
- int argc = *argc_p;
+ struct tc_action_req *req, action_req;
char **argv = *argv_p;
+ struct rtattr *tail;
+ int argc = *argc_p;
+ struct iovec iov;
int ret = 0;
- struct {
- struct nlmsghdr n;
- struct tcamsg t;
- char buf[MAX_MSG];
- } req = {
- .n.nlmsg_len = NLMSG_LENGTH(sizeof(struct tcamsg)),
- .n.nlmsg_flags = NLM_F_REQUEST | flags,
- .n.nlmsg_type = cmd,
- .t.tca_family = AF_UNSPEC,
- };
- struct rtattr *tail = NLMSG_TAIL(&req.n);
+
+ if (buf) {
+ req = buf;
+ if (buflen < sizeof (struct tc_action_req)) {
+ fprintf(stderr, "buffer is too small: %zu\n", buflen);
+ return -1;
+ }
+ } else {
+ memset(&action_req, 0, sizeof (struct tc_action_req));
+ req = &action_req;
+ }
+
+ req->n.nlmsg_len = NLMSG_LENGTH(sizeof(struct tcamsg));
+ req->n.nlmsg_flags = NLM_F_REQUEST | flags;
+ req->n.nlmsg_type = cmd;
+ req->t.tca_family = AF_UNSPEC;
+ tail = NLMSG_TAIL(&req->n);
argc -= 1;
argv += 1;
- if (parse_action(&argc, &argv, TCA_ACT_TAB, &req.n)) {
+ if (parse_action(&argc, &argv, TCA_ACT_TAB, &req->n)) {
fprintf(stderr, "Illegal \"action\"\n");
return -1;
}
- tail->rta_len = (void *) NLMSG_TAIL(&req.n) - (void *) tail;
+ tail->rta_len = (void *) NLMSG_TAIL(&req->n) - (void *) tail;
+
+ *argc_p = argc;
+ *argv_p = argv;
+
+ if (buf)
+ return 0;
- if (rtnl_talk(&rth, &req.n, NULL) < 0) {
+ iov.iov_base = &req->n;
+ iov.iov_len = req->n.nlmsg_len;
+ if (rtnl_talk_iov(&rth, &iov, 1, NULL) < 0) {
fprintf(stderr, "We have an error talking to the kernel\n");
ret = -1;
}
- *argc_p = argc;
- *argv_p = argv;
-
return ret;
}
.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);
#ifdef CONFIG_GACT
- if (!gact_ld) {
+ if (!gact_ld)
get_action_kind("gact");
- }
+
#endif
a = get_action_kind(k);
if (a == NULL) {
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;
addattr32(&req.n, MAX_MSG, TCA_ROOT_TIME_DELTA, msec_since);
tail4->rta_len = (void *) NLMSG_TAIL(&req.n) - (void *) tail4;
}
- msg_size = NLMSG_ALIGN(req.n.nlmsg_len) - NLMSG_ALIGN(sizeof(struct nlmsghdr));
+ msg_size = NLMSG_ALIGN(req.n.nlmsg_len)
+ - NLMSG_ALIGN(sizeof(struct nlmsghdr));
if (event == RTM_GETACTION) {
- if (rtnl_dump_request(&rth, event, (void *)&req.t, msg_size) < 0) {
+ if (rtnl_dump_request(&rth, event,
+ (void *)&req.t, msg_size) < 0) {
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) {
return ret;
}
-int do_action(int argc, char **argv)
+int do_action(int argc, char **argv, void *buf, size_t buflen)
{
int ret = 0;
while (argc > 0) {
if (matches(*argv, "add") == 0) {
- ret = tc_action_modify(RTM_NEWACTION, NLM_F_EXCL|NLM_F_CREATE, &argc, &argv);
+ ret = tc_action_modify(RTM_NEWACTION,
+ NLM_F_EXCL | NLM_F_CREATE,
+ &argc, &argv, buf, buflen);
} else if (matches(*argv, "change") == 0 ||
matches(*argv, "replace") == 0) {
- ret = tc_action_modify(RTM_NEWACTION, NLM_F_CREATE|NLM_F_REPLACE, &argc, &argv);
+ ret = tc_action_modify(RTM_NEWACTION,
+ NLM_F_CREATE | NLM_F_REPLACE,
+ &argc, &argv, buf, buflen);
} else if (matches(*argv, "delete") == 0) {
argc -= 1;
argv += 1;
argc -= 1;
argv += 1;
ret = tc_action_gd(RTM_GETACTION, 0, &argc, &argv);
- } else if (matches(*argv, "list") == 0 || matches(*argv, "show") == 0
- || matches(*argv, "lst") == 0) {
+ } else if (matches(*argv, "list") == 0 ||
+ matches(*argv, "show") == 0 ||
+ matches(*argv, "lst") == 0) {
if (argc <= 2) {
act_usage();
return -1;
act_usage();
return -1;
} else {
- fprintf(stderr, "Command \"%s\" is unknown, try \"tc actions help\".\n", *argv);
+ fprintf(stderr,
+ "Command \"%s\" is unknown, try \"tc actions help\".\n",
+ *argv);
return -1;
}
projects / mirror_iproute2.git / blobdiff