Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d798499 authored by Jiri Benc's avatar Jiri Benc Committed by David S. Miller
Browse files

lwtunnel: ip tunnel: fix multiple routes with different encap 



Currently, two routes going through the same tunnel interface are considered
the same even when they are routed to a different host after encapsulation.
This causes all routes added after the first one to have incorrect
encapsulation parameters.

This is nicely visible by doing:

  # ip r a 192.168.1.2/32 dev vxlan0 tunnel dst 10.0.0.2
  # ip r a 192.168.1.3/32 dev vxlan0 tunnel dst 10.0.0.3
  # ip r
  [...]
  192.168.1.2/32 tunnel id 0 src 0.0.0.0 dst 10.0.0.2 [...]
  192.168.1.3/32 tunnel id 0 src 0.0.0.0 dst 10.0.0.2 [...]

Implement the missing comparison function.

Fixes: 3093fbe7 ("route: Per route IP tunnel metadata via lightweight tunnel")
Signed-off-by: default avatarJiri Benc <jbenc@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent df383e62

net/ipv4/ip_tunnel_core.c

+7 −0
Original line number Diff line number Diff line
@@ -286,10 +286,17 @@ static int ip_tun_encap_nlsize(struct lwtunnel_state *lwtstate) 
		+ nla_total_size(2);	/* LWTUNNEL_IP_FLAGS */

}



static int ip_tun_cmp_encap(struct lwtunnel_state *a, struct lwtunnel_state *b)

{

	return memcmp(lwt_tun_info(a), lwt_tun_info(b),

		      sizeof(struct ip_tunnel_info));

}



static const struct lwtunnel_encap_ops ip_tun_lwt_ops = {

	.build_state = ip_tun_build_state,

	.fill_encap = ip_tun_fill_encap_info,

	.get_encap_size = ip_tun_encap_nlsize,

	.cmp_encap = ip_tun_cmp_encap,

};



void __init ip_tunnel_core_init(void)