Skip to content

I
iproute2
Commit ad1a12db authored by Patrick McHardy's avatar Patrick McHardy Committed by Stephen Hemminger
Browse files
Options

Use FRA_* attributes for routing rules 

Use the FRA attributes for routing rules, with exception of RTA_GATEWAY
(used for route-NAT) which isn't supported by current kernels anymore
and thus doesn't exist as FRA attribute.
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent a6ffa8b0
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 34 deletions
ip/iprule.c
View file @ ad1a12db
...@@ -54,7 +54,7 @@ int print_rule(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) ...@@ -54,7 +54,7 @@ int print_rule(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
int len = n->nlmsg_len; int len = n->nlmsg_len;
int host_len = -1; int host_len = -1;
__u32 table; __u32 table;
struct rtattr * tb[RTA_MAX+1]; struct rtattr * tb[FRA_MAX+1];
char abuf[256]; char abuf[256];
SPRINT_BUF(b1); SPRINT_BUF(b1);
...@@ -65,7 +65,7 @@ int print_rule(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) ...@@ -65,7 +65,7 @@ int print_rule(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
if (len < 0) if (len < 0)
return -1; return -1;
parse_rtattr(tb, RTA_MAX, RTM_RTA(r), len); parse_rtattr(tb, FRA_MAX, RTM_RTA(r), len);
if (r->rtm_family == AF_INET) if (r->rtm_family == AF_INET)
host_len = 32; host_len = 32;
...@@ -79,26 +79,26 @@ int print_rule(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) ...@@ -79,26 +79,26 @@ int print_rule(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
if (n->nlmsg_type == RTM_DELRULE) if (n->nlmsg_type == RTM_DELRULE)
fprintf(fp, "Deleted "); fprintf(fp, "Deleted ");
if (tb[RTA_PRIORITY]) if (tb[FRA_PRIORITY])
fprintf(fp, "%u:\t", *(unsigned*)RTA_DATA(tb[RTA_PRIORITY])); fprintf(fp, "%u:\t", *(unsigned*)RTA_DATA(tb[FRA_PRIORITY]));
else else
fprintf(fp, "0:\t"); fprintf(fp, "0:\t");
if (r->rtm_flags & FIB_RULE_INVERT) if (r->rtm_flags & FIB_RULE_INVERT)
fprintf(fp, "not "); fprintf(fp, "not ");
if (tb[RTA_SRC]) { if (tb[FRA_SRC]) {
if (r->rtm_src_len != host_len) { if (r->rtm_src_len != host_len) {
fprintf(fp, "from %s/%u ", rt_addr_n2a(r->rtm_family, fprintf(fp, "from %s/%u ", rt_addr_n2a(r->rtm_family,
RTA_PAYLOAD(tb[RTA_SRC]), RTA_PAYLOAD(tb[FRA_SRC]),
RTA_DATA(tb[RTA_SRC]), RTA_DATA(tb[FRA_SRC]),
abuf, sizeof(abuf)), abuf, sizeof(abuf)),
r->rtm_src_len r->rtm_src_len
); );
} else { } else {
fprintf(fp, "from %s ", format_host(r->rtm_family, fprintf(fp, "from %s ", format_host(r->rtm_family,
RTA_PAYLOAD(tb[RTA_SRC]), RTA_PAYLOAD(tb[FRA_SRC]),
RTA_DATA(tb[RTA_SRC]), RTA_DATA(tb[FRA_SRC]),
abuf, sizeof(abuf)) abuf, sizeof(abuf))
); );
} }
...@@ -108,18 +108,18 @@ int print_rule(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) ...@@ -108,18 +108,18 @@ int print_rule(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
fprintf(fp, "from all "); fprintf(fp, "from all ");
} }
if (tb[RTA_DST]) { if (tb[FRA_DST]) {
if (r->rtm_dst_len != host_len) { if (r->rtm_dst_len != host_len) {
fprintf(fp, "to %s/%u ", rt_addr_n2a(r->rtm_family, fprintf(fp, "to %s/%u ", rt_addr_n2a(r->rtm_family,
RTA_PAYLOAD(tb[RTA_DST]), RTA_PAYLOAD(tb[FRA_DST]),
RTA_DATA(tb[RTA_DST]), RTA_DATA(tb[FRA_DST]),
abuf, sizeof(abuf)), abuf, sizeof(abuf)),
r->rtm_dst_len r->rtm_dst_len
); );
} else { } else {
fprintf(fp, "to %s ", format_host(r->rtm_family, fprintf(fp, "to %s ", format_host(r->rtm_family,
RTA_PAYLOAD(tb[RTA_DST]), RTA_PAYLOAD(tb[FRA_DST]),
RTA_DATA(tb[RTA_DST]), RTA_DATA(tb[FRA_DST]),
abuf, sizeof(abuf))); abuf, sizeof(abuf)));
} }
} else if (r->rtm_dst_len) { } else if (r->rtm_dst_len) {
...@@ -130,21 +130,22 @@ int print_rule(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) ...@@ -130,21 +130,22 @@ int print_rule(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
SPRINT_BUF(b1); SPRINT_BUF(b1);
fprintf(fp, "tos %s ", rtnl_dsfield_n2a(r->rtm_tos, b1, sizeof(b1))); fprintf(fp, "tos %s ", rtnl_dsfield_n2a(r->rtm_tos, b1, sizeof(b1)));
} }
if (tb[RTA_PROTOINFO] || tb[RTA_FWMASK]) {
if (tb[FRA_FWMARK] || tb[FRA_FWMASK]) {
__u32 mark = 0, mask = 0; __u32 mark = 0, mask = 0;
if (tb[RTA_PROTOINFO]) if (tb[FRA_FWMARK])
mark = *(__u32*)RTA_DATA(tb[RTA_PROTOINFO]); mark = *(__u32*)RTA_DATA(tb[FRA_FWMARK]);
if (tb[RTA_FWMASK] && if (tb[FRA_FWMASK] &&
(mask = *(__u32*)RTA_DATA(tb[RTA_FWMASK])) != 0xFFFFFFFF) (mask = *(__u32*)RTA_DATA(tb[FRA_FWMASK])) != 0xFFFFFFFF)
fprintf(fp, "fwmark 0x%x/0x%x ", mark, mask); fprintf(fp, "fwmark 0x%x/0x%x ", mark, mask);
else else
fprintf(fp, "fwmark 0x%x ", mark); fprintf(fp, "fwmark 0x%x ", mark);
} }
if (tb[RTA_IIF]) { if (tb[FRA_IFNAME]) {
fprintf(fp, "iif %s ", (char*)RTA_DATA(tb[RTA_IIF])); fprintf(fp, "iif %s ", (char*)RTA_DATA(tb[FRA_IFNAME]));
if (r->rtm_flags & FIB_RULE_DEV_DETACHED) if (r->rtm_flags & FIB_RULE_DEV_DETACHED)
fprintf(fp, "[detached] "); fprintf(fp, "[detached] ");
} }
...@@ -153,8 +154,8 @@ int print_rule(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) ...@@ -153,8 +154,8 @@ int print_rule(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
if (table) if (table)
fprintf(fp, "lookup %s ", rtnl_rttable_n2a(table, b1, sizeof(b1))); fprintf(fp, "lookup %s ", rtnl_rttable_n2a(table, b1, sizeof(b1)));
if (tb[RTA_FLOW]) { if (tb[FRA_FLOW]) {
__u32 to = *(__u32*)RTA_DATA(tb[RTA_FLOW]); __u32 to = *(__u32*)RTA_DATA(tb[FRA_FLOW]);
__u32 from = to>>16; __u32 from = to>>16;
to &= 0xFFFF; to &= 0xFFFF;
if (from) { if (from) {
...@@ -252,13 +253,13 @@ static int iprule_modify(int cmd, int argc, char **argv) ...@@ -252,13 +253,13 @@ static int iprule_modify(int cmd, int argc, char **argv)
NEXT_ARG(); NEXT_ARG();
get_prefix(&dst, *argv, req.r.rtm_family); get_prefix(&dst, *argv, req.r.rtm_family);
req.r.rtm_src_len = dst.bitlen; req.r.rtm_src_len = dst.bitlen;
addattr_l(&req.n, sizeof(req), RTA_SRC, &dst.data, dst.bytelen); addattr_l(&req.n, sizeof(req), FRA_SRC, &dst.data, dst.bytelen);
} else if (strcmp(*argv, "to") == 0) { } else if (strcmp(*argv, "to") == 0) {
inet_prefix dst; inet_prefix dst;
NEXT_ARG(); NEXT_ARG();
get_prefix(&dst, *argv, req.r.rtm_family); get_prefix(&dst, *argv, req.r.rtm_family);
req.r.rtm_dst_len = dst.bitlen; req.r.rtm_dst_len = dst.bitlen;
addattr_l(&req.n, sizeof(req), RTA_DST, &dst.data, dst.bytelen); addattr_l(&req.n, sizeof(req), FRA_DST, &dst.data, dst.bytelen);
} else if (matches(*argv, "preference") == 0 || } else if (matches(*argv, "preference") == 0 ||
matches(*argv, "order") == 0 || matches(*argv, "order") == 0 ||
matches(*argv, "priority") == 0) { matches(*argv, "priority") == 0) {
...@@ -266,7 +267,7 @@ static int iprule_modify(int cmd, int argc, char **argv) ...@@ -266,7 +267,7 @@ static int iprule_modify(int cmd, int argc, char **argv)
NEXT_ARG(); NEXT_ARG();
if (get_u32(&pref, *argv, 0)) if (get_u32(&pref, *argv, 0))
invarg("preference value is invalid\n", *argv); invarg("preference value is invalid\n", *argv);
addattr32(&req.n, sizeof(req), RTA_PRIORITY, pref); addattr32(&req.n, sizeof(req), FRA_PRIORITY, pref);
} else if (strcmp(*argv, "tos") == 0) { } else if (strcmp(*argv, "tos") == 0) {
__u32 tos; __u32 tos;
NEXT_ARG(); NEXT_ARG();
...@@ -281,18 +282,18 @@ static int iprule_modify(int cmd, int argc, char **argv) ...@@ -281,18 +282,18 @@ static int iprule_modify(int cmd, int argc, char **argv)
*slash = '\0'; *slash = '\0';
if (get_u32(&fwmark, *argv, 0)) if (get_u32(&fwmark, *argv, 0))
invarg("fwmark value is invalid\n", *argv); invarg("fwmark value is invalid\n", *argv);
addattr32(&req.n, sizeof(req), RTA_PROTOINFO, fwmark); addattr32(&req.n, sizeof(req), FRA_FWMARK, fwmark);
if (slash) { if (slash) {
if (get_u32(&fwmask, slash+1, 0)) if (get_u32(&fwmask, slash+1, 0))
invarg("fwmask value is invalid\n", slash+1); invarg("fwmask value is invalid\n", slash+1);
addattr32(&req.n, sizeof(req), RTA_FWMASK, fwmask); addattr32(&req.n, sizeof(req), FRA_FWMASK, fwmask);
} }
} else if (matches(*argv, "realms") == 0) { } else if (matches(*argv, "realms") == 0) {
__u32 realm; __u32 realm;
NEXT_ARG(); NEXT_ARG();
if (get_rt_realms(&realm, *argv)) if (get_rt_realms(&realm, *argv))
invarg("invalid realms\n", *argv); invarg("invalid realms\n", *argv);
addattr32(&req.n, sizeof(req), RTA_FLOW, realm); addattr32(&req.n, sizeof(req), FRA_FLOW, realm);
} else if (matches(*argv, "table") == 0 || } else if (matches(*argv, "table") == 0 ||
strcmp(*argv, "lookup") == 0) { strcmp(*argv, "lookup") == 0) {
__u32 tid; __u32 tid;
...@@ -303,13 +304,13 @@ static int iprule_modify(int cmd, int argc, char **argv) ...@@ -303,13 +304,13 @@ static int iprule_modify(int cmd, int argc, char **argv)
req.r.rtm_table = tid; req.r.rtm_table = tid;
else { else {
req.r.rtm_table = RT_TABLE_UNSPEC; req.r.rtm_table = RT_TABLE_UNSPEC;
addattr32(&req.n, sizeof(req), RTA_TABLE, tid); addattr32(&req.n, sizeof(req), FRA_TABLE, tid);
} }
table_ok = 1; table_ok = 1;
} else if (strcmp(*argv, "dev") == 0 || } else if (strcmp(*argv, "dev") == 0 ||
strcmp(*argv, "iif") == 0) { strcmp(*argv, "iif") == 0) {
NEXT_ARG(); NEXT_ARG();
addattr_l(&req.n, sizeof(req), RTA_IIF, *argv, strlen(*argv)+1); addattr_l(&req.n, sizeof(req), FRA_IFNAME, *argv, strlen(*argv)+1);
} else if (strcmp(*argv, "nat") == 0 || } else if (strcmp(*argv, "nat") == 0 ||
matches(*argv, "map-to") == 0) { matches(*argv, "map-to") == 0) {
NEXT_ARG(); NEXT_ARG();
...@@ -360,15 +361,15 @@ static int flush_rule(const struct sockaddr_nl *who, struct nlmsghdr *n, void *a ...@@ -360,15 +361,15 @@ static int flush_rule(const struct sockaddr_nl *who, struct nlmsghdr *n, void *a
struct rtnl_handle rth2; struct rtnl_handle rth2;
struct rtmsg *r = NLMSG_DATA(n); struct rtmsg *r = NLMSG_DATA(n);
int len = n->nlmsg_len; int len = n->nlmsg_len;
struct rtattr * tb[RTA_MAX+1]; struct rtattr * tb[FRA_MAX+1];
len -= NLMSG_LENGTH(sizeof(*r)); len -= NLMSG_LENGTH(sizeof(*r));
if (len < 0) if (len < 0)
return -1; return -1;
parse_rtattr(tb, RTA_MAX, RTM_RTA(r), len); parse_rtattr(tb, FRA_MAX, RTM_RTA(r), len);
if (tb[RTA_PRIORITY]) { if (tb[FRA_PRIORITY]) {
n->nlmsg_type = RTM_DELRULE; n->nlmsg_type = RTM_DELRULE;
n->nlmsg_flags = NLM_F_REQUEST; n->nlmsg_flags = NLM_F_REQUEST;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7