From patchwork Sat Jul 31 18:15:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changli Gao X-Patchwork-Id: 60441 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 7F8EA1007D3 for ; Sun, 1 Aug 2010 11:48:43 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753586Ab0HABsZ (ORCPT ); Sat, 31 Jul 2010 21:48:25 -0400 Received: from mail-px0-f174.google.com ([209.85.212.174]:55687 "EHLO mail-px0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753340Ab0HABsY (ORCPT ); Sat, 31 Jul 2010 21:48:24 -0400 Received: by pxi14 with SMTP id 14so971689pxi.19 for ; Sat, 31 Jul 2010 18:48:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=K/dBAKIHt8CMsIP13MgknZAH8OLrulQmihyCVP9gTPc=; b=Qf1XUJz0uRqo2eq4We1aXToEeUmg+7v0WD76T2bgF/NsHVQqMsJ75M0PlyRnYyVR6t AhyolECTE6Ok9LuaBlwKjHE6a7uzO3icPdAlzYgyZQaXDAYtq7rX9dz81XEc7g0U4HaT lMdHRjpsH2y+fokJH07QDWS/tr376cJcqIQsw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=RptT/5fHO6mpb2nvkdZcBDRD6x8Ov1BhiThdtVOsdwOs2w+0026G0fmrs6CCh4Hs5a 93+APtSDwIE2cVIBh6cjjVjFxRqV9ja5vi5G7ou/mXSjwm1G59usLaeybaK7XQWOWBT/ +SHW7uSpwyI7KCdVv7kCzMmHwFJ8Sny0lgQ8c= Received: by 10.114.102.3 with SMTP id z3mr4847195wab.71.1280627303161; Sat, 31 Jul 2010 18:48:23 -0700 (PDT) Received: from localhost.localdomain ([221.238.105.239]) by mx.google.com with ESMTPS id 33sm7601356wad.18.2010.07.31.18.48.15 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 31 Jul 2010 18:48:22 -0700 (PDT) From: Changli Gao To: Patrick McHardy Cc: "David S. Miller" , netfilter-devel@vger.kernel.org, netdev@vger.kernel.org, Changli Gao Subject: [PATCH] nf_nat: no IP_NAT_RANGE_MAP_IPS flags when alloc_null_binding() Date: Sun, 1 Aug 2010 02:15:59 +0800 Message-Id: <1280600159-2984-1-git-send-email-xiaosuo@gmail.com> X-Mailer: git-send-email 1.7.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org when alloc_null_binding(), no IP_NAT_RNAGE_MAP_IPS in flags means no IP address translation is needed. It isn't necessary to specify the address explicitly. Signed-off-by: Changli Gao ---- net/ipv4/netfilter/nf_nat_rule.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/ipv4/netfilter/nf_nat_rule.c b/net/ipv4/netfilter/nf_nat_rule.c index ebbd319..fe8c90e 100644 --- a/net/ipv4/netfilter/nf_nat_rule.c +++ b/net/ipv4/netfilter/nf_nat_rule.c @@ -108,14 +108,12 @@ alloc_null_binding(struct nf_conn *ct, unsigned int hooknum) per-proto parts (hence not IP_NAT_RANGE_PROTO_SPECIFIED). Use reply in case it's already been mangled (eg local packet). */ - __be32 ip - = (HOOK2MANIP(hooknum) == IP_NAT_MANIP_SRC - ? ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip - : ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip); - struct nf_nat_range range - = { IP_NAT_RANGE_MAP_IPS, ip, ip, { 0 }, { 0 } }; - - pr_debug("Allocating NULL binding for %p (%pI4)\n", ct, &ip); + struct nf_nat_range range = { 0 }; + + pr_debug("Allocating NULL binding for %p (%pI4)\n", ct, + HOOK2MANIP(hooknum) == IP_NAT_MANIP_SRC ? + &ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip : + &ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip); return nf_nat_setup_info(ct, &range, HOOK2MANIP(hooknum)); }