Re: [ANNOUNCE] ipset 6.2 released

[Michael Tokarev <mjt@tls.msk.ru>]

29.03.2011 23:44, Michael Tokarev пишет:
> 29.03.2011 23:23, Jozsef Kadlecsik wrote:
>> On Tue, 29 Mar 2011, Michael Tokarev wrote:
>>
>>> ipset-6.2/kernel/net/netfilter/ipset/Kconfig file
>>> appears to be some net/netfilter/Kconfig file from
>>> linux source tree (from one directory level up),
>>> patched with NETFILTER_XT_SET.  It gets included
>>> into itself recursively.
>>
>> Yes, you are right, I fixed it in the ipset git tree. Thanks!
> 
> Actually I'm not sure at all this file is needed.
> 
> With current Kbuild file, it builds everything as
> modules, the only CONFIG_FOO in use is IP_SET_MAX
> which can be specfied in the upper-level Kconfig
> (in net/netfilter/Kconfig).

Maybe something like this:

net/netfilter/ipset/Makefile:
ip_set-y := ip_set_core.o ip_set_getport.o pfxlen.o

obj-$(CONFIG_IP_SET) += ip_set.o

obj-$(CONFIG_IP_SET_BITMAP_IP) += ip_set_bitmap_ip.o
obj-$(CONFIG_IP_SET_BITMAP_IPMAC) += ip_set_bitmap_ipmac.o
obj-$(CONFIG_IP_SET_BITMAP_PORT) += ip_set_bitmap_port.o

obj-$(CONFIG_IP_SET_HASH_IP) += ip_set_hash_ip.o
obj-$(CONFIG_IP_SET_HASH_IPPORT) += ip_set_hash_ipport.o
obj-$(CONFIG_IP_SET_HASH_IPPORTIP) += ip_set_hash_ipportip.o

obj-$(CONFIG_IP_SET_HASH_NET) += ip_set_hash_net.o
obj-$(CONFIG_IP_SET_HASH_IPPORTNET) += ip_set_hash_ipportnet.o
obj-$(CONFIG_IP_SET_HASH_NETPORT) += ip_set_hash_netport.o
obj-$(CONFIG_IP_SET_LIST_SET) += ip_set_list_set.o
---- cut ----

net/netfilter/Kbuild.ipset:
obj-$(CONFIG_XT_SET) += xt_set.o
obj-$(CONFIG_IP_SET) += ipset/
--- cut ---

(this should go to net/netfilter/Makefile in the upstream
kernel sources; ditto for the Kconfig bits).


This is all, obviously, about integration into mainline
kernel.

Do you plan to include the whole thing into mainline kernel?

Thanks!

/mjt