From mboxrd@z Thu Jan 1 00:00:00 1970 From: Patrick McHardy Subject: Re: (pull) pending patches Date: Mon, 16 Mar 2009 18:13:37 +0100 Message-ID: <49BE88C1.6000004@trash.net> References: <49BE0FF3.5090906@netfilter.org> <49BE567F.1020704@trash.net> <49BE574E.8070202@trash.net> <49BE81E2.2030805@trash.net> <49BE8646.5040401@trash.net> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit Cc: Pablo Neira Ayuso , Netfilter Developer Mailing List To: Jan Engelhardt Return-path: Received: from stinky.trash.net ([213.144.137.162]:51325 "EHLO stinky.trash.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752428AbZCPRNl (ORCPT ); Mon, 16 Mar 2009 13:13:41 -0400 In-Reply-To: Sender: netfilter-devel-owner@vger.kernel.org List-ID: Jan Engelhardt wrote: > On Monday 2009-03-16 18:03, Patrick McHardy wrote: > >> Jan Engelhardt wrote: >>> On Monday 2009-03-16 17:44, Patrick McHardy wrote: >>> >>>>> All NAT modules -- libipt_DNAT, SNAT, MASQUERADE, NETMAP, REDIRECT -- >>>>> use struct nf_nat_multi_range, which is also only in nf_nat.h. >>>> Indeed, that one should be exported. But in order to that is should >>>> be moved to include/linux/netfilter instead of using include/net >>>> includes in userspace. >>>> >>> I agree. If however it does not make it into 2.6.29 I would suggest >>> going with the proposed iptables tree with a manually-copied >>> nf_nat.h, though. >> Fair enough. Which branch do you want me to pull? >> > master, please. The diffstat looks massively different again. Careful comparision shows it actually *is* what you asked to pull, but please include a proper diffstat in the future so I don't have to do this every time I pull. Anyways, pulled and pushed out again, thanks.