diff options
| author | Julian Anastasov <ja@ssi.bg> | 2013-10-20 15:43:05 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-04 04:31:05 -0800 |
| commit | 2332d212926aaa92d4164482f6f7583c0f796647 (patch) | |
| tree | 9506c7893ef80bd02a6b6073e11bb0e242e2e958 | |
| parent | 044d6efb797bfa1131bfb510102505ba41bfec52 (diff) | |
| download | linux-3.10-2332d212926aaa92d4164482f6f7583c0f796647.tar.gz linux-3.10-2332d212926aaa92d4164482f6f7583c0f796647.tar.bz2 linux-3.10-2332d212926aaa92d4164482f6f7583c0f796647.zip | |
netfilter: nf_conntrack: fix rt6i_gateway checks for H.323 helper
[ Upstream commit 56e42441ed54b092d6c7411138ce60d049e7c731 ]
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 bbb5823cf742a7
("netfilter: nf_conntrack: fix rt_gateway checks for H.323 helper").
Signed-off-by: Julian Anastasov <ja@ssi.bg>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/netfilter/nf_conntrack_h323_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/nf_conntrack_h323_main.c b/net/netfilter/nf_conntrack_h323_main.c index bdebd03bc8c..70866d192ef 100644 --- a/net/netfilter/nf_conntrack_h323_main.c +++ b/net/netfilter/nf_conntrack_h323_main.c @@ -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); |