From: Oliver Smith <oliver@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx> Re-rolled due to omission in mtype_del() - ip_set_hash_gen.h of the mtype_del_cidr2() operation that needs to occur when deleting an entry which would of course break the CIDR tracking. Oliver Smith (1): Add hash:net,net ipset for storage of v4/v6 CIDR pairs. kernel/net/netfilter/ipset/Kbuild | 1 + kernel/net/netfilter/ipset/Kconfig | 9 + kernel/net/netfilter/ipset/ip_set_hash_gen.h | 94 +++++ kernel/net/netfilter/ipset/ip_set_hash_netnet.c | 531 ++++++++++++++++++++++++ lib/Makefile.am | 1 + lib/ipset_hash_netnet.c | 158 +++++++ src/ipset.8 | 74 ++++ tests/hash:net,net.t | 155 +++++++ tests/hash:net,net.t.list0 | 10 + tests/hash:net,net.t.list1 | 6 + tests/hash:net,net.t.list2 | 22 + tests/hash:net6,net6.t | 139 +++++++ tests/hash:net6,net6.t.list0 | 10 + tests/hash:net6,net6.t.list1 | 6 + tests/netnetgen.sh | 9 + tests/resizen.sh | 13 + tests/resizet.sh | 8 + tests/runtest.sh | 2 +- 18 files changed, 1247 insertions(+), 1 deletion(-) create mode 100644 kernel/net/netfilter/ipset/ip_set_hash_netnet.c create mode 100644 lib/ipset_hash_netnet.c create mode 100644 tests/hash:net,net.t create mode 100644 tests/hash:net,net.t.list0 create mode 100644 tests/hash:net,net.t.list1 create mode 100644 tests/hash:net,net.t.list2 create mode 100644 tests/hash:net6,net6.t create mode 100644 tests/hash:net6,net6.t.list0 create mode 100644 tests/hash:net6,net6.t.list1 create mode 100755 tests/netnetgen.sh -- 1.8.3.2 -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
