netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Martin Schiller" <mschiller@tdt.de>
To: "'Patrick McHardy'" <kaber@trash.net>
Cc: <netdev@vger.kernel.org>,
	"'Netfilter Development Mailinglist'"
	<netfilter-devel@lists.netfilter.org>
Subject: RE: [PATCH] NAT and requests to unrouted targets
Date: Thu, 15 Mar 2007 15:54:19 +0100	[thread overview]
Message-ID: <001101c76711$cf7dc6a0$1a04010a@V505CP> (raw)
In-Reply-To: <45F90905.4000408@trash.net>

On Thursday, March 15, 2007 9:51 AM, Patrick McHardy wrote:

> diff -uNpr linux-2.6.19.org/net/ipv4/netfilter/ip_nat_standalone.c
> linux-2.6.19/net/ipv4/netfilter/ip_nat_standalone.c
> --- linux-2.6.19.org/net/ipv4/netfilter/ip_nat_standalone.c
> 2006-11-29 22:57:37.000000000 +0100
> +++ linux-2.6.19/net/ipv4/netfilter/ip_nat_standalone.c 2007-03-15
> 08:25:11.000000000 +0100
> @@ -191,11 +191,13 @@ ip_nat_in(unsigned int hooknum,
>            int (*okfn)(struct sk_buff *))  {
>         unsigned int ret;
> +       __be32 saddr = (*pskb)->nh.iph->saddr;
>         __be32 daddr = (*pskb)->nh.iph->daddr;
> 
>         ret = ip_nat_fn(hooknum, pskb, in, out, okfn);
>         if (ret != NF_DROP && ret != NF_STOLEN
> -           && daddr != (*pskb)->nh.iph->daddr) {
> +           && ((*pskb)->nh.iph->saddr != saddr
> +               || (*pskb)->nh.iph->daddr != daddr)) {
>                 dst_release((*pskb)->dst);
>                 (*pskb)->dst = NULL;
>         }
> 
> I don't see how this would change anything, the PRE_ROUTING hook
> doesn't change the source address, so the comparison is unnecessary,
> additionally the dst_release is only needed for loopback because
> packets received from a real interface don't have a route attached at
> this time.    

Sorry, you are right. This wouldn't change anything.
I've tested so much to find the responsible peace of code for my problem, so
i messed up some things here.

Well, the really responsible code is the following:

------------------------------------------------------------------------
static unsigned int
ip_nat_local_fn(unsigned int hooknum,
		struct sk_buff **pskb,
		const struct net_device *in,
		const struct net_device *out,
		int (*okfn)(struct sk_buff *))
{
	struct ip_conntrack *ct;
	enum ip_conntrack_info ctinfo;
	unsigned int ret;

	/* root is playing with raw sockets. */
	if ((*pskb)->len < sizeof(struct iphdr)
	    || (*pskb)->nh.iph->ihl * 4 < sizeof(struct iphdr))
		return NF_ACCEPT;

	ret = ip_nat_fn(hooknum, pskb, in, out, okfn);
	if (ret != NF_DROP && ret != NF_STOLEN
	    && (ct = ip_conntrack_get(*pskb, &ctinfo)) != NULL) {
		enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo);

		if (ct->tuplehash[dir].tuple.dst.ip !=
		    ct->tuplehash[!dir].tuple.src.ip
#ifdef CONFIG_XFRM
		    || ct->tuplehash[dir].tuple.dst.u.all !=
		       ct->tuplehash[!dir].tuple.src.u.all
#endif
		    )
			if (ip_route_me_harder(pskb, RTN_UNSPEC))
				ret = NF_DROP;
	}
	return ret;
}
----------------------------------------------------------------------------

To be more exactly, it's the examination of
"ct->tuplehash[dir].tuple.dst.u.all != ct->tuplehash[!dir].tuple.src.u.all"
which is only be done if XFRM is configured. Since I don't need this anyway,
I deactivated XFRM now and my "ping -I" is working now. 

Regards, Martin



  reply	other threads:[~2007-03-15 14:54 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-03-15  8:03 [PATCH] NAT and requests to unrouted targets Martin Schiller
2007-03-15  8:51 ` Patrick McHardy
2007-03-15 14:54   ` Martin Schiller [this message]
2007-03-16  4:13     ` Patrick McHardy
2007-03-19 16:02     ` Patrick McHardy
2007-03-20 11:56       ` Martin Schiller
2007-03-20 12:34         ` Patrick McHardy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='001101c76711$cf7dc6a0$1a04010a@V505CP' \
    --to=mschiller@tdt.de \
    --cc=kaber@trash.net \
    --cc=netdev@vger.kernel.org \
    --cc=netfilter-devel@lists.netfilter.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).