diff options
Diffstat (limited to 'networking/libiproute/iprule.c')
-rw-r--r-- | networking/libiproute/iprule.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/networking/libiproute/iprule.c b/networking/libiproute/iprule.c index 19338770f..2a1b3746c 100644 --- a/networking/libiproute/iprule.c +++ b/networking/libiproute/iprule.c | |||
@@ -119,7 +119,7 @@ static int print_rule(struct sockaddr_nl *who ATTRIBUTE_UNUSED, | |||
119 | fprintf(fp, "tos %s ", rtnl_dsfield_n2a(r->rtm_tos, b1, sizeof(b1))); | 119 | fprintf(fp, "tos %s ", rtnl_dsfield_n2a(r->rtm_tos, b1, sizeof(b1))); |
120 | } | 120 | } |
121 | if (tb[RTA_PROTOINFO]) { | 121 | if (tb[RTA_PROTOINFO]) { |
122 | fprintf(fp, "fwmark %#x ", *(__u32*)RTA_DATA(tb[RTA_PROTOINFO])); | 122 | fprintf(fp, "fwmark %#x ", *(uint32_t*)RTA_DATA(tb[RTA_PROTOINFO])); |
123 | } | 123 | } |
124 | 124 | ||
125 | if (tb[RTA_IIF]) { | 125 | if (tb[RTA_IIF]) { |
@@ -130,8 +130,8 @@ static int print_rule(struct sockaddr_nl *who ATTRIBUTE_UNUSED, | |||
130 | fprintf(fp, "lookup %s ", rtnl_rttable_n2a(r->rtm_table, b1, sizeof(b1))); | 130 | fprintf(fp, "lookup %s ", rtnl_rttable_n2a(r->rtm_table, b1, sizeof(b1))); |
131 | 131 | ||
132 | if (tb[RTA_FLOW]) { | 132 | if (tb[RTA_FLOW]) { |
133 | __u32 to = *(__u32*)RTA_DATA(tb[RTA_FLOW]); | 133 | uint32_t to = *(uint32_t*)RTA_DATA(tb[RTA_FLOW]); |
134 | __u32 from = to>>16; | 134 | uint32_t from = to>>16; |
135 | to &= 0xFFFF; | 135 | to &= 0xFFFF; |
136 | if (from) { | 136 | if (from) { |
137 | fprintf(fp, "realms %s/", | 137 | fprintf(fp, "realms %s/", |
@@ -230,25 +230,25 @@ int iprule_modify(int cmd, int argc, char **argv) | |||
230 | } else if (matches(*argv, "preference") == 0 || | 230 | } else if (matches(*argv, "preference") == 0 || |
231 | matches(*argv, "order") == 0 || | 231 | matches(*argv, "order") == 0 || |
232 | matches(*argv, "priority") == 0) { | 232 | matches(*argv, "priority") == 0) { |
233 | __u32 pref; | 233 | uint32_t pref; |
234 | NEXT_ARG(); | 234 | NEXT_ARG(); |
235 | if (get_u32(&pref, *argv, 0)) | 235 | if (get_u32(&pref, *argv, 0)) |
236 | invarg("preference value", *argv); | 236 | invarg("preference value", *argv); |
237 | addattr32(&req.n, sizeof(req), RTA_PRIORITY, pref); | 237 | addattr32(&req.n, sizeof(req), RTA_PRIORITY, pref); |
238 | } else if (strcmp(*argv, "tos") == 0) { | 238 | } else if (strcmp(*argv, "tos") == 0) { |
239 | __u32 tos; | 239 | uint32_t tos; |
240 | NEXT_ARG(); | 240 | NEXT_ARG(); |
241 | if (rtnl_dsfield_a2n(&tos, *argv)) | 241 | if (rtnl_dsfield_a2n(&tos, *argv)) |
242 | invarg("TOS value", *argv); | 242 | invarg("TOS value", *argv); |
243 | req.r.rtm_tos = tos; | 243 | req.r.rtm_tos = tos; |
244 | } else if (strcmp(*argv, "fwmark") == 0) { | 244 | } else if (strcmp(*argv, "fwmark") == 0) { |
245 | __u32 fwmark; | 245 | uint32_t fwmark; |
246 | NEXT_ARG(); | 246 | NEXT_ARG(); |
247 | if (get_u32(&fwmark, *argv, 0)) | 247 | if (get_u32(&fwmark, *argv, 0)) |
248 | invarg("fwmark value", *argv); | 248 | invarg("fwmark value", *argv); |
249 | addattr32(&req.n, sizeof(req), RTA_PROTOINFO, fwmark); | 249 | addattr32(&req.n, sizeof(req), RTA_PROTOINFO, fwmark); |
250 | } else if (matches(*argv, "realms") == 0) { | 250 | } else if (matches(*argv, "realms") == 0) { |
251 | __u32 realm; | 251 | uint32_t realm; |
252 | NEXT_ARG(); | 252 | NEXT_ARG(); |
253 | if (get_rt_realms(&realm, *argv)) | 253 | if (get_rt_realms(&realm, *argv)) |
254 | invarg("realms", *argv); | 254 | invarg("realms", *argv); |