2002-09-14 17:48:30

by Jarno Paananen

[permalink] [raw]
Subject: [PATCH 2.4.20-pre7] net/ipv4/netfilter/ip_conntrack_ftp and _irc to export objs

Hi,

the two modules mentioned export symbols but are not mentioned in
export-objs in Makefile and thus give errors. Patch attached.

// Jarno

--- net/ipv4/netfilter/Makefile.bak 2002-09-14 19:50:38.000000000 +0300
+++ net/ipv4/netfilter/Makefile 2002-09-14 19:51:28.000000000 +0300
@@ -9,7 +9,7 @@

O_TARGET := netfilter.o

-export-objs = ip_conntrack_standalone.o ip_fw_compat.o ip_nat_standalone.o ip_tables.o arp_tables.o
+export-objs = ip_conntrack_standalone.o ip_fw_compat.o ip_nat_standalone.o ip_tables.o arp_tables.o ip_conntrack_ftp.o ip_conntrack_irc.o

# Multipart objects.
list-multi := ip_conntrack.o iptable_nat.o ipfwadm.o ipchains.o


2002-09-14 18:07:00

by Martin Josefsson

[permalink] [raw]
Subject: Re: [PATCH 2.4.20-pre7] net/ipv4/netfilter/ip_conntrack_ftp and _irc to export objs

On Sat, 2002-09-14 at 19:53, Jarno Paananen wrote:
> Hi,
>
> the two modules mentioned export symbols but are not mentioned in
> export-objs in Makefile and thus give errors. Patch attached.
>
> // Jarno
>
> --- net/ipv4/netfilter/Makefile.bak 2002-09-14 19:50:38.000000000 +0300
> +++ net/ipv4/netfilter/Makefile 2002-09-14 19:51:28.000000000 +0300
> @@ -9,7 +9,7 @@
>
> O_TARGET := netfilter.o
>
> -export-objs = ip_conntrack_standalone.o ip_fw_compat.o ip_nat_standalone.o ip_tables.o arp_tables.o
> +export-objs = ip_conntrack_standalone.o ip_fw_compat.o ip_nat_standalone.o ip_tables.o arp_tables.o ip_conntrack_ftp.o ip_conntrack_irc.o
>
> # Multipart objects.
> list-multi := ip_conntrack.o iptable_nat.o ipfwadm.o ipchains.o

Did you see this part starting at row 34?

# connection tracking helpers
obj-$(CONFIG_IP_NF_FTP) += ip_conntrack_ftp.o
ifdef CONFIG_IP_NF_NAT_FTP
export-objs += ip_conntrack_ftp.o
endif

obj-$(CONFIG_IP_NF_IRC) += ip_conntrack_irc.o
ifdef CONFIG_IP_NF_NAT_IRC
export-objs += ip_conntrack_irc.o
endif

but maybe the ifdefs shouldn't use the NAT define...
I don't think I've compiled without NAT support...

--
/Martin

Never argue with an idiot. They drag you down to their level, then beat
you with experience.


Attachments:
signature.asc (189.00 B)
This is a digitally signed message part

2002-09-14 18:14:12

by Jarno Paananen

[permalink] [raw]
Subject: Re: [PATCH 2.4.20-pre7] net/ipv4/netfilter/ip_conntrack_ftp and _irc to export objs

Martin Josefsson <[email protected]> writes:

| On Sat, 2002-09-14 at 19:53, Jarno Paananen wrote:
| > Hi,
| >
| > the two modules mentioned export symbols but are not mentioned in
| > export-objs in Makefile and thus give errors. Patch attached.
| >
| > // Jarno
| >
| > --- net/ipv4/netfilter/Makefile.bak 2002-09-14 19:50:38.000000000 +0300
| > +++ net/ipv4/netfilter/Makefile 2002-09-14 19:51:28.000000000 +0300
| > @@ -9,7 +9,7 @@
| >
| > O_TARGET := netfilter.o
| >
| > -export-objs = ip_conntrack_standalone.o ip_fw_compat.o ip_nat_standalone.o ip_tables.o arp_tables.o
| > +export-objs = ip_conntrack_standalone.o ip_fw_compat.o ip_nat_standalone.o ip_tables.o arp_tables.o ip_conntrack_ftp.o ip_conntrack_irc.o
| >
| > # Multipart objects.
| > list-multi := ip_conntrack.o iptable_nat.o ipfwadm.o ipchains.o
|
| Did you see this part starting at row 34?
|
| # connection tracking helpers
| obj-$(CONFIG_IP_NF_FTP) += ip_conntrack_ftp.o
| ifdef CONFIG_IP_NF_NAT_FTP
| export-objs += ip_conntrack_ftp.o
| endif
|
| obj-$(CONFIG_IP_NF_IRC) += ip_conntrack_irc.o
| ifdef CONFIG_IP_NF_NAT_IRC
| export-objs += ip_conntrack_irc.o
| endif
|
| but maybe the ifdefs shouldn't use the NAT define...
| I don't think I've compiled without NAT support...
|
| --
| /Martin
|
| Never argue with an idiot. They drag you down to their level, then beat
| you with experience.

