matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tc: jsonify nat action 

Add json output support for nat action

Example output:

~$ $TC actions add action nat egress 10.10.10.1 20.20.20.2 index 2
~$ $TC actions add action nat ingress 100.100.100.1/32 200.200.200.2 \
	continue index 99
~$ $TC -j actions ls action nat

[{
	"total acts": 2
}, {
	"actions": [{
		"order": 0,
		"type": "nat",
		"direction": "egress",
		"old_addr": "10.10.10.1/32",
		"new_addr": "20.20.20.2",
		"control_action": {
			"type": "pass"
		},
		"index": 2,
		"ref": 1,
		"bind": 0
	}, {
		"order": 1,
		"type": "nat",
		"direction": "ingress",
		"old_addr": "100.100.100.1/32",
		"new_addr": "200.200.200.2",
		"control_action": {
			"type": "continue"
		},
		"index": 99,
		"ref": 1,
		"bind": 0
	}]
}]

Signed-off-by: Keara Leibovitz <kleib@mojatatu.com>
Signed-off-by: David Ahern <dsahern@gmail.com>
This commit is contained in:
Keara Leibovitz 2018-06-18 14:57:49 -04:00 committed by David Ahern
parent 2ecb61a0c2
commit 4757a54799
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tc/m_nat.c
View File

@ -142,9 +142,8 @@ print_nat(struct action_util *au, FILE * f, struct rtattr *arg)
{ {
struct tc_nat *sel; struct tc_nat *sel;
struct rtattr *tb[TCA_NAT_MAX + 1]; struct rtattr *tb[TCA_NAT_MAX + 1];
char buf1[256]; SPRINT_BUF(buf1);
char buf2[256]; SPRINT_BUF(buf2);
int len; int len;
if (arg == NULL) if (arg == NULL)
@ -153,7 +152,7 @@ print_nat(struct action_util *au, FILE * f, struct rtattr *arg)
parse_rtattr_nested(tb, TCA_NAT_MAX, arg); parse_rtattr_nested(tb, TCA_NAT_MAX, arg);
if (tb[TCA_NAT_PARMS] == NULL) { if (tb[TCA_NAT_PARMS] == NULL) {
fprintf(f, "[NULL nat parameters]"); print_string(PRINT_FP, NULL, "%s", "[NULL nat parameters]");
return -1; return -1;
} }
sel = RTA_DATA(tb[TCA_NAT_PARMS]); sel = RTA_DATA(tb[TCA_NAT_PARMS]);
@ -161,15 +160,22 @@ print_nat(struct action_util *au, FILE * f, struct rtattr *arg)
len = ffs(sel->mask); len = ffs(sel->mask);
len = len ? 33 - len : 0; len = len ? 33 - len : 0;
fprintf(f, " nat %s %s/%d %s", sel->flags & TCA_NAT_FLAG_EGRESS ? print_string(PRINT_ANY, "type", " %s ", "nat");
"egress" : "ingress", print_string(PRINT_ANY, "direction", "%s",
format_host_r(AF_INET, 4, &sel->old_addr, buf1, sizeof(buf1)), sel->flags & TCA_NAT_FLAG_EGRESS ? "egress" : "ingress");
len,
format_host_r(AF_INET, 4, &sel->new_addr, buf2, sizeof(buf2)));
print_action_control(f, " ", sel->action, "");
fprintf(f, "\n\t index %u ref %d bind %d", snprintf(buf2, sizeof(buf2), "%s/%d",
sel->index, sel->refcnt, sel->bindcnt); format_host_r(AF_INET, 4, &sel->old_addr, buf1, sizeof(buf1)),
len);
print_string(PRINT_ANY, "old_addr", " %s", buf2);
print_string(PRINT_ANY, "new_addr", " %s",
format_host_r(AF_INET, 4, &sel->new_addr, buf1, sizeof(buf1)));
print_action_control(f, " ", sel->action, "");
print_string(PRINT_FP, NULL, "%s", _SL_);
print_uint(PRINT_ANY, "index", "\t index %u", sel->index);
print_int(PRINT_ANY, "ref", " ref %d", sel->refcnt);
print_int(PRINT_ANY, "bind", " bind %d", sel->bindcnt);
if (show_stats) { if (show_stats) {
if (tb[TCA_NAT_TM]) { if (tb[TCA_NAT_TM]) {
@ -179,7 +185,7 @@ print_nat(struct action_util *au, FILE * f, struct rtattr *arg)
} }
} }
fprintf(f, "\n"); print_string(PRINT_FP, NULL, "%s", _SL_);
return 0; return 0;
} }