[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1525654787-21990-3-git-send-email-roopa@cumulusnetworks.com>
Date: Sun, 6 May 2018 17:59:46 -0700
From: Roopa Prabhu <roopa@...ulusnetworks.com>
To: davem@...emloft.net
Cc: netdev@...r.kernel.org, dsa@...ulusnetworks.com,
nikolay@...ulusnetworks.com, idosch@...lanox.com
Subject: [PATCH net-next v2 2/3] ipv6: support sport and dport in RTM_GETROUTE
From: Roopa Prabhu <roopa@...ulusnetworks.com>
This is a followup to fib6 rules sport and dport
match support. Having them supported in getroute
makes it easier to test fib6 rule lookups. Used by fib6 rule
self tests.
Signed-off-by: Roopa Prabhu <roopa@...ulusnetworks.com>
---
net/ipv6/route.c | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 8ed1b51..bcdc056 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -4071,6 +4071,8 @@ static const struct nla_policy rtm_ipv6_policy[RTA_MAX+1] = {
[RTA_UID] = { .type = NLA_U32 },
[RTA_MARK] = { .type = NLA_U32 },
[RTA_TABLE] = { .type = NLA_U32 },
+ [RTA_SPORT] = { .type = NLA_U16 },
+ [RTA_DPORT] = { .type = NLA_U16 },
};
static int rtm_to_fib6_config(struct sk_buff *skb, struct nlmsghdr *nlh,
@@ -4728,6 +4730,17 @@ int rt6_dump_route(struct fib6_info *rt, void *p_arg)
arg->cb->nlh->nlmsg_seq, NLM_F_MULTI);
}
+static int nla_get_port(struct nlattr *attr, __be16 *port)
+{
+ int p = nla_get_be16(attr);
+
+ if (p <= 0 || p >= 0xffff)
+ return -EINVAL;
+
+ *port = p;
+ return 0;
+}
+
static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh,
struct netlink_ext_ack *extack)
{
@@ -4782,6 +4795,18 @@ static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh,
else
fl6.flowi6_uid = iif ? INVALID_UID : current_uid();
+ if (tb[RTA_SPORT]) {
+ err = nla_get_port(tb[RTA_SPORT], &fl6.fl6_sport);
+ if (err)
+ goto errout;
+ }
+
+ if (tb[RTA_DPORT]) {
+ err = nla_get_port(tb[RTA_DPORT], &fl6.fl6_dport);
+ if (err)
+ goto errout;
+ }
+
if (iif) {
struct net_device *dev;
int flags = 0;
--
2.1.4
Powered by blists - more mailing lists