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

Commit 56e42441 authored by Julian Anastasov's avatar Julian Anastasov Committed by David S. Miller
Browse files

netfilter: nf_conntrack: fix rt6i_gateway checks for H.323 helper



Now when rt6_nexthop() can return nexthop address we can use it
for proper nexthop comparison of directly connected destinations.
For more information refer to commit bbb5823c
("netfilter: nf_conntrack: fix rt_gateway checks for H.323 helper").

Signed-off-by: default avatarJulian Anastasov <ja@ssi.bg>
Acked-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 550bab42
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -778,8 +778,8 @@ static int callforward_do_filter(const union nf_inet_addr *src,
				   flowi6_to_flowi(&fl1), false)) {
			if (!afinfo->route(&init_net, (struct dst_entry **)&rt2,
					   flowi6_to_flowi(&fl2), false)) {
				if (!memcmp(&rt1->rt6i_gateway, &rt2->rt6i_gateway,
					    sizeof(rt1->rt6i_gateway)) &&
				if (ipv6_addr_equal(rt6_nexthop(rt1),
						    rt6_nexthop(rt2)) &&
				    rt1->dst.dev == rt2->dst.dev)
					ret = 1;
				dst_release(&rt2->dst);