diff --git a/tc/m_nat.c b/tc/m_nat.c index 653792da..ee0b7520 100644 --- a/tc/m_nat.c +++ b/tc/m_nat.c @@ -142,9 +142,8 @@ print_nat(struct action_util *au, FILE * f, struct rtattr *arg) { struct tc_nat *sel; struct rtattr *tb[TCA_NAT_MAX + 1]; - char buf1[256]; - char buf2[256]; - + SPRINT_BUF(buf1); + SPRINT_BUF(buf2); int len; 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); if (tb[TCA_NAT_PARMS] == NULL) { - fprintf(f, "[NULL nat parameters]"); + print_string(PRINT_FP, NULL, "%s", "[NULL nat parameters]"); return -1; } 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 = len ? 33 - len : 0; - fprintf(f, " nat %s %s/%d %s", sel->flags & TCA_NAT_FLAG_EGRESS ? - "egress" : "ingress", - format_host_r(AF_INET, 4, &sel->old_addr, buf1, sizeof(buf1)), - len, - format_host_r(AF_INET, 4, &sel->new_addr, buf2, sizeof(buf2))); - print_action_control(f, " ", sel->action, ""); + print_string(PRINT_ANY, "type", " %s ", "nat"); + print_string(PRINT_ANY, "direction", "%s", + sel->flags & TCA_NAT_FLAG_EGRESS ? "egress" : "ingress"); - fprintf(f, "\n\t index %u ref %d bind %d", - sel->index, sel->refcnt, sel->bindcnt); + snprintf(buf2, sizeof(buf2), "%s/%d", + 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 (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; }