Commit 1465db1a authored by Stephen Hemminger's avatar Stephen Hemminger

bridge: use rta_getattr_xxx wrappers

Don't peek at RTA_DATA() directly.
parent 38df7ac9
...@@ -98,37 +98,33 @@ int print_linkinfo(const struct sockaddr_nl *who, ...@@ -98,37 +98,33 @@ int print_linkinfo(const struct sockaddr_nl *who,
fprintf(fp, "Deleted "); fprintf(fp, "Deleted ");
fprintf(fp, "%d: %s ", ifi->ifi_index, fprintf(fp, "%d: %s ", ifi->ifi_index,
tb[IFLA_IFNAME] ? (char*)RTA_DATA(tb[IFLA_IFNAME]) : "<nil>"); tb[IFLA_IFNAME] ? rta_getattr_str(tb[IFLA_IFNAME]) : "<nil>");
if (tb[IFLA_OPERSTATE]) if (tb[IFLA_OPERSTATE])
print_operstate(fp, *(__u8 *)RTA_DATA(tb[IFLA_OPERSTATE])); print_operstate(fp, rta_getattr_u8(tb[IFLA_OPERSTATE]));
if (tb[IFLA_LINK]) { if (tb[IFLA_LINK]) {
SPRINT_BUF(b1); SPRINT_BUF(b1);
int iflink = *(int*)RTA_DATA(tb[IFLA_LINK]); int iflink = rta_getattr_u32(tb[IFLA_LINK]);
if (iflink == 0) if (iflink == 0)
fprintf(fp, "@NONE: "); fprintf(fp, "@NONE: ");
else { else
fprintf(fp, "@%s: ", fprintf(fp, "@%s: ",
if_indextoname(iflink, b1)); if_indextoname(iflink, b1));
} } else
} else {
fprintf(fp, ": "); fprintf(fp, ": ");
}
print_link_flags(fp, ifi->ifi_flags); print_link_flags(fp, ifi->ifi_flags);
if (tb[IFLA_MTU]) if (tb[IFLA_MTU])
fprintf(fp, "mtu %u ", *(int*)RTA_DATA(tb[IFLA_MTU])); fprintf(fp, "mtu %u ", rta_getattr_u32(tb[IFLA_MTU]));
if (tb[IFLA_MASTER]) { if (tb[IFLA_MASTER])
fprintf(fp, "master %s ", fprintf(fp, "master %s ",
if_indextoname(*(int*)RTA_DATA(tb[IFLA_MASTER]), b1)); if_indextoname(rta_getattr_u32(tb[IFLA_MASTER]), b1));
}
if (tb[IFLA_PROTINFO]) { if (tb[IFLA_PROTINFO]) {
uint8_t state = *(uint8_t *)RTA_DATA(tb[IFLA_PROTINFO]); __u8 state = rta_getattr_u8(tb[IFLA_PROTINFO]);
if (state <= BR_STATE_BLOCKING) if (state <= BR_STATE_BLOCKING)
fprintf(fp, "state %s", port_states[state]); fprintf(fp, "state %s", port_states[state]);
else else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment