From a96e4fca10506462df4ee4035f0f86f09bd9dc34 Mon Sep 17 00:00:00 2001 From: "/C=EU/ST=EU/CN=Jozsef Kadlecsik/emailAddress=kadlec@blackhole.kfki.hu" Date: Mon, 20 Oct 2008 10:00:26 +0000 Subject: ipset 2.4 release userspace changes: - Added KBUILD_OUTPUT support (Sven Wegener) - Fix memory leak in ipset_iptreemap (Sven Wegener) - Fix multiple compiler warnings (Sven Wegener) - ipportiphash, ipportnethash and setlist types added - binding marked as deprecated functionality - element separator token changed to ',' in anticipating IPv6 addresses, old separator tokens are still supported - unnecessary includes removed - ipset does not try to resolve IP addresses when listing the content of sets (default changed) - manpage updated - ChangeLog forked for kernel part kernel part changes: - ipportiphash, ipportnethash and setlist types added - set type modules reworked to avoid code duplication as much as possible, code unification macros - expand_macros Makefile target added to help debugging code unification macros - ip_set_addip_kernel and ip_set_delip_kernel changed from void to int, __ip_set_get_byname and __ip_set_put_byid added for the sake of setlist type - unnecessary includes removed - compatibility fix for kernels >= 2.6.27: semaphore.h was moved from asm/ to linux/ (James King) - ChangeLog forked for kernel part --- kernel/Makefile.ipset | 3 +++ 1 file changed, 3 insertions(+) (limited to 'kernel/Makefile.ipset') diff --git a/kernel/Makefile.ipset b/kernel/Makefile.ipset index bb3c131..fe42cc1 100644 --- a/kernel/Makefile.ipset +++ b/kernel/Makefile.ipset @@ -6,8 +6,11 @@ obj-$(CONFIG_IP_NF_SET_MACIPMAP) += ip_set_macipmap.o obj-$(CONFIG_IP_NF_SET_IPHASH) += ip_set_iphash.o obj-$(CONFIG_IP_NF_SET_NETHASH) += ip_set_nethash.o obj-$(CONFIG_IP_NF_SET_IPPORTHASH) += ip_set_ipporthash.o +obj-$(CONFIG_IP_NF_SET_IPPORTIPHASH) += ip_set_ipportiphash.o +obj-$(CONFIG_IP_NF_SET_IPPORTNETHASH) += ip_set_ipportnethash.o obj-$(CONFIG_IP_NF_SET_IPTREE) += ip_set_iptree.o obj-$(CONFIG_IP_NF_SET_IPTREEMAP) += ip_set_iptreemap.o +obj-$(CONFIG_IP_NF_SET_SETLIST) += ip_set_setlist.o # match and target obj-$(CONFIG_IP_NF_MATCH_SET) += ipt_set.o -- cgit v1.2.3