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

tc: action result is u32 

In kernel action result is u32 not int in netlink messages.
This commit is contained in:
Stephen Hemminger 2016-05-31 12:22:45 -07:00
parent 45c6837911
commit e6263c8583
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tc/m_police.c
View File

@ -362,19 +362,25 @@ int print_police(struct action_util *a, FILE *f, struct rtattr *arg)
fprintf(f, "mtu %s ", sprint_size(p->mtu, b1)); fprintf(f, "mtu %s ", sprint_size(p->mtu, b1));
if (show_raw) if (show_raw)
fprintf(f, "[%08x] ", p->burst); fprintf(f, "[%08x] ", p->burst);
if (p->peakrate.rate) if (p->peakrate.rate)
fprintf(f, "peakrate %s ", sprint_rate(p->peakrate.rate, b1)); fprintf(f, "peakrate %s ", sprint_rate(p->peakrate.rate, b1));
if (tb[TCA_POLICE_AVRATE]) if (tb[TCA_POLICE_AVRATE])
fprintf(f, "avrate %s ", fprintf(f, "avrate %s ",
sprint_rate(rta_getattr_u32(tb[TCA_POLICE_AVRATE]), sprint_rate(rta_getattr_u32(tb[TCA_POLICE_AVRATE]),
b1)); b1));
fprintf(f, "action %s", fprintf(f, "action %s",
police_action_n2a(p->action, b1, sizeof(b1))); police_action_n2a(p->action, b1, sizeof(b1)));
if (tb[TCA_POLICE_RESULT]) { if (tb[TCA_POLICE_RESULT]) {
__u32 action = rta_getattr_u32(tb[TCA_POLICE_RESULT]);
fprintf(f, "/%s", fprintf(f, "/%s",
police_action_n2a(*(int *)RTA_DATA(tb[TCA_POLICE_RESULT]), b1, sizeof(b1))); police_action_n2a(action, b1, sizeof(b1)));
} else } else
fprintf(f, " "); fprintf(f, " ");
fprintf(f, "overhead %ub ", p->rate.overhead); fprintf(f, "overhead %ub ", p->rate.overhead);
linklayer = (p->rate.linklayer & TC_LINKLAYER_MASK); linklayer = (p->rate.linklayer & TC_LINKLAYER_MASK);
if (linklayer > TC_LINKLAYER_ETHERNET || show_details) if (linklayer > TC_LINKLAYER_ETHERNET || show_details)