Hm, didn't notice those, sorry.

It seems the condition for the actual export is different than the
Makefile. In ip_conntrack_ftp.c for example the export is done:

#ifdef CONFIG_IP_NF_NAT_NEEDED
EXPORT_SYMBOL(ip_ftp_lock);
#endif

and in Makefile:

ifdef CONFIG_IP_NF_NAT_FTP
export-objs += ip_conntrack_ftp.o
endif

For some reason these didn't match with my .config, relevant part attached.

// Jarno

#
# IP: Netfilter Configuration
#
CONFIG_IP_NF_CONNTRACK=m
CONFIG_IP_NF_FTP=m
CONFIG_IP_NF_IRC=m
# CONFIG_IP_NF_QUEUE is not set
CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_LIMIT=m
CONFIG_IP_NF_MATCH_MAC=m
CONFIG_IP_NF_MATCH_PKTTYPE=m
CONFIG_IP_NF_MATCH_MARK=m
CONFIG_IP_NF_MATCH_MULTIPORT=m
CONFIG_IP_NF_MATCH_TOS=m
CONFIG_IP_NF_MATCH_ECN=m
CONFIG_IP_NF_MATCH_DSCP=m
CONFIG_IP_NF_MATCH_AH_ESP=m
CONFIG_IP_NF_MATCH_LENGTH=m
CONFIG_IP_NF_MATCH_TTL=m
CONFIG_IP_NF_MATCH_TCPMSS=m
# CONFIG_IP_NF_MATCH_HELPER is not set
# CONFIG_IP_NF_MATCH_STATE is not set
# CONFIG_IP_NF_MATCH_CONNTRACK is not set
CONFIG_IP_NF_MATCH_UNCLEAN=m
CONFIG_IP_NF_MATCH_OWNER=m
CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_MIRROR=m
# CONFIG_IP_NF_NAT is not set
CONFIG_IP_NF_MANGLE=m
CONFIG_IP_NF_TARGET_TOS=m
CONFIG_IP_NF_TARGET_ECN=m
CONFIG_IP_NF_TARGET_DSCP=m
CONFIG_IP_NF_TARGET_MARK=m
CONFIG_IP_NF_TARGET_LOG=m
CONFIG_IP_NF_TARGET_ULOG=m
CONFIG_IP_NF_TARGET_TCPMSS=m
CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_COMPAT_IPCHAINS=m
CONFIG_IP_NF_NAT_NEEDED=y
# CONFIG_IP_NF_COMPAT_IPFWADM is not set
CONFIG_IPV6=m

#
# IPv6: Netfilter Configuration
#
# CONFIG_IP6_NF_QUEUE is not set
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MATCH_LIMIT=m
CONFIG_IP6_NF_MATCH_MAC=m
CONFIG_IP6_NF_MATCH_MULTIPORT=m
# CONFIG_IP6_NF_MATCH_OWNER is not set
CONFIG_IP6_NF_MATCH_MARK=m
CONFIG_IP6_NF_MATCH_LENGTH=m
# CONFIG_IP6_NF_MATCH_EUI64 is not set
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_TARGET_LOG=m
CONFIG_IP6_NF_MANGLE=m
CONFIG_IP6_NF_TARGET_MARK=m
# CONFIG_KHTTPD is not set
# CONFIG_ATM is not set
# CONFIG_VLAN_8021Q is not set

2002-09-14 18:32:14

by Martin Josefsson

[permalink] [raw]
Subject: Re: [PATCH 2.4.20-pre7] net/ipv4/netfilter/ip_conntrack_ftp and _irc to export objs

On Sat, 2002-09-14 at 20:19, Jarno Paananen wrote:

> Hm, didn't notice those, sorry.
>
> It seems the condition for the actual export is different than the
> Makefile. In ip_conntrack_ftp.c for example the export is done:
>
> #ifdef CONFIG_IP_NF_NAT_NEEDED
> EXPORT_SYMBOL(ip_ftp_lock);
> #endif
>
> and in Makefile:
>
> ifdef CONFIG_IP_NF_NAT_FTP
> export-objs += ip_conntrack_ftp.o
> endif

I just did a basic test and I didn't manage to get
CONFIG_IP_NF_NAT_NEEDED set without getting CONFIG_IP_NF_NAT and
CONFIG_IP_NF_NAT_FTP and CONFIG_IP_NF_NAT_IRC set aswell.
(with the corresponding CONFIG_IP_NF_FTP and CONFIG_IP_NF_IRC of course)

--
/Martin

Never argue with an idiot. They drag you down to their level, then beat
you with experience.


Attachments:
signature.asc (189.00 B)
This is a digitally signed message part