mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 15:18:19 +00:00
mpls: make RTA_OIF optional
If user did not specify an oif, try and get it from the via address. If failed to get device, return with -ENODEV. Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
fd36ef606c
commit
01faef2ceb
1 changed files with 66 additions and 1 deletions
|
@ -15,6 +15,7 @@
|
||||||
#include <net/ip_fib.h>
|
#include <net/ip_fib.h>
|
||||||
#include <net/netevent.h>
|
#include <net/netevent.h>
|
||||||
#include <net/netns/generic.h>
|
#include <net/netns/generic.h>
|
||||||
|
#include <net/ip6_route.h>
|
||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
|
|
||||||
#define LABEL_NOT_SPECIFIED (1<<20)
|
#define LABEL_NOT_SPECIFIED (1<<20)
|
||||||
|
@ -330,6 +331,70 @@ static unsigned find_free_label(struct net *net)
|
||||||
return LABEL_NOT_SPECIFIED;
|
return LABEL_NOT_SPECIFIED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static struct net_device *inet_fib_lookup_dev(struct net *net, void *addr)
|
||||||
|
{
|
||||||
|
struct net_device *dev = NULL;
|
||||||
|
struct rtable *rt;
|
||||||
|
struct in_addr daddr;
|
||||||
|
|
||||||
|
memcpy(&daddr, addr, sizeof(struct in_addr));
|
||||||
|
rt = ip_route_output(net, daddr.s_addr, 0, 0, 0);
|
||||||
|
if (IS_ERR(rt))
|
||||||
|
goto errout;
|
||||||
|
|
||||||
|
dev = rt->dst.dev;
|
||||||
|
dev_hold(dev);
|
||||||
|
|
||||||
|
ip_rt_put(rt);
|
||||||
|
|
||||||
|
errout:
|
||||||
|
return dev;
|
||||||
|
}
|
||||||
|
|
||||||
|
static struct net_device *inet6_fib_lookup_dev(struct net *net, void *addr)
|
||||||
|
{
|
||||||
|
struct net_device *dev = NULL;
|
||||||
|
struct dst_entry *dst;
|
||||||
|
struct flowi6 fl6;
|
||||||
|
|
||||||
|
memset(&fl6, 0, sizeof(fl6));
|
||||||
|
memcpy(&fl6.daddr, addr, sizeof(struct in6_addr));
|
||||||
|
dst = ip6_route_output(net, NULL, &fl6);
|
||||||
|
if (dst->error)
|
||||||
|
goto errout;
|
||||||
|
|
||||||
|
dev = dst->dev;
|
||||||
|
dev_hold(dev);
|
||||||
|
|
||||||
|
errout:
|
||||||
|
dst_release(dst);
|
||||||
|
|
||||||
|
return dev;
|
||||||
|
}
|
||||||
|
|
||||||
|
static struct net_device *find_outdev(struct net *net,
|
||||||
|
struct mpls_route_config *cfg)
|
||||||
|
{
|
||||||
|
struct net_device *dev = NULL;
|
||||||
|
|
||||||
|
if (!cfg->rc_ifindex) {
|
||||||
|
switch (cfg->rc_via_table) {
|
||||||
|
case NEIGH_ARP_TABLE:
|
||||||
|
dev = inet_fib_lookup_dev(net, cfg->rc_via);
|
||||||
|
break;
|
||||||
|
case NEIGH_ND_TABLE:
|
||||||
|
dev = inet6_fib_lookup_dev(net, cfg->rc_via);
|
||||||
|
break;
|
||||||
|
case NEIGH_LINK_TABLE:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
dev = dev_get_by_index(net, cfg->rc_ifindex);
|
||||||
|
}
|
||||||
|
|
||||||
|
return dev;
|
||||||
|
}
|
||||||
|
|
||||||
static int mpls_route_add(struct mpls_route_config *cfg)
|
static int mpls_route_add(struct mpls_route_config *cfg)
|
||||||
{
|
{
|
||||||
struct mpls_route __rcu **platform_label;
|
struct mpls_route __rcu **platform_label;
|
||||||
|
@ -361,7 +426,7 @@ static int mpls_route_add(struct mpls_route_config *cfg)
|
||||||
goto errout;
|
goto errout;
|
||||||
|
|
||||||
err = -ENODEV;
|
err = -ENODEV;
|
||||||
dev = dev_get_by_index(net, cfg->rc_ifindex);
|
dev = find_outdev(net, cfg);
|
||||||
if (!dev)
|
if (!dev)
|
||||||
goto errout;
|
goto errout;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue