[PATCH] to ip_conntrack.h fixes compile problem

Kinzer, Don DKinzer@premia.com
Wed, 24 Oct 2001 11:50:24 -0700


This message is in MIME format. Since your mail reader does not understand
this format, some or all of this message may not be legible.

------_=_NextPart_000_01C15CBC.BD3070C0
Content-Type: text/plain;
	charset="iso-8859-1"

The attached patchfile fixes compilation problems that occur when the IRC
code is not configured in but connection tracking is.  It also contains
minor changes to make the structure of the code more consistent relative to
the various components (FTP, IRC, etc.).  The patch is based on the
ip_conntrack.h in iptables-1.2.4.

P.S. This is the first time that I've posted a patch to this list.  Please
advise if I should have done something different.  Thanks.

 <<ip_conntrack.h.patch>> 


------_=_NextPart_000_01C15CBC.BD3070C0
Content-Type: application/octet-stream;
	name="ip_conntrack.h.patch"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="ip_conntrack.h.patch"

diff -Naur old/ip_conntrack.h new/ip_conntrack.h=0A=
--- old/ip_conntrack.h	Wed Oct 24 08:37:48 2001=0A=
+++ new/ip_conntrack.h	Wed Oct 24 08:47:33 2001=0A=
@@ -81,7 +81,9 @@=0A=
 #include <linux/netfilter_ipv4/ip_nat.h>=0A=
 #endif=0A=
 =0A=
+#if defined(CONFIG_IP_NF_FTP) || defined(CONFIG_IP_NF_FTP_MODULE)=0A=
 #include <linux/netfilter_ipv4/ip_conntrack_ftp.h>=0A=
+#endif=0A=
 =0A=
 #if defined(CONFIG_IP_NF_IRC) || defined(CONFIG_IP_NF_IRC_MODULE)=0A=
 #include <linux/netfilter_ipv4/ip_conntrack_irc.h>=0A=
@@ -124,8 +126,13 @@=0A=
 	} proto;=0A=
 =0A=
 	union {=0A=
+		/* insert connection tracking helper private data here */=0A=
+#if defined(CONFIG_IP_NF_FTP) || defined(CONFIG_IP_NF_FTP_MODULE)=0A=
 		struct ip_ct_ftp ct_ftp_info;=0A=
+#endif=0A=
+#if defined(CONFIG_IP_NF_IRC) || defined(CONFIG_IP_NF_IRC_MODULE)=0A=
 		struct ip_ct_irc ct_irc_info;=0A=
+#endif=0A=
 	} help;=0A=
 =0A=
 #ifdef CONFIG_IP_NF_NAT_NEEDED=0A=

------_=_NextPart_000_01C15CBC.BD3070C0--