Re: latest nf_conntrack version

Re: latest nf_conntrack version

[Harald Welte]

[-- Attachment #1: Type: text/plain, Size: 1221 bytes --]

On Tue, Aug 02, 2005 at 11:49:11PM +0200, Patrick McHardy wrote:
> Yasuyuki KOZAKAI wrote:
> > Hi Patrick,
> > 
> > Well, it's may be silly question,
> 
> Not at all, git can be confusing :) It took me 2 hours to figure out how
> to use git-ssh-push (the remote repository already needs to be
> initialized).

mh, I'm just calling plain 'rsync' on the .git directory for the
netfilter-2.6 tree on people.netfilter.org/laforge.

I've now also merged your nf_conntrack tree into my netfilter-2.6 tree
as local "nf_conntrack" branch.

rsync://people.netfilter.org/users/laforge/scm/netfilter-2.6.14.git#nf_conntrack

should therefore be the full url to that branch.  I've done the nfcache
removal and the nf_log_packet() api changes. it compiles and builds fine
(no unresolved symbols), but I didn't have time to test it further.

-- 
- Harald Welte <laforge@netfilter.org>                 http://netfilter.org/
============================================================================
  "Fragmentation is like classful addressing -- an interesting early
   architectural error that shows how much experimentation was going
   on while IP was being designed."                    -- Paul Vixie

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: latest nf_conntrack version

[Yasuyuki KOZAKAI]

