Skip to contentSkip to conversation

IPv6: RTM_GETROUTE: Add RTA_ENCAP to result

PATCH Superseded Oliver Herms 2 participants 2 messages Nov 17, 2020

Subsystems (3)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 IPv6: RTM_GETROUTE: Add RTA_ENCAP to result

This patch adds an IPv6 routes encapsulation attribute to the result of netlink RTM_GETROUTE requests (i.e. ip route get 2001:db8::).

---
 net/ipv6/route.c | 4 ++++
 1 file changed, 4 insertions(+)
net/ipv6/route.c +4 -0
index 82cbb46a2a4f..d7e94eac3136 100644
@@ -5489,6 +5489,10 @@ static int rt6_fill_node(struct net *net, struct sk_buff *skb,
 	rtm->rtm_scope = RT_SCOPE_UNIVERSE;
 	rtm->rtm_protocol = rt->fib6_protocol;
 
+	if (dst && dst->lwtstate && lwtunnel_fill_encap(skb, dst->lwtstate,
+	    RTA_ENCAP, RTA_ENCAP_TYPE) < 0)
+		goto nla_put_failure;
+
 	if (rt6_flags & RTF_CACHE)
 		rtm->rtm_flags |= RTM_F_CLONED;
 
Signature · 1 line
2.25.1
#1 lore raw
Quoted 15 lines · Oliver Herms

This patch adds an IPv6 routes encapsulation attribute to the result of netlink RTM_GETROUTE requests (i.e. ip route get 2001:db8::).

---
 net/ipv6/route.c | 4 ++++
 1 file changed, 4 insertions(+)
net/ipv6/route.c +0 -0
index 82cbb46a2a4f..d7e94eac3136 100644

net/ipv6/route.c static int rt6_fill_node(struct net *net, struct sk_buff *skb, · line 5498

Quoted 10 lines
net/ipv6/route.c +4 -0
@@ -5489,6 +5489,10 @@ static int rt6_fill_node(struct net *net, struct sk_buff *skb,
 	rtm->rtm_scope = RT_SCOPE_UNIVERSE;
 	rtm->rtm_protocol = rt->fib6_protocol;
 
+	if (dst && dst->lwtstate && lwtunnel_fill_encap(skb, dst->lwtstate,
+	    RTA_ENCAP, RTA_ENCAP_TYPE) < 0)
+		goto nla_put_failure;
+
 	if (rt6_flags & RTF_CACHE)
 		rtm->rtm_flags |= RTM_F_CLONED;
 

That needs to be moved down to this section:

       if (rt6) {
                if (rt6_flags & RTF_GATEWAY &&
                    nla_put_in6_addr(skb, RTA_GATEWAY, &rt6->rt6i_gateway))
                        goto nla_put_failure;

                if (dst->dev && nla_put_u32(skb, RTA_OIF,
dst->dev->ifindex))
                        goto nla_put_failure;

--> add ENCAP here