net: ipv4: RTM_GETROUTE: return matched fib result when requested
authorRoopa Prabhu <roopa@cumulusnetworks.com>
Thu, 25 May 2017 17:42:39 +0000 (10:42 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 26 May 2017 18:12:51 +0000 (14:12 -0400)
This patch adds support to return matched fib result when RTM_F_FIB_MATCH
flag is specified in RTM_GETROUTE request. This is useful for user-space
applications/controllers wanting to query a matching route.

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/route.c

index 1fa9127..3a74256 100644 (file)
 #include <net/ip_tunnels.h>
 #include <net/l3mdev.h>
 
+#include "fib_lookup.h"
+
 #define RT_FL_TOS(oldflp4) \
        ((oldflp4)->flowi4_tos & (IPTOS_RT_MASK | RTO_ONLINK))
 
@@ -2746,8 +2748,15 @@ static int inet_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh,
        if (rtm->rtm_flags & RTM_F_LOOKUP_TABLE)
                table_id = rt->rt_table_id;
 
-       err = rt_fill_info(net, dst, src, table_id, &fl4, skb,
-                          NETLINK_CB(in_skb).portid, nlh->nlmsg_seq, rt);
+       if (rtm->rtm_flags & RTM_F_FIB_MATCH)
+               err = fib_dump_info(skb, NETLINK_CB(in_skb).portid,
+                                   nlh->nlmsg_seq, RTM_NEWROUTE, table_id,
+                                   rt->rt_type, res.prefix, res.prefixlen,
+                                   fl4.flowi4_tos, res.fi, 0);
+       else
+               err = rt_fill_info(net, dst, src, table_id, &fl4, skb,
+                                  NETLINK_CB(in_skb).portid, nlh->nlmsg_seq,
+                                  rt);
        if (err < 0)
                goto errout_free;