From patchwork Sun Oct 20 12:43:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julian Anastasov X-Patchwork-Id: 284966 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 545872C0097 for ; Sun, 20 Oct 2013 23:44:34 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751328Ab3JTMo1 (ORCPT ); Sun, 20 Oct 2013 08:44:27 -0400 Received: from ja.ssi.bg ([178.16.129.10]:52231 "EHLO ja.home.ssi.bg" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1751230Ab3JTMo0 (ORCPT ); Sun, 20 Oct 2013 08:44:26 -0400 Received: from ja.home.ssi.bg (localhost.localdomain [127.0.0.1]) by ja.home.ssi.bg (8.14.7/8.14.7) with ESMTP id r9KChl97001568; Sun, 20 Oct 2013 15:43:47 +0300 Received: (from root@localhost) by ja.home.ssi.bg (8.14.7/8.14.7/Submit) id r9KChlLu001567; Sun, 20 Oct 2013 15:43:47 +0300 From: Julian Anastasov To: David Miller Cc: netdev@vger.kernel.org, netfilter-devel@vger.kernel.org, lvs-devel@vger.kernel.org, Hideaki YOSHIFUJI Subject: [PATCH net 3/3] netfilter: nf_conntrack: fix rt6i_gateway checks for H.323 helper Date: Sun, 20 Oct 2013 15:43:05 +0300 Message-Id: <1382272985-1528-4-git-send-email-ja@ssi.bg> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1382272985-1528-1-git-send-email-ja@ssi.bg> References: <1382272985-1528-1-git-send-email-ja@ssi.bg> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org 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 Acked-by: Hannes Frederic Sowa --- net/netfilter/nf_conntrack_h323_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/netfilter/nf_conntrack_h323_main.c b/net/netfilter/nf_conntrack_h323_main.c index bdebd03..70866d1 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);