[-- Attachment #1: Type: Text/Plain, Size: 917 bytes --]


Hi, Harald,

From: Harald Welte <laforge@netfilter.org>
Date: Wed, 3 Aug 2005 16:27:08 +0200

> I've now also merged your nf_conntrack tree into my netfilter-2.6 tree
> as local "nf_conntrack" branch.
> 
> rsync://people.netfilter.org/users/laforge/scm/netfilter-2.6.14.git#nf_conntrack
> 
> should therefore be the full url to that branch.  I've done the nfcache
> removal and the nf_log_packet() api changes. it compiles and builds fine
> (no unresolved symbols), but I didn't have time to test it further.

The configuration menu for netlink and nf_conntrack in your branch are in
"Packet Generator" menu. And currently masq/NAT sentences should be removed,
I think.

I attached the patch for this. But if you have the better idea of
title/explanations, feel free to change them.

-----------------------------------------------------------------
Yasuyuki Kozakai @ USAGI Project <yasuyuki.kozakai@toshiba.co.jp>

[-- Attachment #2: kconfig.patch --]
[-- Type: Text/Plain, Size: 1891 bytes --]

diff --git a/net/Kconfig b/net/Kconfig
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -140,6 +140,7 @@ config BRIDGE_NETFILTER
 
 	  If unsure, say N.
 
+source "net/netfilter/Kconfig"
 source "net/ipv4/netfilter/Kconfig"
 source "net/ipv6/netfilter/Kconfig"
 source "net/decnet/netfilter/Kconfig"
@@ -205,8 +206,6 @@ config NET_PKTGEN
 	  To compile this code as a module, choose M here: the
 	  module will be called pktgen.
 
-source "net/netfilter/Kconfig"
-
 endmenu
 
 endmenu
diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -7,16 +7,15 @@ menu "IP: Netfilter Configuration"
 
 # connection tracking, helpers and protocols
 config IP_NF_CONNTRACK
-	tristate "Connection tracking (required for masq/NAT)"
+	depends on EXPERIMENTAL
+	tristate "Layer 3 Independent Connection tracking (EXPERIMENTAL)"
 	---help---
 	  Connection tracking keeps a record of what packets have passed
 	  through your machine, in order to figure out how they are related
 	  into connections.
 
-	  This is required to do Masquerading or other kinds of Network
-	  Address Translation (except for Fast NAT).  It can also be used to
-	  enhance packet filtering (see `Connection state match support'
-	  below).
+	  Layer 3 independent connection tracking is experimental scheme
+	  which generalize ip_conntrack to support other layer 3 protocols.
 
 	  To compile it as a module, choose M here.  If unsure, say N.
 
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -1,3 +1,6 @@
+menu "Generic Netfilter Configuration"
+	depends on NET && NETFILTER
+
 config NETFILTER_NETLINK
        tristate "Netfilter netlink interface"
        help
@@ -82,3 +85,4 @@ config NF_CONNTRACK_FTP
 
 	  To compile it as a module, choose M here.  If unsure, say N.
 
+endmenu

Re: latest nf_conntrack version

[Patrick McHardy]

Yasuyuki KOZAKAI wrote:
> The configuration menu for netlink and nf_conntrack in your branch are in
> "Packet Generator" menu.

I think the reason for this is the CONFIG_NET_CLS_ROUTE option. For some
reason menuconfig gets things wrong in this case.

Regards
Patrick

Re: latest nf_conntrack version

[Yasuyuki KOZAKAI]

[-- Attachment #1: Type: Text/Plain, Size: 1369 bytes --]


Harald, sory, I was looking different file.

Please forgot changes of masq/NAT in previous patch.
What I have to do in that patch was adding menu.
I attached new patch.

-----------------------------------------------------------------
Yasuyuki Kozakai @ USAGI Project <yasuyuki.kozakai@toshiba.co.jp>

From: Yasuyuki KOZAKAI <kozakai@isl.rdc.toshiba.co.jp>
Date: Thu, 04 Aug 2005 06:14:45 +0900 (JST)

> 
> Hi, Harald,
> 
> From: Harald Welte <laforge@netfilter.org>
> Date: Wed, 3 Aug 2005 16:27:08 +0200
> 
> > I've now also merged your nf_conntrack tree into my netfilter-2.6 tree
> > as local "nf_conntrack" branch.
> > 
> > rsync://people.netfilter.org/users/laforge/scm/netfilter-2.6.14.git#nf_conntrack
> > 
> > should therefore be the full url to that branch.  I've done the nfcache
> > removal and the nf_log_packet() api changes. it compiles and builds fine
> > (no unresolved symbols), but I didn't have time to test it further.
> 
> The configuration menu for netlink and nf_conntrack in your branch are in
> "Packet Generator" menu. And currently masq/NAT sentences should be removed,
> I think.
> 
> I attached the patch for this. But if you have the better idea of
> title/explanations, feel free to change them.
> 
> -----------------------------------------------------------------
> Yasuyuki Kozakai @ USAGI Project <yasuyuki.kozakai@toshiba.co.jp>

[-- Attachment #2: kconfig.patch --]
[-- Type: Text/Plain, Size: 884 bytes --]

diff --git a/net/Kconfig b/net/Kconfig
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -140,6 +140,7 @@ config BRIDGE_NETFILTER
 
 	  If unsure, say N.
 
+source "net/netfilter/Kconfig"
 source "net/ipv4/netfilter/Kconfig"
 source "net/ipv6/netfilter/Kconfig"
 source "net/decnet/netfilter/Kconfig"
@@ -205,8 +206,6 @@ config NET_PKTGEN
 	  To compile this code as a module, choose M here: the
 	  module will be called pktgen.
 
-source "net/netfilter/Kconfig"
-
 endmenu
 
 endmenu
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -1,3 +1,6 @@
+menu "Generic Netfilter Configuration"
+	depends on NET && NETFILTER
+
 config NETFILTER_NETLINK
        tristate "Netfilter netlink interface"
        help
@@ -82,3 +85,4 @@ config NF_CONNTRACK_FTP
 
 	  To compile it as a module, choose M here.  If unsure, say N.
 
+endmenu

Re: latest nf_conntrack version

[Harald Welte]

[-- Attachment #1: Type: text/plain, Size: 904 bytes --]

On Thu, Aug 04, 2005 at 07:37:02AM +0900, Yasuyuki KOZAKAI wrote:
> 
> Harald, sory, I was looking different file.
> 
> Please forgot changes of masq/NAT in previous patch.
> What I have to do in that patch was adding menu.
> I attached new patch.
> 

thanks for correcting this.  I didn't see the problem since I only did
"make oldconfig" and not use any "menuconfig/xconfig" like interface so
far.

I've applied it to my tree right now.

Please include a valud 'Signed-off-by' line in your future patches,
thanks.
-- 
- Harald Welte <laforge@netfilter.org>                 http://netfilter.org/
============================================================================
  "Fragmentation is like classful addressing -- an interesting early
   architectural error that shows how much experimentation was going
   on while IP was being designed."                    -- Paul Vixie

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]