Re: [PATCH] xx_nat_proto_gre: gre_key returns wrong pointer

[Patrick McHardy <kaber@trash.net>]

Jorge Boncompte [DTI2] wrote:
>    Hi, Patrick take a look at this patch when you have time please. I
> tested it and behaves correctly, I can run one and only one GRE tunnel
> though a NATing box and PPTP still works too, if you try with a second
> tunnel from different host by the fact of not modifying the tuple it does
> not work as the comment in get_unique_tuple says.

> +++ linux-2.6.21/net/ipv4/netfilter/ip_nat_proto_gre.c 2007-04-26
> 19:01:02.000000000 +0200
> @@ -70,6 +70,11 @@
>  __be16 *keyptr;
>  unsigned int min, i, range_size;
> 
> + /* If there is no master conntrack we are not PPTP,
> +    do not change tuples */
> + if (!conntrack->master)
> +  return 0;
> +


Thats a good idea, I thought it would be more complicated to
determine the kind of connection in get_unique_tuple() since
it doesn't get to see the packet.

Please sign off on the patch so I can apply it.