* [PATCH 0/1] add hash:ip,mark data type to ipset [not found] <alpine.DEB.2.10.1312032006500.32285 () blackhole ! kfki ! hu> @ 2013-12-17 14:01 ` Vytas Dauksa 2013-12-17 14:01 ` [PATCH 1/1] add markmask for hash:ip,mark data type Vytas Dauksa 2014-01-08 21:13 ` [PATCH 0/1] add hash:ip,mark data type to ipset Jozsef Kadlecsik 0 siblings, 2 replies; 8+ messages in thread From: Vytas Dauksa @ 2013-12-17 14:01 UTC (permalink / raw) To: netfilter-devel; +Cc: kadlec, Vytas Dauksa Introduce packet mark support with new ip,mark hash set. This includes userspace and kernelspace code, hash:ip,mark set tests and man page updates. The intended use of ip,mark set is similar to the ip:port type, but for protocols which don't use a predictable port number. Instead of port number it matches a firewall mark determined by a layer 7 filtering program like opendpi. As well as allowing or blocking traffic it will also be used for accounting packets and bytes sent for each protocol. --- Make_global.am | 2 +- include/libipset/data.h | 2 + include/libipset/linux_ip_set.h | 1 + include/libipset/parse.h | 2 + include/libipset/print.h | 3 + kernel/include/linux/netfilter/ipset/ip_set.h | 10 +- kernel/include/uapi/linux/netfilter/ipset/ip_set.h | 1 + kernel/net/netfilter/ipset/Kbuild | 2 +- kernel/net/netfilter/ipset/Kconfig | 9 + kernel/net/netfilter/ipset/ip_set_hash_ipmark.c | 312 ++++++++++++++++++++ lib/Makefile.am | 1 + lib/data.c | 8 + lib/debug.c | 1 + lib/ipset_hash_ipmark.c | 168 +++++++++++ lib/libipset.map | 6 + lib/parse.c | 30 ++ lib/print.c | 35 +++ lib/session.c | 4 + src/ipset.8 | 49 +++ tests/hash:ip,mark.t | 125 ++++++++ tests/hash:ip,mark.t.list0 | 10 + tests/hash:ip,mark.t.list1 | 6 + tests/hash:ip6,mark.t | 227 ++++++++++++++ tests/hash:ip6,mark.t.list0 | 10 + tests/hash:ip6,mark.t.list1 | 6 + tests/ipmarkhash.t | 71 +++++ tests/ipmarkhash.t.list0 | 10 + tests/ipmarkhash.t.list1 | 10 + tests/resizet.sh | 8 + tests/runtest.sh | 1 + tests/setlist_resize.sh | 2 +- 31 files changed, 1125 insertions(+), 7 deletions(-) create mode 100644 kernel/net/netfilter/ipset/ip_set_hash_ipmark.c create mode 100644 lib/ipset_hash_ipmark.c create mode 100644 tests/hash:ip,mark.t create mode 100644 tests/hash:ip,mark.t.list0 create mode 100644 tests/hash:ip,mark.t.list1 create mode 100644 tests/hash:ip6,mark.t create mode 100644 tests/hash:ip6,mark.t.list0 create mode 100644 tests/hash:ip6,mark.t.list1 create mode 100644 tests/ipmarkhash.t create mode 100644 tests/ipmarkhash.t.list0 create mode 100644 tests/ipmarkhash.t.list1 diff --git a/Make_global.am b/Make_global.am index 33645da..f931618 100644 --- a/Make_global.am +++ b/Make_global.am @@ -69,7 +69,7 @@ # interface. # curr:rev:age -LIBVERSION = 5:0:2 +LIBVERSION = 5:0:3 AM_CPPFLAGS = $(kinclude_CFLAGS) $(all_includes) -I$(top_srcdir)/include \ -I/usr/local/include diff --git a/include/libipset/data.h b/include/libipset/data.h index b6e75e8..618e541 100644 --- a/include/libipset/data.h +++ b/include/libipset/data.h @@ -22,6 +22,7 @@ enum ipset_opt { IPSET_OPT_IP_FROM = IPSET_OPT_IP, IPSET_OPT_IP_TO, IPSET_OPT_CIDR, + IPSET_OPT_MARK, IPSET_OPT_PORT, IPSET_OPT_PORT_FROM = IPSET_OPT_PORT, IPSET_OPT_PORT_TO, @@ -96,6 +97,7 @@ enum ipset_opt { (IPSET_FLAG(IPSET_OPT_IP) \ | IPSET_FLAG(IPSET_OPT_IP_TO) \ | IPSET_FLAG(IPSET_OPT_CIDR) \ + | IPSET_FLAG(IPSET_OPT_MARK) \ | IPSET_FLAG(IPSET_OPT_PORT) \ | IPSET_FLAG(IPSET_OPT_PORT_TO) \ | IPSET_FLAG(IPSET_OPT_TIMEOUT) \ diff --git a/include/libipset/linux_ip_set.h b/include/libipset/linux_ip_set.h index 847bbff..c57f81e 100644 --- a/include/libipset/linux_ip_set.h +++ b/include/libipset/linux_ip_set.h @@ -83,6 +83,7 @@ enum { IPSET_ATTR_PROTO, /* 7 */ IPSET_ATTR_CADT_FLAGS, /* 8 */ IPSET_ATTR_CADT_LINENO = IPSET_ATTR_LINENO, /* 9 */ + IPSET_ATTR_MARK, /* 10 */ /* Reserve empty slots */ IPSET_ATTR_CADT_MAX = 16, /* Create-only specific attributes */ diff --git a/include/libipset/parse.h b/include/libipset/parse.h index 5c46a88..55981f2 100644 --- a/include/libipset/parse.h +++ b/include/libipset/parse.h @@ -29,6 +29,8 @@ extern int ipset_parse_ether(struct ipset_session *session, extern int ipset_parse_port(struct ipset_session *session, enum ipset_opt opt, const char *str, const char *proto); +extern int ipset_parse_mark(struct ipset_session *session, + enum ipset_opt opt, const char *str); extern int ipset_parse_tcpudp_port(struct ipset_session *session, enum ipset_opt opt, const char *str, const char *proto); diff --git a/include/libipset/print.h b/include/libipset/print.h index f2a6095..b8fa709 100644 --- a/include/libipset/print.h +++ b/include/libipset/print.h @@ -37,6 +37,9 @@ extern int ipset_print_name(char *buf, unsigned int len, extern int ipset_print_port(char *buf, unsigned int len, const struct ipset_data *data, enum ipset_opt opt, uint8_t env); +extern int ipset_print_mark(char *buf, unsigned int len, + const struct ipset_data *data, + enum ipset_opt opt, uint8_t env); extern int ipset_print_iface(char *buf, unsigned int len, const struct ipset_data *data, enum ipset_opt opt, uint8_t env); diff --git a/kernel/include/linux/netfilter/ipset/ip_set.h b/kernel/include/linux/netfilter/ipset/ip_set.h index 7cde1cf..0e1cc22 100644 --- a/kernel/include/linux/netfilter/ipset/ip_set.h +++ b/kernel/include/linux/netfilter/ipset/ip_set.h @@ -40,11 +40,13 @@ enum ip_set_feature { IPSET_TYPE_NAME = (1 << IPSET_TYPE_NAME_FLAG), IPSET_TYPE_IFACE_FLAG = 5, IPSET_TYPE_IFACE = (1 << IPSET_TYPE_IFACE_FLAG), - IPSET_TYPE_NOMATCH_FLAG = 6, + IPSET_TYPE_MARK_FLAG = 6, + IPSET_TYPE_MARK = (1 << IPSET_TYPE_MARK_FLAG), + IPSET_TYPE_NOMATCH_FLAG = 7, IPSET_TYPE_NOMATCH = (1 << IPSET_TYPE_NOMATCH_FLAG), /* Strictly speaking not a feature, but a flag for dumping: * this settype must be dumped last */ - IPSET_DUMP_LAST_FLAG = 7, + IPSET_DUMP_LAST_FLAG = 8, IPSET_DUMP_LAST = (1 << IPSET_DUMP_LAST_FLAG), }; @@ -172,8 +174,6 @@ struct ip_set_type { char name[IPSET_MAXNAMELEN]; /* Protocol version */ u8 protocol; - /* Set features to control swapping */ - u8 features; /* Set type dimension */ u8 dimension; /* @@ -183,6 +183,8 @@ struct ip_set_type { u8 family; /* Type revisions */ u8 revision_min, revision_max; + /* Set features to control swapping */ + u16 features; /* Create set */ int (*create)(struct net *net, struct ip_set *set, diff --git a/kernel/include/uapi/linux/netfilter/ipset/ip_set.h b/kernel/include/uapi/linux/netfilter/ipset/ip_set.h index 847bbff..c57f81e 100644 --- a/kernel/include/uapi/linux/netfilter/ipset/ip_set.h +++ b/kernel/include/uapi/linux/netfilter/ipset/ip_set.h @@ -83,6 +83,7 @@ enum { IPSET_ATTR_PROTO, /* 7 */ IPSET_ATTR_CADT_FLAGS, /* 8 */ IPSET_ATTR_CADT_LINENO = IPSET_ATTR_LINENO, /* 9 */ + IPSET_ATTR_MARK, /* 10 */ /* Reserve empty slots */ IPSET_ATTR_CADT_MAX = 16, /* Create-only specific attributes */ diff --git a/kernel/net/netfilter/ipset/Kbuild b/kernel/net/netfilter/ipset/Kbuild index 5564cb5..6495523 100644 --- a/kernel/net/netfilter/ipset/Kbuild +++ b/kernel/net/netfilter/ipset/Kbuild @@ -5,7 +5,7 @@ ip_set-y := ip_set_core.o ip_set_getport.o pfxlen.o obj-m += ip_set.o obj-m += ip_set_bitmap_ip.o ip_set_bitmap_ipmac.o ip_set_bitmap_port.o obj-m += ip_set_hash_ip.o ip_set_hash_ipport.o ip_set_hash_ipportip.o -obj-m += ip_set_hash_ipportnet.o +obj-m += ip_set_hash_ipportnet.o ip_set_hash_ipmark.o obj-m += ip_set_hash_net.o ip_set_hash_netport.o ip_set_hash_netiface.o obj-m += ip_set_hash_netnet.o ip_set_hash_netportnet.o obj-m += ip_set_list_set.o diff --git a/kernel/net/netfilter/ipset/Kconfig b/kernel/net/netfilter/ipset/Kconfig index a2d6263..638faa7 100644 --- a/kernel/net/netfilter/ipset/Kconfig +++ b/kernel/net/netfilter/ipset/Kconfig @@ -61,6 +61,15 @@ config IP_SET_HASH_IP To compile it as a module, choose M here. If unsure, say N. +config IP_SET_HASH_IPMARK + tristate "hash:ip,mark set support" + depends on IP_SET + help + This option adds the hash:ip,mark set type support, by which one + can store IPv4/IPv6 address and mark pairs. + + To compile it as a module, choose M here. If unsure, say N. + config IP_SET_HASH_IPPORT tristate "hash:ip,port set support" depends on IP_SET diff --git a/kernel/net/netfilter/ipset/ip_set_hash_ipmark.c b/kernel/net/netfilter/ipset/ip_set_hash_ipmark.c new file mode 100644 index 0000000..fb60d50 --- /dev/null +++ b/kernel/net/netfilter/ipset/ip_set_hash_ipmark.c @@ -0,0 +1,312 @@ +/* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> + * Copyright (C) 2013 Smoothwall Ltd. <vytas.dauksa@smoothwall.net> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +/* Kernel module implementing an IP set type: the hash:ip,mark type */ + +#include <linux/jhash.h> +#include <linux/module.h> +#include <linux/ip.h> +#include <linux/skbuff.h> +#include <linux/errno.h> +#include <linux/random.h> +#include <net/ip.h> +#include <net/ipv6.h> +#include <net/netlink.h> +#include <net/tcp.h> + +#include <linux/netfilter.h> +#include <linux/netfilter/ipset/pfxlen.h> +#include <linux/netfilter/ipset/ip_set.h> +#include <linux/netfilter/ipset/ip_set_hash.h> + +#define IPSET_TYPE_REV_MIN 0 +#define IPSET_TYPE_REV_MAX 0 + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Vytas Dauksa <vytas.dauksa@smoothwall.net>"); +IP_SET_MODULE_DESC("hash:ip,mark", IPSET_TYPE_REV_MIN, IPSET_TYPE_REV_MAX); +MODULE_ALIAS("ip_set_hash:ip,mark"); + +/* Type specific function prefix */ +#define HTYPE hash_ipmark + +/* IPv4 variant */ + +/* Member elements */ +struct hash_ipmark4_elem { + __be32 ip; + __u32 mark; +}; + +/* Common functions */ + +static inline bool +hash_ipmark4_data_equal(const struct hash_ipmark4_elem *ip1, + const struct hash_ipmark4_elem *ip2, + u32 *multi) +{ + return ip1->ip == ip2->ip && + ip1->mark == ip2->mark; +} + +static bool +hash_ipmark4_data_list(struct sk_buff *skb, + const struct hash_ipmark4_elem *data) +{ + if (nla_put_ipaddr4(skb, IPSET_ATTR_IP, data->ip) || + nla_put_net32(skb, IPSET_ATTR_MARK, htonl(data->mark))) + goto nla_put_failure; + return 0; + +nla_put_failure: + return 1; +} + +static inline void +hash_ipmark4_data_next(struct hash_ipmark4_elem *next, + const struct hash_ipmark4_elem *d) +{ + next->ip = d->ip; +} + +#define MTYPE hash_ipmark4 +#define PF 4 +#define HOST_MASK 32 +#define HKEY_DATALEN sizeof(struct hash_ipmark4_elem) +#include "ip_set_hash_gen.h" + +static int +hash_ipmark4_kadt(struct ip_set *set, const struct sk_buff *skb, + const struct xt_action_param *par, + enum ipset_adt adt, struct ip_set_adt_opt *opt) +{ + ipset_adtfn adtfn = set->variant->adt[adt]; + struct hash_ipmark4_elem e = { }; + struct ip_set_ext ext = IP_SET_INIT_KEXT(skb, opt, set); + + e.mark = skb->mark; + + ip4addrptr(skb, opt->flags & IPSET_DIM_ONE_SRC, &e.ip); + return adtfn(set, &e, &ext, &opt->ext, opt->cmdflags); +} + +static int +hash_ipmark4_uadt(struct ip_set *set, struct nlattr *tb[], + enum ipset_adt adt, u32 *lineno, u32 flags, bool retried) +{ + const struct hash_ipmark *h = set->data; + ipset_adtfn adtfn = set->variant->adt[adt]; + struct hash_ipmark4_elem e = { }; + struct ip_set_ext ext = IP_SET_INIT_UEXT(set); + u32 ip, ip_to = 0; + int ret; + + if (unlikely(!tb[IPSET_ATTR_IP] || + !ip_set_attr_netorder(tb, IPSET_ATTR_MARK) || + !ip_set_optattr_netorder(tb, IPSET_ATTR_TIMEOUT) || + !ip_set_optattr_netorder(tb, IPSET_ATTR_PACKETS) || + !ip_set_optattr_netorder(tb, IPSET_ATTR_BYTES))) + return -IPSET_ERR_PROTOCOL; + + if (tb[IPSET_ATTR_LINENO]) + *lineno = nla_get_u32(tb[IPSET_ATTR_LINENO]); + + ret = ip_set_get_ipaddr4(tb[IPSET_ATTR_IP], &e.ip) || + ip_set_get_extensions(set, tb, &ext); + if (ret) + return ret; + + e.mark = ntohl(nla_get_u32(tb[IPSET_ATTR_MARK])); + + if (adt == IPSET_TEST || + !(tb[IPSET_ATTR_IP_TO] || tb[IPSET_ATTR_CIDR])) { + ret = adtfn(set, &e, &ext, &ext, flags); + return ip_set_eexist(ret, flags) ? 0 : ret; + } + + ip_to = ip = ntohl(e.ip); + if (tb[IPSET_ATTR_IP_TO]) { + ret = ip_set_get_hostipaddr4(tb[IPSET_ATTR_IP_TO], &ip_to); + if (ret) + return ret; + if (ip > ip_to) + swap(ip, ip_to); + } else if (tb[IPSET_ATTR_CIDR]) { + u8 cidr = nla_get_u8(tb[IPSET_ATTR_CIDR]); + + if (!cidr || cidr > 32) + return -IPSET_ERR_INVALID_CIDR; + ip_set_mask_from_to(ip, ip_to, cidr); + } + + if (retried) + ip = ntohl(h->next.ip); + for (; !before(ip_to, ip); ip++) { + e.ip = htonl(ip); + ret = adtfn(set, &e, &ext, &ext, flags); + + if (ret && !ip_set_eexist(ret, flags)) + return ret; + else + ret = 0; + } + return ret; +} + +/* IPv6 variant */ + +struct hash_ipmark6_elem { + union nf_inet_addr ip; + __u32 mark; +}; + +/* Common functions */ + +static inline bool +hash_ipmark6_data_equal(const struct hash_ipmark6_elem *ip1, + const struct hash_ipmark6_elem *ip2, + u32 *multi) +{ + return ipv6_addr_equal(&ip1->ip.in6, &ip2->ip.in6) && + ip1->mark == ip2->mark; +} + +static bool +hash_ipmark6_data_list(struct sk_buff *skb, + const struct hash_ipmark6_elem *data) +{ + if (nla_put_ipaddr6(skb, IPSET_ATTR_IP, &data->ip.in6) || + nla_put_net32(skb, IPSET_ATTR_MARK, htonl(data->mark))) + goto nla_put_failure; + return 0; + +nla_put_failure: + return 1; +} + +static inline void +hash_ipmark6_data_next(struct hash_ipmark4_elem *next, + const struct hash_ipmark6_elem *d) +{ +} + +#undef MTYPE +#undef PF +#undef HOST_MASK +#undef HKEY_DATALEN + +#define MTYPE hash_ipmark6 +#define PF 6 +#define HOST_MASK 128 +#define HKEY_DATALEN sizeof(struct hash_ipmark6_elem) +#define IP_SET_EMIT_CREATE +#include "ip_set_hash_gen.h" + + +static int +hash_ipmark6_kadt(struct ip_set *set, const struct sk_buff *skb, + const struct xt_action_param *par, + enum ipset_adt adt, struct ip_set_adt_opt *opt) +{ + ipset_adtfn adtfn = set->variant->adt[adt]; + struct hash_ipmark6_elem e = { }; + struct ip_set_ext ext = IP_SET_INIT_KEXT(skb, opt, set); + + e.mark = skb->mark; + + ip6addrptr(skb, opt->flags & IPSET_DIM_ONE_SRC, &e.ip.in6); + return adtfn(set, &e, &ext, &opt->ext, opt->cmdflags); +} + +static int +hash_ipmark6_uadt(struct ip_set *set, struct nlattr *tb[], + enum ipset_adt adt, u32 *lineno, u32 flags, bool retried) +{ + ipset_adtfn adtfn = set->variant->adt[adt]; + struct hash_ipmark6_elem e = { }; + struct ip_set_ext ext = IP_SET_INIT_UEXT(set); + int ret; + + if (unlikely(!tb[IPSET_ATTR_IP] || + !ip_set_attr_netorder(tb, IPSET_ATTR_MARK) || + !ip_set_optattr_netorder(tb, IPSET_ATTR_TIMEOUT) || + !ip_set_optattr_netorder(tb, IPSET_ATTR_PACKETS) || + !ip_set_optattr_netorder(tb, IPSET_ATTR_BYTES) || + tb[IPSET_ATTR_IP_TO] || + tb[IPSET_ATTR_CIDR])) + return -IPSET_ERR_PROTOCOL; + + if (tb[IPSET_ATTR_LINENO]) + *lineno = nla_get_u32(tb[IPSET_ATTR_LINENO]); + + ret = ip_set_get_ipaddr6(tb[IPSET_ATTR_IP], &e.ip) || + ip_set_get_extensions(set, tb, &ext); + if (ret) + return ret; + + e.mark = ntohl(nla_get_u32(tb[IPSET_ATTR_MARK])); + + if (adt == IPSET_TEST) { + ret = adtfn(set, &e, &ext, &ext, flags); + return ip_set_eexist(ret, flags) ? 0 : ret; + } + + ret = adtfn(set, &e, &ext, &ext, flags); + if (ret && !ip_set_eexist(ret, flags)) + return ret; + else + ret = 0; + + return ret; +} + +static struct ip_set_type hash_ipmark_type __read_mostly = { + .name = "hash:ip,mark", + .protocol = IPSET_PROTOCOL, + .features = IPSET_TYPE_IP | IPSET_TYPE_MARK, + .dimension = IPSET_DIM_TWO, + .family = NFPROTO_UNSPEC, + .revision_min = IPSET_TYPE_REV_MIN, + .revision_max = IPSET_TYPE_REV_MAX, + .create = hash_ipmark_create, + .create_policy = { + [IPSET_ATTR_HASHSIZE] = { .type = NLA_U32 }, + [IPSET_ATTR_MAXELEM] = { .type = NLA_U32 }, + [IPSET_ATTR_PROBES] = { .type = NLA_U8 }, + [IPSET_ATTR_RESIZE] = { .type = NLA_U8 }, + [IPSET_ATTR_TIMEOUT] = { .type = NLA_U32 }, + [IPSET_ATTR_CADT_FLAGS] = { .type = NLA_U32 }, + }, + .adt_policy = { + [IPSET_ATTR_IP] = { .type = NLA_NESTED }, + [IPSET_ATTR_IP_TO] = { .type = NLA_NESTED }, + [IPSET_ATTR_MARK] = { .type = NLA_U32 }, + [IPSET_ATTR_CIDR] = { .type = NLA_U8 }, + [IPSET_ATTR_TIMEOUT] = { .type = NLA_U32 }, + [IPSET_ATTR_LINENO] = { .type = NLA_U32 }, + [IPSET_ATTR_BYTES] = { .type = NLA_U64 }, + [IPSET_ATTR_PACKETS] = { .type = NLA_U64 }, + [IPSET_ATTR_COMMENT] = { .type = NLA_NUL_STRING }, + }, + .me = THIS_MODULE, +}; + +static int __init +hash_ipmark_init(void) +{ + return ip_set_type_register(&hash_ipmark_type); +} + +static void __exit +hash_ipmark_fini(void) +{ + ip_set_type_unregister(&hash_ipmark_type); +} + +module_init(hash_ipmark_init); +module_exit(hash_ipmark_fini); diff --git a/lib/Makefile.am b/lib/Makefile.am index 2234670..6398be4 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -6,6 +6,7 @@ IPSET_SETTYPE_LIST = \ ipset_bitmap_port.c \ ipset_hash_ip.c \ ipset_hash_ipport.c \ + ipset_hash_ipmark.c \ ipset_hash_ipportip.c \ ipset_hash_ipportnet.c \ ipset_hash_net.c \ diff --git a/lib/data.c b/lib/data.c index ba4ed57..1f74cd5 100644 --- a/lib/data.c +++ b/lib/data.c @@ -41,6 +41,7 @@ struct ipset_data { uint32_t timeout; union nf_inet_addr ip; union nf_inet_addr ip_to; + uint32_t mark; uint16_t port; uint16_t port_to; union { @@ -264,6 +265,9 @@ ipset_data_set(struct ipset_data *data, enum ipset_opt opt, const void *value) case IPSET_OPT_CIDR: data->cidr = *(const uint8_t *) value; break; + case IPSET_OPT_MARK: + data->mark = *(const uint32_t *) value; + break; case IPSET_OPT_PORT: data->port = *(const uint16_t *) value; break; @@ -448,6 +452,8 @@ ipset_data_get(const struct ipset_data *data, enum ipset_opt opt) return &data->ip_to; case IPSET_OPT_CIDR: return &data->cidr; + case IPSET_OPT_MARK: + return &data->mark; case IPSET_OPT_PORT: return &data->port; case IPSET_OPT_PORT_TO: @@ -542,6 +548,8 @@ ipset_data_sizeof(enum ipset_opt opt, uint8_t family) case IPSET_OPT_IP2_TO: return family == NFPROTO_IPV4 ? sizeof(uint32_t) : sizeof(struct in6_addr); + case IPSET_OPT_MARK: + return sizeof(uint32_t); case IPSET_OPT_PORT: case IPSET_OPT_PORT_TO: return sizeof(uint16_t); diff --git a/lib/debug.c b/lib/debug.c index a204940..9a3c6b8 100644 --- a/lib/debug.c +++ b/lib/debug.c @@ -51,6 +51,7 @@ static const struct ipset_attrname adtattr2name[] = { [IPSET_ATTR_IP] = { .name = "IP" }, [IPSET_ATTR_IP_TO] = { .name = "IP_TO" }, [IPSET_ATTR_CIDR] = { .name = "CIDR" }, + [IPSET_ATTR_MARK] = { .name = "MARK" }, [IPSET_ATTR_PORT] = { .name = "PORT" }, [IPSET_ATTR_PORT_TO] = { .name = "PORT_TO" }, [IPSET_ATTR_TIMEOUT] = { .name = "TIMEOUT" }, diff --git a/lib/ipset_hash_ipmark.c b/lib/ipset_hash_ipmark.c new file mode 100644 index 0000000..6976371 --- /dev/null +++ b/lib/ipset_hash_ipmark.c @@ -0,0 +1,168 @@ +/* Copyright 2007-2013 Jozsef Kadlecsik (kadlec@blackhole.kfki.hu) + * Copyright 2013 Smoothwall Ltd. (vytas.dauksa@smoothwall.net) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +#include <libipset/data.h> /* IPSET_OPT_* */ +#include <libipset/parse.h> /* parser functions */ +#include <libipset/print.h> /* printing functions */ +#include <libipset/types.h> /* prototypes */ + +/* Parse commandline arguments */ +static const struct ipset_arg hash_ipmark_create_args0[] = { + { .name = { "family", NULL }, + .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_FAMILY, + .parse = ipset_parse_family, .print = ipset_print_family, + }, + /* Alias: family inet */ + { .name = { "-4", NULL }, + .has_arg = IPSET_NO_ARG, .opt = IPSET_OPT_FAMILY, + .parse = ipset_parse_family, + }, + /* Alias: family inet6 */ + { .name = { "-6", NULL }, + .has_arg = IPSET_NO_ARG, .opt = IPSET_OPT_FAMILY, + .parse = ipset_parse_family, + }, + { .name = { "hashsize", NULL }, + .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_HASHSIZE, + .parse = ipset_parse_uint32, .print = ipset_print_number, + }, + { .name = { "maxelem", NULL }, + .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_MAXELEM, + .parse = ipset_parse_uint32, .print = ipset_print_number, + }, + { .name = { "timeout", NULL }, + .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_TIMEOUT, + .parse = ipset_parse_timeout, .print = ipset_print_number, + }, + { .name = { "counters", NULL }, + .has_arg = IPSET_NO_ARG, .opt = IPSET_OPT_COUNTERS, + .parse = ipset_parse_flag, .print = ipset_print_flag, + }, + { .name = { "comment", NULL }, + .has_arg = IPSET_NO_ARG, .opt = IPSET_OPT_CREATE_COMMENT, + .parse = ipset_parse_flag, .print = ipset_print_flag, + }, + /* Backward compatibility */ + { .name = { "probes", NULL }, + .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_PROBES, + .parse = ipset_parse_ignored, .print = ipset_print_number, + }, + { .name = { "resize", NULL }, + .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_RESIZE, + .parse = ipset_parse_ignored, .print = ipset_print_number, + }, + { .name = { "from", NULL }, + .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_IP, + .parse = ipset_parse_ignored, + }, + { .name = { "to", NULL }, + .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_IP_TO, + .parse = ipset_parse_ignored, + }, + { .name = { "network", NULL }, + .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_IP, + .parse = ipset_parse_ignored, + }, + { }, +}; + +static const struct ipset_arg hash_ipmark_add_args0[] = { + { .name = { "timeout", NULL }, + .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_TIMEOUT, + .parse = ipset_parse_timeout, .print = ipset_print_number, + }, + { .name = { "packets", NULL }, + .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_PACKETS, + .parse = ipset_parse_uint64, .print = ipset_print_number, + }, + { .name = { "bytes", NULL }, + .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_BYTES, + .parse = ipset_parse_uint64, .print = ipset_print_number, + }, + { .name = { "comment", NULL }, + .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_ADT_COMMENT, + .parse = ipset_parse_comment, .print = ipset_print_comment, + }, + { }, +}; + +static const char hash_ipmark_usage0[] = +"create SETNAME hash:ip,mark\n" +" [family inet|inet6]\n" +" [hashsize VALUE] [maxelem VALUE]\n" +" [timeout VALUE] [counters] [comment]\n" +"add SETNAME IP,MARK [timeout VALUE]\n" +" [packets VALUE] [bytes VALUE] [comment \"string\"]\n" +"del SETNAME IP,MARK\n" +"test SETNAME IP,MARK\n\n" +"where depending on the INET family\n" +" IP is a valid IPv4 or IPv6 address (or hostname).\n" +" Adding/deleting multiple elements in IP/CIDR or FROM-TO form\n" +" is supported for IPv4.\n" +" Adding/deleting single mark element\n" +" is supported both for IPv4 and IPv6.\n"; + +static struct ipset_type ipset_hash_ipmark0 = { + .name = "hash:ip,mark", + .alias = { "ipmarkhash", NULL }, + .revision = 0, + .family = NFPROTO_IPSET_IPV46, + .dimension = IPSET_DIM_TWO, + .elem = { + [IPSET_DIM_ONE - 1] = { + .parse = ipset_parse_ip4_single6, + .print = ipset_print_ip, + .opt = IPSET_OPT_IP + }, + [IPSET_DIM_TWO - 1] = { + .parse = ipset_parse_mark, + .print = ipset_print_mark, + .opt = IPSET_OPT_MARK + }, + }, + .args = { + [IPSET_CREATE] = hash_ipmark_create_args0, + [IPSET_ADD] = hash_ipmark_add_args0, + }, + .mandatory = { + [IPSET_CREATE] = 0, + [IPSET_ADD] = IPSET_FLAG(IPSET_OPT_IP) + | IPSET_FLAG(IPSET_OPT_MARK), + [IPSET_DEL] = IPSET_FLAG(IPSET_OPT_IP) + | IPSET_FLAG(IPSET_OPT_MARK), + [IPSET_TEST] = IPSET_FLAG(IPSET_OPT_IP) + | IPSET_FLAG(IPSET_OPT_MARK), + }, + .full = { + [IPSET_CREATE] = IPSET_FLAG(IPSET_OPT_HASHSIZE) + | IPSET_FLAG(IPSET_OPT_MAXELEM) + | IPSET_FLAG(IPSET_OPT_TIMEOUT) + | IPSET_FLAG(IPSET_OPT_COUNTERS) + | IPSET_FLAG(IPSET_OPT_CREATE_COMMENT), + [IPSET_ADD] = IPSET_FLAG(IPSET_OPT_IP) + | IPSET_FLAG(IPSET_OPT_IP_TO) + | IPSET_FLAG(IPSET_OPT_MARK) + | IPSET_FLAG(IPSET_OPT_TIMEOUT) + | IPSET_FLAG(IPSET_OPT_PACKETS) + | IPSET_FLAG(IPSET_OPT_BYTES) + | IPSET_FLAG(IPSET_OPT_ADT_COMMENT), + [IPSET_DEL] = IPSET_FLAG(IPSET_OPT_IP) + | IPSET_FLAG(IPSET_OPT_IP_TO) + | IPSET_FLAG(IPSET_OPT_MARK), + [IPSET_TEST] = IPSET_FLAG(IPSET_OPT_IP) + | IPSET_FLAG(IPSET_OPT_MARK), + }, + + .usage = hash_ipmark_usage0, + .description = "initial revision", +}; + +void _init(void); +void _init(void) +{ + ipset_type_add(&ipset_hash_ipmark0); +} diff --git a/lib/libipset.map b/lib/libipset.map index 1080f0d..a035115 100644 --- a/lib/libipset.map +++ b/lib/libipset.map @@ -138,3 +138,9 @@ global: ipset_print_comment; ipset_strlcat; } LIBIPSET_4.0; + +LIBIPSET_4.2 { +global: + ipset_parse_mark; + ipset_print_mark; +} LIBIPSET_4.1; diff --git a/lib/parse.c b/lib/parse.c index 8ea8542..97ff435 100644 --- a/lib/parse.c +++ b/lib/parse.c @@ -328,6 +328,36 @@ ipset_parse_port(struct ipset_session *session, } /** + * ipset_parse_mark - parse a mark + * @session: session structure + * @opt: option kind of the data + * @str: string to parse + * + * Parse string as a mark. The parsed mark number is + * stored in the data blob of the session. + * + * Returns 0 on success or a negative error code. + */ +int +ipset_parse_mark(struct ipset_session *session, + enum ipset_opt opt, const char *str) +{ + uint32_t mark; + int err; + + assert(session); + assert(str); + + if ((err = string_to_u32(session, str, &mark)) == 0) + err = ipset_session_data_set(session, opt, &mark); + + if (!err) + /* No error, so reset false error messages! */ + ipset_session_report_reset(session); + return err; +} + +/** * ipset_parse_tcpudp_port - parse TCP/UDP port name, number, or range of them * @session: session structure * @opt: option kind of the data diff --git a/lib/print.c b/lib/print.c index abdfd34..6634802 100644 --- a/lib/print.c +++ b/lib/print.c @@ -491,6 +491,41 @@ ipset_print_port(char *buf, unsigned int len, } /** + * ipset_print_mark - print mark to string + * @buf: printing buffer + * @len: length of available buffer space + * @data: data blob + * @opt: the option kind + * @env: environment flags + * + * Print mark to output buffer. + * + * Return lenght of printed string or error size. + */ +int +ipset_print_mark(char *buf, unsigned int len, + const struct ipset_data *data, + enum ipset_opt opt ASSERT_UNUSED, + uint8_t env UNUSED) +{ + const uint32_t *mark; + int size, offset = 0; + + assert(buf); + assert(len > 0); + assert(data); + assert(opt == IPSET_OPT_MARK); + + mark = ipset_data_get(data, IPSET_OPT_MARK); + assert(mark); + + size = snprintf(buf, len, "%u", *mark); + SNPRINTF_FAILURE(size, len, offset); + + return offset; +} + +/** * ipset_print_iface - print interface element string * @buf: printing buffer * @len: length of available buffer space diff --git a/lib/session.c b/lib/session.c index 6f89281..cf65960 100644 --- a/lib/session.c +++ b/lib/session.c @@ -424,6 +424,10 @@ static const struct ipset_attr_policy adt_attrs[] = { .type = MNL_TYPE_U8, .opt = IPSET_OPT_CIDR, }, + [IPSET_ATTR_MARK] = { + .type = MNL_TYPE_U32, + .opt = IPSET_OPT_MARK, + }, [IPSET_ATTR_PORT] = { .type = MNL_TYPE_U16, .opt = IPSET_OPT_PORT, diff --git a/src/ipset.8 b/src/ipset.8 index 8a21eaf..b401863 100644 --- a/src/ipset.8 +++ b/src/ipset.8 @@ -878,6 +878,55 @@ ipset add foo 192.168.1,80,10.0.0/24 ipset add foo 192.168.2,25,10.1.0.0/16 .IP ipset test foo 192.168.1,80.10.0.0/24 +.SS hash:ip,mark +The \fBhash:ip,mark\fR set type uses a hash to store IP address and packet mark pairs. +.PP +\fICREATE\-OPTIONS\fR := [ \fBfamily\fR { \fBinet\fR | \fBinet6\fR } ] | [ \fBhashsize\fR \fIvalue\fR ] [ \fBmaxelem\fR \fIvalue\fR ] [ \fBtimeout\fR \fIvalue\fR ] [ \fBcounters\fP ] [ \fBcomment\fP ] +.PP +\fIADD\-ENTRY\fR := \fIipaddr\fR,\fImark\fR +.PP +\fIADD\-OPTIONS\fR := [ \fBtimeout\fR \fIvalue\fR ] [ \fBpackets\fR \fIvalue\fR ] [ \fBbytes\fR \fIvalue\fR ] [ \fBcomment\fR \fIstring\fR ] +.PP +\fIDEL\-ENTRY\fR := \fIipaddr\fR,\fImark\fR +.PP +\fITEST\-ENTRY\fR := \fIipaddr\fR,\fImark\fR +.PP +Optional \fBcreate\fR options: +.TP +\fBfamily\fR { \fBinet\fR | \fBinet6\fR } +The protocol family of the IP addresses to be stored in the set. The default is +\fBinet\fR, i.e IPv4. +.TP +\fBhashsize\fR \fIvalue\fR +The initial hash size for the set, default is 1024. The hash size must be a power +of two, the kernel automatically rounds up non power of two hash sizes to the first +correct value +.TP +\fBmaxelem\fR \fIvalue\fR +The maximal number of elements which can be stored in the set, default 65536. +.PP +For the \fBinet\fR family one can add or delete multiple entries by specifying +a range or a network of IPv4 addresses in the IP address part of the entry: +.PP +\fIipaddr\fR := { \fIip\fR | \fIfromaddr\fR\-\fItoaddr\fR | \fIip\fR/\fIcidr\fR } +.PP +The +\fImark\fR +can be any value between 0 and 4294967295. +.PP +The \fBhash:ip,mark\fR type of sets require +two \fBsrc\fR/\fBdst\fR parameters of the \fBset\fR match and \fBSET\fR +target kernel modules. +.PP +Examples: +.IP +ipset create foo hash:ip,mark +.IP +ipset add foo 192.168.1.0/24,555 +.IP +ipset add foo 192.168.1.1,0x63 +.IP +ipset add foo 192.168.1.1,111236 .SS hash:net,port,net The \fBhash:net,port,net\fR set type behaves similarly to hash:ip,port,net but accepts a cidr value for both the first and last parameter. Either subnet is permitted to be a /0 diff --git a/tests/hash:ip,mark.t b/tests/hash:ip,mark.t new file mode 100644 index 0000000..bd5c237 --- /dev/null +++ b/tests/hash:ip,mark.t @@ -0,0 +1,125 @@ +# Create a set with timeout +0 ipset create test hash:ip,mark timeout 5 +# Add partly zero valued element +0 ipset add test 2.0.0.1,0 +# Test partly zero valued element +0 ipset test test 2.0.0.1,0 +# Delete partly zero valued element +0 ipset del test 2.0.0.1,0 +# Add first random value +0 ipset add test 2.0.0.1,5 +# Add second random value +0 ipset add test 2.1.0.0,128 +# Test first random value +0 ipset test test 2.0.0.1,5 +# Test second random value +0 ipset test test 2.1.0.0,128 +# Test value not added to the set +1 ipset test test 2.0.0.1,4 +# Delete value not added to the set +1 ipset del test 2.0.0.1,6 +# Test value before first random value +1 ipset test test 2.0.0.0,5 +# Test value after second random value +1 ipset test test 2.1.0.1,128 +# Try to add value before first random value +0 ipset add test 2.0.0.0,5 +# Try to add value after second random value +0 ipset add test 2.1.0.1,128 +# List set +0 ipset list test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 +# Check listing +0 diff -u -I 'Size in memory.*' .foo hash:ip,mark.t.list0 +# Sleep 5s so that elements can time out +0 sleep 5 +# List set +0 ipset list test | grep -v Revision: > .foo0 && ./sort.sh .foo0 +# Check listing +0 diff -u -I 'Size in memory.*' .foo hash:ip,mark.t.list1 +# Flush test set +0 ipset flush test +# Add multiple elements in one step +0 ipset add test 1.1.1.1-1.1.1.18,80 +# Delete multiple elements in one step +0 ipset del test 1.1.1.2-1.1.1.3,80 +# Check number of elements after multi-add/multi-del +0 n=`ipset save test|wc -l` && test $n -eq 17 +# Delete test set +0 ipset destroy test +# Create set to add a range +0 ipset new test hash:ip,mark hashsize 64 +# Add a range which forces a resizing +0 ipset add test 10.0.0.0-10.0.3.255,80 +# Check that correct number of elements are added +0 n=`ipset list test|grep '^10.0'|wc -l` && test $n -eq 1024 +# Flush set +0 ipset flush test +# Add an single element +0 ipset add test 10.0.0.1,80 +# Check number of elements +0 n=`ipset save test|wc -l` && test $n -eq 2 +# Delete the single element +0 ipset del test 10.0.0.1,80 +# Check number of elements +0 n=`ipset save test|wc -l` && test $n -eq 1 +# Add an IP range +0 ipset add test 10.0.0.1-10.0.0.10,80 +# Check number of elements +0 n=`ipset save test|wc -l` && test $n -eq 11 +# Delete the IP range +0 ipset del test 10.0.0.1-10.0.0.10,80 +# Check number of elements +0 n=`ipset save test|wc -l` && test $n -eq 1 +# Destroy set +0 ipset -X test +# Timeout: Check that resizing keeps timeout values +0 ./resizet.sh -4 ipmark +# Counters: create set +0 ipset n test hash:ip,mark counters +# Counters: add element with packet, byte counters +0 ipset a test 2.0.0.1,80 packets 5 bytes 3456 +# Counters: check element +0 ipset t test 2.0.0.1,80 +# Counters: check counters +0 ./check_counters test 2.0.0.1 5 3456 +# Counters: delete element +0 ipset d test 2.0.0.1,80 +# Counters: test deleted element +1 ipset t test 2.0.0.1,80 +# Counters: add element with packet, byte counters +0 ipset a test 2.0.0.20,453 packets 12 bytes 9876 +# Counters: check counters +0 ./check_counters test 2.0.0.20 12 9876 +# Counters: update counters +0 ipset -! a test 2.0.0.20,453 packets 13 bytes 12479 +# Counters: check counters +0 ./check_counters test 2.0.0.20 13 12479 +# Counters: destroy set +0 ipset x test +# Counters and timeout: create set +0 ipset n test hash:ip,mark counters timeout 600 +# Counters and timeout: add element with packet, byte counters +0 ipset a test 2.0.0.1,80 packets 5 bytes 3456 +# Counters and timeout: check element +0 ipset t test 2.0.0.1,80 +# Counters and timeout: check counters +0 ./check_extensions test 2.0.0.1 600 5 3456 +# Counters and timeout: delete element +0 ipset d test 2.0.0.1,80 +# Counters and timeout: test deleted element +1 ipset t test 2.0.0.1,80 +# Counters and timeout: add element with packet, byte counters +0 ipset a test 2.0.0.20,453 packets 12 bytes 9876 +# Counters and timeout: check counters +0 ./check_extensions test 2.0.0.20 600 12 9876 +# Counters and timeout: update counters +0 ipset -! a test 2.0.0.20,453 packets 13 bytes 12479 +# Counters and timeout: check counters +0 ./check_extensions test 2.0.0.20 600 13 12479 +# Counters and timeout: update timeout +0 ipset -! a test 2.0.0.20,453 timeout 700 +# Counters and timeout: check counters +0 ./check_extensions test 2.0.0.20 700 13 12479 +# Counters and timeout: destroy set +0 ipset x test +# eof diff --git a/tests/hash:ip,mark.t.list0 b/tests/hash:ip,mark.t.list0 new file mode 100644 index 0000000..378dabe --- /dev/null +++ b/tests/hash:ip,mark.t.list0 @@ -0,0 +1,10 @@ +Name: test +Type: hash:ip,mark +Header: family inet hashsize 1024 maxelem 65536 timeout x +Size in memory: 8836 +References: 0 +Members: +2.0.0.0,5 timeout x +2.0.0.1,5 timeout x +2.1.0.0,128 timeout x +2.1.0.1,128 timeout x diff --git a/tests/hash:ip,mark.t.list1 b/tests/hash:ip,mark.t.list1 new file mode 100644 index 0000000..af8a38b --- /dev/null +++ b/tests/hash:ip,mark.t.list1 @@ -0,0 +1,6 @@ +Name: test +Type: hash:ip,mark +Header: family inet hashsize 1024 maxelem 65536 timeout 5 +Size in memory: 8836 +References: 0 +Members: diff --git a/tests/hash:ip6,mark.t b/tests/hash:ip6,mark.t new file mode 100644 index 0000000..bc7757b --- /dev/null +++ b/tests/hash:ip6,mark.t @@ -0,0 +1,227 @@ +# Create a set with timeout +0 ipset create test hash:ip,mark family inet6 timeout 5 +# Add partly zero valued element +0 ipset add test 2:0:0::1,0 +# Test partly zero valued element +0 ipset test test 2:0:0::1,0 +# Delete partly zero valued element +0 ipset del test 2:0:0::1,0 +# Add first random value +0 ipset add test 2:0:0::1,5 +# Add second random value +0 ipset add test 2:1:0::0,128 +# Test first random value +0 ipset test test 2:0:0::1,5 +# Test second random value +0 ipset test test 2:1:0::0,128 +# Test value not added to the set +1 ipset test test 2:0:0::1,4 +# Delete value not added to the set +1 ipset del test 2:0:0::1,6 +# Test value before first random value +1 ipset test test 2:0:0::0,5 +# Test value after second random value +1 ipset test test 2:1:0::1,128 +# Try to add value before first random value +0 ipset add test 2:0:0::0,5 +# Try to add value after second random value +0 ipset add test 2:1:0::1,128 +# List set +0 ipset list test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 +# Check listing +0 diff -u -I 'Size in memory.*' .foo hash:ip6,mark.t.list0 +# Sleep 5s so that elements can time out +0 sleep 5 +# List set +0 ipset list test | grep -v Revision: > .foo0 && ./sort.sh .foo0 +# Check listing +0 diff -u -I 'Size in memory.*' .foo hash:ip6,mark.t.list1 +# Delete test set +0 ipset destroy test +# Create set to add a range +0 ipset new test hash:ip,mark -6 hashsize 64 +# Add a random value 1 +0 ipset add test 1::1,800000 +# Add a random value 2 +0 ipset add test 1::1,8900000 +# Add a random value 3 +0 ipset add test 1::3,8900000 +# Add a random value 4 +0 ipset add test 1::4,8900000 +# Add a random value 5 +0 ipset add test 1::5,8900000 +# Add a random value 6 +0 ipset add test 1::6,8900000 +# Add a random value 7 +0 ipset add test 1::7,8900000 +# Add a random value 8 +0 ipset add test 1::8,8900000 +# Add a random value 9 +0 ipset add test 1::9,8900000 +# Add a random value 10 +0 ipset add test 1::101,8900000 +# Add a random value 11 +0 ipset add test 1::11,8900000 +# Add a random value 12 +0 ipset add test 1::12,8900000 +# Add a random value 13 +0 ipset add test 1::13,8900000 +# Add a random value 14 +0 ipset add test 1::14,8900000 +# Add a random value 15 +0 ipset add test 1::15,8900000 +# Add a random value 16 +0 ipset add test 1::16,8900000 +# Add a random value 17 +0 ipset add test 1::17,8900000 +# Add a random value 18 +0 ipset add test 1::18,8900000 +# Add a random value 19 +0 ipset add test 1::19,8900000 +# Add a random value 20 +0 ipset add test 1::20,8900000 +# Add a random value 21 +0 ipset add test 1::21,8900000 +# Add a random value 22 +0 ipset add test 1::22,8900000 +# Add a random value 23 +0 ipset add test 1::23,8900000 +# Add a random value 24 +0 ipset add test 1::24,8900000 +# Add a random value 25 +0 ipset add test 1::25,8900000 +# Add a random value 26 +0 ipset add test 1::26,8900000 +# Add a random value 27 +0 ipset add test 1::27,8900000 +# Add a random value 28 +0 ipset add test 1::28,8900000 +# Add a random value 29 +0 ipset add test 1::29,8900000 +# Add a random value 30 +0 ipset add test 1::301,8900000 +# Add a random value 31 +0 ipset add test 1::31,8900000 +# Add a random value 32 +0 ipset add test 1::32,8900000 +# Add a random value 33 +0 ipset add test 1::33,8900000 +# Add a random value 34 +0 ipset add test 1::34,8900000 +# Add a random value 35 +0 ipset add test 1::35,8900000 +# Add a random value 36 +0 ipset add test 1::36,8900000 +# Add a random value 37 +0 ipset add test 1::37,8900000 +# Add a random value 38 +0 ipset add test 1::38,8900000 +# Add a random value 39 +0 ipset add test 1::39,8900000 +# Add a random value 40 +0 ipset add test 1::401,8900000 +# Add a random value 41 +0 ipset add test 1::41,8900000 +# Add a random value 42 +0 ipset add test 1::42,8900000 +# Add a random value 43 +0 ipset add test 1::43,8900000 +# Add a random value 44 +0 ipset add test 1::44,8900000 +# Add a random value 45 +0 ipset add test 1::45,8900000 +# Add a random value 46 +0 ipset add test 1::46,8900000 +# Add a random value 47 +0 ipset add test 1::47,8900000 +# Add a random value 48 +0 ipset add test 1::48,8900000 +# Add a random value 49 +0 ipset add test 1::49,8900000 +# Add a random value 50 +0 ipset add test 1::501,8900000 +# Add a random value 51 +0 ipset add test 1::51,8900000 +# Add a random value 52 +0 ipset add test 1::52,8900000 +# Add a random value 53 +0 ipset add test 1::53,8900000 +# Add a random value 54 +0 ipset add test 1::54,8900000 +# Add a random value 55 +0 ipset add test 1::55,8900000 +# Add a random value 56 +0 ipset add test 1::56,8900000 +# Add a random value 57 +0 ipset add test 1::57,8900000 +# Add a random value 58 +0 ipset add test 1::58,8900000 +# Add a random value 59 +0 ipset add test 1::59,8900000 +# Add a random value 60 +0 ipset add test 1::601,8900000 +# Add a random value 61 +0 ipset add test 1::61,8900000 +# Add a random value 62 +0 ipset add test 1::62,8900000 +# Add a random value 63 +0 ipset add test 1::63,8900000 +# Add a random value 64 +0 ipset add test 1::64,8900000 +# Add a random value 65, that forces a resizing +0 ipset add test 1::65,8900000 +# Check that correct number of elements are added +0 n=`ipset list test|grep 1::|wc -l` && test $n -eq 65 +# Destroy set +0 ipset -X test +# Timeout: Check that resizing keeps timeout values +0 ./resizet.sh -6 ipmark +# Counters: create set +0 ipset n test hash:ip,mark -6 counters +# Counters: add element with packet, byte counters +0 ipset a test 2:0:0::1,80 packets 5 bytes 3456 +# Counters: check element +0 ipset t test 2:0:0::1,80 +# Counters: check counters +0 ./check_counters test 2::1 5 3456 +# Counters: delete element +0 ipset d test 2:0:0::1,80 +# Counters: test deleted element +1 ipset t test 2:0:0::1,80 +# Counters: add element with packet, byte counters +0 ipset a test 2:0:0::20,453 packets 12 bytes 9876 +# Counters: check counters +0 ./check_counters test 2::20 12 9876 +# Counters: update counters +0 ipset -! a test 2:0:0::20,453 packets 13 bytes 12479 +# Counters: check counters +0 ./check_counters test 2::20 13 12479 +# Counters: destroy set +0 ipset x test +# Counters and timeout: create set +0 ipset n test hash:ip,mark -6 counters timeout 600 +# Counters and timeout: add element with packet, byte counters +0 ipset a test 2:0:0::1,80 packets 5 bytes 3456 +# Counters and timeout: check element +0 ipset t test 2:0:0::1,80 +# Counters and timeout: check counters +0 ./check_extensions test 2::1 600 5 3456 +# Counters and timeout: delete element +0 ipset d test 2:0:0::1,80 +# Counters and timeout: test deleted element +1 ipset t test 2:0:0::1,80 +# Counters and timeout: add element with packet, byte counters +0 ipset a test 2:0:0::20,453 packets 12 bytes 9876 +# Counters and timeout: check counters +0 ./check_extensions test 2::20 600 12 9876 +# Counters and timeout: update counters +0 ipset -! a test 2:0:0::20,453 packets 13 bytes 12479 +# Counters and timeout: check counters +0 ./check_extensions test 2::20 600 13 12479 +# Counters and timeout: update timeout +0 ipset -! a test 2:0:0::20,453 timeout 700 +# Counters and timeout: check counters +0 ./check_extensions test 2::20 700 13 12479 +# Counters and timeout: destroy set +0 ipset x test +# eof diff --git a/tests/hash:ip6,mark.t.list0 b/tests/hash:ip6,mark.t.list0 new file mode 100644 index 0000000..3ddc56a --- /dev/null +++ b/tests/hash:ip6,mark.t.list0 @@ -0,0 +1,10 @@ +Name: test +Type: hash:ip,mark +Header: family inet6 hashsize 1024 maxelem 65536 timeout x +Size in memory: 9316 +References: 0 +Members: +2:1::,128 timeout x +2:1::1,128 timeout x +2::,5 timeout x +2::1,5 timeout x diff --git a/tests/hash:ip6,mark.t.list1 b/tests/hash:ip6,mark.t.list1 new file mode 100644 index 0000000..3759448 --- /dev/null +++ b/tests/hash:ip6,mark.t.list1 @@ -0,0 +1,6 @@ +Name: test +Type: hash:ip,mark +Header: family inet6 hashsize 1024 maxelem 65536 timeout 5 +Size in memory: 9316 +References: 0 +Members: diff --git a/tests/ipmarkhash.t b/tests/ipmarkhash.t new file mode 100644 index 0000000..30301fb --- /dev/null +++ b/tests/ipmarkhash.t @@ -0,0 +1,71 @@ +# Create a set from a range (range ignored) +0 ipset -N test ipmarkhash --from 2.0.0.1 --to 2.1.0.0 +# Destroy set +0 ipset -X test +# Create a set +0 ipset -N test ipmarkhash +# Add partly zero valued element +0 ipset -A test 2.0.0.1,0 +# Test partly zero valued element +0 ipset -T test 2.0.0.1,0 +# Delete partly zero valued element +0 ipset -D test 2.0.0.1,0 +# Add first random value +0 ipset -A test 2.0.0.1,5 +# Add second random value +0 ipset -A test 2.1.0.0,128 +# Test first random value +0 ipset -T test 2.0.0.1,5 +# Test second random value +0 ipset -T test 2.1.0.0,128 +# Test value not added to the set +1 ipset -T test 2.0.0.1,4 +# Delete value not added to the set +1 ipset -D test 2.0.0.1,6 +# Test value before first random value +1 ipset -T test 2.0.0.0,5 +# Test value after second random value +1 ipset -T test 2.1.0.1,128 +# Try to add value before first random value +0 ipset -A test 2.0.0.0,5 +# Try to add value after second random value +0 ipset -A test 2.1.0.1,128 +# List set +0 ipset -L test | grep -v Revision: > .foo0 && ./sort.sh .foo0 +# Check listing +0 diff -u -I 'Size in memory.*' .foo ipmarkhash.t.list0 +# Flush test set +0 ipset -F test +# Delete test set +0 ipset -X test +# Create a set from a network (network ignored) +0 ipset -N test ipmarkhash --network 2.0.0.0/16 +# Add first random value +0 ipset -A test 2.0.0.0,5 +# Add second random value +0 ipset -A test 2.0.255.255,128 +# Test first random value +0 ipset -T test 2.0.0.0,5 +# Test second random value +0 ipset -T test 2.0.255.255,128 +# Test value not added to the set +1 ipset -T test 2.0.0.0,4 +# Delete value not added to the set +1 ipset -D test 2.0.0.0,6 +# Test value before first random value +1 ipset -T test 1.255.255.255,5 +# Test value after second random value +1 ipset -T test 2.1.0.0,128 +# Try to add value before first random value +0 ipset -A test 1.255.255.255,5 +# Try to add value after second random value +0 ipset -A test 2.1.0.0,128 +# List set +0 ipset -L test | grep -v Revision: > .foo0 && ./sort.sh .foo0 +# Check listing +0 diff -u -I 'Size in memory.*' .foo ipmarkhash.t.list1 +# Flush test set +0 ipset -F test +# Delete test set +0 ipset -X test +# eof diff --git a/tests/ipmarkhash.t.list0 b/tests/ipmarkhash.t.list0 new file mode 100644 index 0000000..201a687 --- /dev/null +++ b/tests/ipmarkhash.t.list0 @@ -0,0 +1,10 @@ +Name: test +Type: hash:ip,mark +Header: family inet hashsize 1024 maxelem 65536 +Size in memory: 8516 +References: 0 +Members: +2.0.0.0,5 +2.0.0.1,5 +2.1.0.0,128 +2.1.0.1,128 diff --git a/tests/ipmarkhash.t.list1 b/tests/ipmarkhash.t.list1 new file mode 100644 index 0000000..2b0265b --- /dev/null +++ b/tests/ipmarkhash.t.list1 @@ -0,0 +1,10 @@ +Name: test +Type: hash:ip,mark +Header: family inet hashsize 1024 maxelem 65536 +Size in memory: 8468 +References: 0 +Members: +1.255.255.255,5 +2.0.0.0,5 +2.0.255.255,128 +2.1.0.0,128 diff --git a/tests/resizet.sh b/tests/resizet.sh index c121357..753c08e 100644 --- a/tests/resizet.sh +++ b/tests/resizet.sh @@ -29,6 +29,14 @@ case "$2" in done done ;; + ipmark) + $ipset n test hash:ip,mark $1 hashsize 64 timeout 100 + for x in `seq 0 16`; do + for y in `seq 0 255`; do + $ipset a test $ip$x$sep$y,1023 + done + done + ;; ipport) $ipset n test hash:ip,port $1 hashsize 64 timeout 100 for x in `seq 0 16`; do diff --git a/tests/runtest.sh b/tests/runtest.sh index a82b802..99e5e6c 100755 --- a/tests/runtest.sh +++ b/tests/runtest.sh @@ -7,6 +7,7 @@ tests="$tests ipmap bitmap:ip" tests="$tests macipmap portmap" tests="$tests iphash hash:ip hash:ip6" tests="$tests ipporthash hash:ip,port hash:ip6,port" +tests="$tests ipmarkhash hash:ip,mark hash:ip6,mark" tests="$tests ipportiphash hash:ip,port,ip hash:ip6,port,ip6" tests="$tests nethash hash:net hash:net6 hash:net,port hash:net6,port" tests="$tests hash:ip,port,net hash:ip6,port,net6 hash:net,net hash:net6,net6" diff --git a/tests/setlist_resize.sh b/tests/setlist_resize.sh index bdf762b..7e7ad24 100755 --- a/tests/setlist_resize.sh +++ b/tests/setlist_resize.sh @@ -7,7 +7,7 @@ loop=8 for x in ip_set_list_set ip_set_hash_netiface ip_set_hash_ipportnet \ ip_set_hash_netport ip_set_hash_net ip_set_hash_ipportip \ ip_set_hash_ipport ip_set_hash_ip ip_set_hash_netnet \ - ip_set_hash_netportnet \ + ip_set_hash_netportnet ip_set_hash_ipmark \ ip_set_bitmap_port ip_set_bitmap_ipmac \ ip_set_bitmap_ip xt_set ip_set; do rmmod $x -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 1/1] add markmask for hash:ip,mark data type 2013-12-17 14:01 ` [PATCH 0/1] add hash:ip,mark data type to ipset Vytas Dauksa @ 2013-12-17 14:01 ` Vytas Dauksa 2014-01-08 21:22 ` Jozsef Kadlecsik 2014-01-08 21:13 ` [PATCH 0/1] add hash:ip,mark data type to ipset Jozsef Kadlecsik 1 sibling, 1 reply; 8+ messages in thread From: Vytas Dauksa @ 2013-12-17 14:01 UTC (permalink / raw) To: netfilter-devel; +Cc: kadlec, Vytas Dauksa Introduce packet mark mask for hash:ip,mark data type. This allows to set mark bit filter for the ip set. Change-Id: Id8dd9ca7e64477c4f7b022a1d9c1a5b187f1c96e --- include/libipset/data.h | 2 ++ include/libipset/linux_ip_set.h | 2 ++ kernel/include/uapi/linux/netfilter/ipset/ip_set.h | 2 ++ kernel/net/netfilter/ipset/ip_set_hash_gen.h | 31 ++++++++++++++++++++ kernel/net/netfilter/ipset/ip_set_hash_ipmark.c | 9 ++++++ lib/data.c | 7 +++++ lib/debug.c | 1 + lib/errcode.c | 2 ++ lib/ipset_hash_ipmark.c | 9 ++++-- lib/print.c | 1 + lib/session.c | 4 +++ src/ipset.8 | 6 +++- tests/hash:ip,mark.t | 10 +++++++ tests/hash:ip,mark.t.list0 | 2 +- tests/hash:ip,mark.t.list1 | 2 +- tests/hash:ip6,mark.t | 10 +++++++ tests/hash:ip6,mark.t.list0 | 2 +- tests/hash:ip6,mark.t.list1 | 2 +- tests/ipmarkhash.t.list0 | 2 +- tests/ipmarkhash.t.list1 | 2 +- 20 files changed, 99 insertions(+), 9 deletions(-) diff --git a/include/libipset/data.h b/include/libipset/data.h index 618e541..54d914d 100644 --- a/include/libipset/data.h +++ b/include/libipset/data.h @@ -31,6 +31,7 @@ enum ipset_opt { IPSET_OPT_GC, IPSET_OPT_HASHSIZE, IPSET_OPT_MAXELEM, + IPSET_OPT_MARKMASK, IPSET_OPT_NETMASK, IPSET_OPT_PROBES, IPSET_OPT_RESIZE, @@ -87,6 +88,7 @@ enum ipset_opt { | IPSET_FLAG(IPSET_OPT_GC) \ | IPSET_FLAG(IPSET_OPT_HASHSIZE)\ | IPSET_FLAG(IPSET_OPT_MAXELEM) \ + | IPSET_FLAG(IPSET_OPT_MARKMASK)\ | IPSET_FLAG(IPSET_OPT_NETMASK) \ | IPSET_FLAG(IPSET_OPT_PROBES) \ | IPSET_FLAG(IPSET_OPT_RESIZE) \ diff --git a/include/libipset/linux_ip_set.h b/include/libipset/linux_ip_set.h index c57f81e..c2bae85 100644 --- a/include/libipset/linux_ip_set.h +++ b/include/libipset/linux_ip_set.h @@ -90,6 +90,7 @@ enum { IPSET_ATTR_GC, IPSET_ATTR_HASHSIZE, IPSET_ATTR_MAXELEM, + IPSET_ATTR_MARKMASK, IPSET_ATTR_NETMASK, IPSET_ATTR_PROBES, IPSET_ATTR_RESIZE, @@ -139,6 +140,7 @@ enum ipset_errno { IPSET_ERR_EXIST, IPSET_ERR_INVALID_CIDR, IPSET_ERR_INVALID_NETMASK, + IPSET_ERR_INVALID_MARKMASK, IPSET_ERR_INVALID_FAMILY, IPSET_ERR_TIMEOUT, IPSET_ERR_REFERENCED, diff --git a/kernel/include/uapi/linux/netfilter/ipset/ip_set.h b/kernel/include/uapi/linux/netfilter/ipset/ip_set.h index c57f81e..c2bae85 100644 --- a/kernel/include/uapi/linux/netfilter/ipset/ip_set.h +++ b/kernel/include/uapi/linux/netfilter/ipset/ip_set.h @@ -90,6 +90,7 @@ enum { IPSET_ATTR_GC, IPSET_ATTR_HASHSIZE, IPSET_ATTR_MAXELEM, + IPSET_ATTR_MARKMASK, IPSET_ATTR_NETMASK, IPSET_ATTR_PROBES, IPSET_ATTR_RESIZE, @@ -139,6 +140,7 @@ enum ipset_errno { IPSET_ERR_EXIST, IPSET_ERR_INVALID_CIDR, IPSET_ERR_INVALID_NETMASK, + IPSET_ERR_INVALID_MARKMASK, IPSET_ERR_INVALID_FAMILY, IPSET_ERR_TIMEOUT, IPSET_ERR_REFERENCED, diff --git a/kernel/net/netfilter/ipset/ip_set_hash_gen.h b/kernel/net/netfilter/ipset/ip_set_hash_gen.h index 8f769f8..fa259db 100644 --- a/kernel/net/netfilter/ipset/ip_set_hash_gen.h +++ b/kernel/net/netfilter/ipset/ip_set_hash_gen.h @@ -263,6 +263,9 @@ struct htype { u32 maxelem; /* max elements in the hash */ u32 elements; /* current element (vs timeout) */ u32 initval; /* random jhash init value */ +#ifdef IP_SET_HASH_WITH_MARKMASK + u32 markmask; /* markmask value for mark mask to store */ +#endif struct timer_list gc; /* garbage collection when timeout enabled */ struct mtype_elem next; /* temporary storage for uadd */ #ifdef IP_SET_HASH_WITH_MULTI @@ -454,6 +457,9 @@ mtype_same_set(const struct ip_set *a, const struct ip_set *b) #ifdef IP_SET_HASH_WITH_NETMASK x->netmask == y->netmask && #endif +#ifdef IP_SET_HASH_WITH_MARKMASK + x->markmask == y->markmask && +#endif a->extensions == b->extensions; } @@ -908,6 +914,10 @@ mtype_head(struct ip_set *set, struct sk_buff *skb) nla_put_u8(skb, IPSET_ATTR_NETMASK, h->netmask)) goto nla_put_failure; #endif +#ifdef IP_SET_HASH_WITH_MARKMASK + if (nla_put_u32(skb, IPSET_ATTR_MARKMASK, h->markmask)) + goto nla_put_failure; +#endif if (nla_put_net32(skb, IPSET_ATTR_REFERENCES, htonl(set->ref - 1)) || nla_put_net32(skb, IPSET_ATTR_MEMSIZE, htonl(memsize))) goto nla_put_failure; @@ -1016,6 +1026,9 @@ IPSET_TOKEN(HTYPE, _create)(struct net *net, struct ip_set *set, struct nlattr *tb[], u32 flags) { u32 hashsize = IPSET_DEFAULT_HASHSIZE, maxelem = IPSET_DEFAULT_MAXELEM; +#ifdef IP_SET_HASH_WITH_MARKMASK + u32 markmask; +#endif u8 hbits; #ifdef IP_SET_HASH_WITH_NETMASK u8 netmask; @@ -1026,6 +1039,10 @@ IPSET_TOKEN(HTYPE, _create)(struct net *net, struct ip_set *set, if (!(set->family == NFPROTO_IPV4 || set->family == NFPROTO_IPV6)) return -IPSET_ERR_INVALID_FAMILY; + +#ifdef IP_SET_HASH_WITH_MARKMASK + markmask = 0xffffffff; +#endif #ifdef IP_SET_HASH_WITH_NETMASK netmask = set->family == NFPROTO_IPV4 ? 32 : 128; pr_debug("Create set %s with family %s\n", @@ -1034,6 +1051,9 @@ IPSET_TOKEN(HTYPE, _create)(struct net *net, struct ip_set *set, if (unlikely(!ip_set_optattr_netorder(tb, IPSET_ATTR_HASHSIZE) || !ip_set_optattr_netorder(tb, IPSET_ATTR_MAXELEM) || +#ifdef IP_SET_HASH_WITH_MARKMASK + !ip_set_optattr_netorder(tb, IPSET_ATTR_MARKMASK) || +#endif !ip_set_optattr_netorder(tb, IPSET_ATTR_TIMEOUT) || !ip_set_optattr_netorder(tb, IPSET_ATTR_CADT_FLAGS))) return -IPSET_ERR_PROTOCOL; @@ -1057,6 +1077,14 @@ IPSET_TOKEN(HTYPE, _create)(struct net *net, struct ip_set *set, return -IPSET_ERR_INVALID_NETMASK; } #endif +#ifdef IP_SET_HASH_WITH_MARKMASK + if (tb[IPSET_ATTR_MARKMASK]) { + markmask = ntohl(nla_get_u32(tb[IPSET_ATTR_MARKMASK])); + + if ((markmask > 4294967295u) || markmask == 0) + return -IPSET_ERR_INVALID_MARKMASK; + } +#endif hsize = sizeof(*h); #ifdef IP_SET_HASH_WITH_NETS @@ -1071,6 +1099,9 @@ IPSET_TOKEN(HTYPE, _create)(struct net *net, struct ip_set *set, #ifdef IP_SET_HASH_WITH_NETMASK h->netmask = netmask; #endif +#ifdef IP_SET_HASH_WITH_MARKMASK + h->markmask = markmask; +#endif get_random_bytes(&h->initval, sizeof(h->initval)); set->timeout = IPSET_NO_TIMEOUT; diff --git a/kernel/net/netfilter/ipset/ip_set_hash_ipmark.c b/kernel/net/netfilter/ipset/ip_set_hash_ipmark.c index e56c0d9..1bf8e85 100644 --- a/kernel/net/netfilter/ipset/ip_set_hash_ipmark.c +++ b/kernel/net/netfilter/ipset/ip_set_hash_ipmark.c @@ -34,6 +34,7 @@ MODULE_ALIAS("ip_set_hash:ip,mark"); /* Type specific function prefix */ #define HTYPE hash_ipmark +#define IP_SET_HASH_WITH_MARKMASK /* IPv4 variant */ @@ -85,11 +86,13 @@ hash_ipmark4_kadt(struct ip_set *set, const struct sk_buff *skb, const struct xt_action_param *par, enum ipset_adt adt, struct ip_set_adt_opt *opt) { + const struct hash_ipmark *h = set->data; ipset_adtfn adtfn = set->variant->adt[adt]; struct hash_ipmark4_elem e = { }; struct ip_set_ext ext = IP_SET_INIT_KEXT(skb, opt, set); e.mark = skb->mark; + e.mark &= h->markmask; ip4addrptr(skb, opt->flags & IPSET_DIM_ONE_SRC, &e.ip); return adtfn(set, &e, &ext, &opt->ext, opt->cmdflags); @@ -122,6 +125,7 @@ hash_ipmark4_uadt(struct ip_set *set, struct nlattr *tb[], return ret; e.mark = ntohl(nla_get_u32(tb[IPSET_ATTR_MARK])); + e.mark &= h->markmask; if (adt == IPSET_TEST || !(tb[IPSET_ATTR_IP_TO] || tb[IPSET_ATTR_CIDR])) { @@ -213,11 +217,13 @@ hash_ipmark6_kadt(struct ip_set *set, const struct sk_buff *skb, const struct xt_action_param *par, enum ipset_adt adt, struct ip_set_adt_opt *opt) { + const struct hash_ipmark *h = set->data; ipset_adtfn adtfn = set->variant->adt[adt]; struct hash_ipmark6_elem e = { }; struct ip_set_ext ext = IP_SET_INIT_KEXT(skb, opt, set); e.mark = skb->mark; + e.mark &= h->markmask; ip6addrptr(skb, opt->flags & IPSET_DIM_ONE_SRC, &e.ip.in6); return adtfn(set, &e, &ext, &opt->ext, opt->cmdflags); @@ -227,6 +233,7 @@ static int hash_ipmark6_uadt(struct ip_set *set, struct nlattr *tb[], enum ipset_adt adt, u32 *lineno, u32 flags, bool retried) { + const struct hash_ipmark *h = set->data; ipset_adtfn adtfn = set->variant->adt[adt]; struct hash_ipmark6_elem e = { }; struct ip_set_ext ext = IP_SET_INIT_UEXT(set); @@ -250,6 +257,7 @@ hash_ipmark6_uadt(struct ip_set *set, struct nlattr *tb[], return ret; e.mark = ntohl(nla_get_u32(tb[IPSET_ATTR_MARK])); + e.mark &= h->markmask; if (adt == IPSET_TEST) { ret = adtfn(set, &e, &ext, &ext, flags); @@ -275,6 +283,7 @@ static struct ip_set_type hash_ipmark_type __read_mostly = { .revision_max = IPSET_TYPE_REV_MAX, .create = hash_ipmark_create, .create_policy = { + [IPSET_ATTR_MARKMASK] = { .type = NLA_U32 }, [IPSET_ATTR_HASHSIZE] = { .type = NLA_U32 }, [IPSET_ATTR_MAXELEM] = { .type = NLA_U32 }, [IPSET_ATTR_PROBES] = { .type = NLA_U8 }, diff --git a/lib/data.c b/lib/data.c index 1f74cd5..48ec98a 100644 --- a/lib/data.c +++ b/lib/data.c @@ -54,6 +54,7 @@ struct ipset_data { uint8_t netmask; uint32_t hashsize; uint32_t maxelem; + uint32_t markmask; uint32_t gc; uint32_t size; /* Filled out by kernel */ @@ -287,6 +288,9 @@ ipset_data_set(struct ipset_data *data, enum ipset_opt opt, const void *value) case IPSET_OPT_MAXELEM: data->create.maxelem = *(const uint32_t *) value; break; + case IPSET_OPT_MARKMASK: + data->create.markmask = *(const uint32_t *) value; + break; case IPSET_OPT_NETMASK: data->create.netmask = *(const uint8_t *) value; break; @@ -467,6 +471,8 @@ ipset_data_get(const struct ipset_data *data, enum ipset_opt opt) return &data->create.hashsize; case IPSET_OPT_MAXELEM: return &data->create.maxelem; + case IPSET_OPT_MARKMASK: + return &data->create.markmask; case IPSET_OPT_NETMASK: return &data->create.netmask; case IPSET_OPT_PROBES: @@ -561,6 +567,7 @@ ipset_data_sizeof(enum ipset_opt opt, uint8_t family) case IPSET_OPT_GC: case IPSET_OPT_HASHSIZE: case IPSET_OPT_MAXELEM: + case IPSET_OPT_MARKMASK: case IPSET_OPT_SIZE: case IPSET_OPT_ELEMENTS: case IPSET_OPT_REFERENCES: diff --git a/lib/debug.c b/lib/debug.c index 9a3c6b8..1240e22 100644 --- a/lib/debug.c +++ b/lib/debug.c @@ -38,6 +38,7 @@ static const struct ipset_attrname createattr2name[] = { [IPSET_ATTR_GC] = { .name = "GC" }, [IPSET_ATTR_HASHSIZE] = { .name = "HASHSIZE" }, [IPSET_ATTR_MAXELEM] = { .name = "MAXELEM" }, + [IPSET_ATTR_MARKMASK] = { .name = "MARKMASK" }, [IPSET_ATTR_NETMASK] = { .name = "NETMASK" }, [IPSET_ATTR_PROBES] = { .name = "PROBES" }, [IPSET_ATTR_RESIZE] = { .name = "RESIZE" }, diff --git a/lib/errcode.c b/lib/errcode.c index 160d9ad..86eeabd 100644 --- a/lib/errcode.c +++ b/lib/errcode.c @@ -38,6 +38,8 @@ static const struct ipset_errcode_table core_errcode_table[] = { "cannot create more." }, { IPSET_ERR_INVALID_NETMASK, 0, "The value of the netmask parameter is invalid" }, + { IPSET_ERR_INVALID_MARKMASK, 0, + "The value of the markmask parameter is invalid" }, { IPSET_ERR_INVALID_FAMILY, 0, "Protocol family not supported by the set type" }, diff --git a/lib/ipset_hash_ipmark.c b/lib/ipset_hash_ipmark.c index 6976371..fdea32f 100644 --- a/lib/ipset_hash_ipmark.c +++ b/lib/ipset_hash_ipmark.c @@ -26,6 +26,10 @@ static const struct ipset_arg hash_ipmark_create_args0[] = { .has_arg = IPSET_NO_ARG, .opt = IPSET_OPT_FAMILY, .parse = ipset_parse_family, }, + { .name = { "markmask", NULL }, + .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_MARKMASK, + .parse = ipset_parse_uint32, .print = ipset_print_number, + }, { .name = { "hashsize", NULL }, .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_HASHSIZE, .parse = ipset_parse_uint32, .print = ipset_print_number, @@ -92,7 +96,7 @@ static const struct ipset_arg hash_ipmark_add_args0[] = { static const char hash_ipmark_usage0[] = "create SETNAME hash:ip,mark\n" -" [family inet|inet6]\n" +" [family inet|inet6] [markmask VALUE]\n" " [hashsize VALUE] [maxelem VALUE]\n" " [timeout VALUE] [counters] [comment]\n" "add SETNAME IP,MARK [timeout VALUE]\n" @@ -138,7 +142,8 @@ static struct ipset_type ipset_hash_ipmark0 = { | IPSET_FLAG(IPSET_OPT_MARK), }, .full = { - [IPSET_CREATE] = IPSET_FLAG(IPSET_OPT_HASHSIZE) + [IPSET_CREATE] = IPSET_FLAG(IPSET_OPT_MARKMASK) + | IPSET_FLAG(IPSET_OPT_HASHSIZE) | IPSET_FLAG(IPSET_OPT_MAXELEM) | IPSET_FLAG(IPSET_OPT_TIMEOUT) | IPSET_FLAG(IPSET_OPT_COUNTERS) diff --git a/lib/print.c b/lib/print.c index 6634802..dfa850b 100644 --- a/lib/print.c +++ b/lib/print.c @@ -891,6 +891,7 @@ ipset_print_data(char *buf, unsigned int len, case IPSET_OPT_GC: case IPSET_OPT_HASHSIZE: case IPSET_OPT_MAXELEM: + case IPSET_OPT_MARKMASK: case IPSET_OPT_NETMASK: case IPSET_OPT_PROBES: case IPSET_OPT_RESIZE: diff --git a/lib/session.c b/lib/session.c index cf65960..d2957a5 100644 --- a/lib/session.c +++ b/lib/session.c @@ -381,6 +381,10 @@ static const struct ipset_attr_policy create_attrs[] = { .type = MNL_TYPE_U32, .opt = IPSET_OPT_MAXELEM, }, + [IPSET_ATTR_MARKMASK] = { + .type = MNL_TYPE_U32, + .opt = IPSET_OPT_MARKMASK, + }, [IPSET_ATTR_NETMASK] = { .type = MNL_TYPE_U8, .opt = IPSET_OPT_NETMASK, diff --git a/src/ipset.8 b/src/ipset.8 index b401863..2012c78 100644 --- a/src/ipset.8 +++ b/src/ipset.8 @@ -881,7 +881,7 @@ ipset test foo 192.168.1,80.10.0.0/24 .SS hash:ip,mark The \fBhash:ip,mark\fR set type uses a hash to store IP address and packet mark pairs. .PP -\fICREATE\-OPTIONS\fR := [ \fBfamily\fR { \fBinet\fR | \fBinet6\fR } ] | [ \fBhashsize\fR \fIvalue\fR ] [ \fBmaxelem\fR \fIvalue\fR ] [ \fBtimeout\fR \fIvalue\fR ] [ \fBcounters\fP ] [ \fBcomment\fP ] +\fICREATE\-OPTIONS\fR := [ \fBfamily\fR { \fBinet\fR | \fBinet6\fR } ] | [ \fBmarkmask\fR \fIvalue\fR ] [ \fBhashsize\fR \fIvalue\fR ] [ \fBmaxelem\fR \fIvalue\fR ] [ \fBtimeout\fR \fIvalue\fR ] [ \fBcounters\fP ] [ \fBcomment\fP ] .PP \fIADD\-ENTRY\fR := \fIipaddr\fR,\fImark\fR .PP @@ -897,6 +897,10 @@ Optional \fBcreate\fR options: The protocol family of the IP addresses to be stored in the set. The default is \fBinet\fR, i.e IPv4. .TP +\fBmarkmask\fR \fIvalue\fR +Allows to set bits you are interested in the packet mark. This values is then used to perform bitwise AND operation for every mark added. +markmask can be any value between 1 and 4294967295, by default all 32 bits are set. +.TP \fBhashsize\fR \fIvalue\fR The initial hash size for the set, default is 1024. The hash size must be a power of two, the kernel automatically rounds up non power of two hash sizes to the first diff --git a/tests/hash:ip,mark.t b/tests/hash:ip,mark.t index bd5c237..ad76274 100644 --- a/tests/hash:ip,mark.t +++ b/tests/hash:ip,mark.t @@ -122,4 +122,14 @@ 0 ./check_extensions test 2.0.0.20 700 13 12479 # Counters and timeout: destroy set 0 ipset x test +# Create a set with 65502 ( 0x0000FFDE ) markmask +0 ipset create test hash:ip,mark markmask 0x0000FFDE +# Add first value with 86111010 ( 0x0521F322 ) mark +0 ipset add test 19.16.1.254,0x0521F322 +# Test last entry mark was modified to 62210 ( 0x0000F302 ) +0 ipset test test 19.16.1.254,0x0000F302 +# Test that mask is applied for tests as well +0 ipset test test 19.16.1.254,0x0521F322 +# Destroy set +0 ipset x test # eof diff --git a/tests/hash:ip,mark.t.list0 b/tests/hash:ip,mark.t.list0 index 378dabe..d83b206 100644 --- a/tests/hash:ip,mark.t.list0 +++ b/tests/hash:ip,mark.t.list0 @@ -1,6 +1,6 @@ Name: test Type: hash:ip,mark -Header: family inet hashsize 1024 maxelem 65536 timeout x +Header: family inet markmask 4294967295 hashsize 1024 maxelem 65536 timeout x Size in memory: 8836 References: 0 Members: diff --git a/tests/hash:ip,mark.t.list1 b/tests/hash:ip,mark.t.list1 index af8a38b..400f999 100644 --- a/tests/hash:ip,mark.t.list1 +++ b/tests/hash:ip,mark.t.list1 @@ -1,6 +1,6 @@ Name: test Type: hash:ip,mark -Header: family inet hashsize 1024 maxelem 65536 timeout 5 +Header: family inet markmask 4294967295 hashsize 1024 maxelem 65536 timeout 5 Size in memory: 8836 References: 0 Members: diff --git a/tests/hash:ip6,mark.t b/tests/hash:ip6,mark.t index bc7757b..5c243fa 100644 --- a/tests/hash:ip6,mark.t +++ b/tests/hash:ip6,mark.t @@ -224,4 +224,14 @@ 0 ./check_extensions test 2::20 700 13 12479 # Counters and timeout: destroy set 0 ipset x test +# Create a set with 65502 ( 0x0000FFDE ) markmask +0 ipset create test hash:ip,mark family inet6 markmask 0x0000FFDE +# Add first value with 86111010 ( 0x0521F322 ) mark +0 ipset add test 2:1::1,0x0521F322 +# Test last entry mark was modified to 62210 ( 0x0000F302 ) +0 ipset test test 2:1::1,0x0000F302 +# Test that mask is applied for tests as well +0 ipset test test 2:1::1,0x0521F322 +# Destroy set +0 ipset x test # eof diff --git a/tests/hash:ip6,mark.t.list0 b/tests/hash:ip6,mark.t.list0 index 3ddc56a..0cd930b 100644 --- a/tests/hash:ip6,mark.t.list0 +++ b/tests/hash:ip6,mark.t.list0 @@ -1,6 +1,6 @@ Name: test Type: hash:ip,mark -Header: family inet6 hashsize 1024 maxelem 65536 timeout x +Header: family inet6 markmask 4294967295 hashsize 1024 maxelem 65536 timeout x Size in memory: 9316 References: 0 Members: diff --git a/tests/hash:ip6,mark.t.list1 b/tests/hash:ip6,mark.t.list1 index 3759448..44bc1da 100644 --- a/tests/hash:ip6,mark.t.list1 +++ b/tests/hash:ip6,mark.t.list1 @@ -1,6 +1,6 @@ Name: test Type: hash:ip,mark -Header: family inet6 hashsize 1024 maxelem 65536 timeout 5 +Header: family inet6 markmask 4294967295 hashsize 1024 maxelem 65536 timeout 5 Size in memory: 9316 References: 0 Members: diff --git a/tests/ipmarkhash.t.list0 b/tests/ipmarkhash.t.list0 index 201a687..4ada53a 100644 --- a/tests/ipmarkhash.t.list0 +++ b/tests/ipmarkhash.t.list0 @@ -1,6 +1,6 @@ Name: test Type: hash:ip,mark -Header: family inet hashsize 1024 maxelem 65536 +Header: family inet markmask 4294967295 hashsize 1024 maxelem 65536 Size in memory: 8516 References: 0 Members: diff --git a/tests/ipmarkhash.t.list1 b/tests/ipmarkhash.t.list1 index 2b0265b..74d2869 100644 --- a/tests/ipmarkhash.t.list1 +++ b/tests/ipmarkhash.t.list1 @@ -1,6 +1,6 @@ Name: test Type: hash:ip,mark -Header: family inet hashsize 1024 maxelem 65536 +Header: family inet markmask 4294967295 hashsize 1024 maxelem 65536 Size in memory: 8468 References: 0 Members: -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/1] add markmask for hash:ip,mark data type 2013-12-17 14:01 ` [PATCH 1/1] add markmask for hash:ip,mark data type Vytas Dauksa @ 2014-01-08 21:22 ` Jozsef Kadlecsik 2014-01-09 11:09 ` Vytas Dauksa 0 siblings, 1 reply; 8+ messages in thread From: Jozsef Kadlecsik @ 2014-01-08 21:22 UTC (permalink / raw) To: Vytas Dauksa; +Cc: netfilter-devel On Tue, 17 Dec 2013, Vytas Dauksa wrote: > Introduce packet mark mask for hash:ip,mark data type. This allows to > set mark bit filter for the ip set. Why it's important that the kernel should mask the mark value, when the user could add the intended value directly? The only case where it's required when entries added/deleted by the SET target. It's more natural for me if the markmask value has a meaning and effect for kernel side add/del operations only, and ignored for user add/del/test and kernel tests. What's your opinion? A small thing, but I'd prefer if the mark value were printed/saved in hex instead of decimal, similarly to iptables. Better introduce a new print function for it. Best regards, Jozsef - E-mail : kadlec@blackhole.kfki.hu, kadlecsik.jozsef@wigner.mta.hu PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences H-1525 Budapest 114, POB. 49, Hungary ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/1] add markmask for hash:ip,mark data type 2014-01-08 21:22 ` Jozsef Kadlecsik @ 2014-01-09 11:09 ` Vytas Dauksa 2014-01-09 21:02 ` Jozsef Kadlecsik 0 siblings, 1 reply; 8+ messages in thread From: Vytas Dauksa @ 2014-01-09 11:09 UTC (permalink / raw) To: Jozsef Kadlecsik; +Cc: netfilter-devel > Why it's important that the kernel should mask the mark value, when the > user could add the intended value directly? The only case where it's > required when entries added/deleted by the SET target. It's more natural > for me if the markmask value has a meaning and effect for kernel side > add/del operations only, and ignored for user add/del/test and kernel > tests. What's your opinion? The kernel must apply the mask at test time - that's the whole reason for it. In our use case the desired mask is 0xff000000, because those bits identify the protocol, and the other bits are for an unrelated purpose. Because the other bits could be set to anything, without a mask there might have to be 2^24 entries for the other possible values. If the kernel applies a mask on test, but values added by the user aren't masked, those entries would never match. It seems clearer to mask them at add time, so that the user gets sensible errors; for instance, adding two different values which mask to the same thing will give the same error as adding the same value twice. Another option we discounted was that each entry could have its own mask. This didn't make sense because they're not strictly ordered like netmasks, so multiple entries could be equally applicable, and no hashing is possible. If 12000000/ff000000 and 00340000/00ff0000 are in the set, but one is nomatch, and a packet has mark 12345678, which entry should take effect? > A small thing, but I'd prefer if the mark value were printed/saved in hex > instead of decimal, similarly to iptables. Better introduce a new print > function for it. Sure, will implement this on Friday > Best regards, > Jozsef > - > E-mail : kadlec@blackhole.kfki.hu, kadlecsik.jozsef@wigner.mta.hu > PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt > Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences > H-1525 Budapest 114, POB. 49, Hungary -- Vytas Dauksa Junior Developer vytas.dauksa@smoothwall.net Smoothwall Ltd Phone: +44 (0) 8701 999500 www.smoothwall.net -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/1] add markmask for hash:ip,mark data type 2014-01-09 11:09 ` Vytas Dauksa @ 2014-01-09 21:02 ` Jozsef Kadlecsik 2014-01-17 18:45 ` Vytas Dauksa 0 siblings, 1 reply; 8+ messages in thread From: Jozsef Kadlecsik @ 2014-01-09 21:02 UTC (permalink / raw) To: Vytas Dauksa; +Cc: netfilter-devel On Thu, 9 Jan 2014, Vytas Dauksa wrote: > > Why it's important that the kernel should mask the mark value, when the > > user could add the intended value directly? The only case where it's > > required when entries added/deleted by the SET target. It's more natural > > for me if the markmask value has a meaning and effect for kernel side > > add/del operations only, and ignored for user add/del/test and kernel > > tests. What's your opinion? > > The kernel must apply the mask at test time - that's the whole reason > for it. In our use case the desired mask is 0xff000000, because those > bits identify the protocol, and the other bits are for an unrelated purpose. > Because the other bits could be set to anything, without a mask there > might have to be 2^24 entries for the other possible values. > > If the kernel applies a mask on test, but values added by the user aren't > masked, those entries would never match. It seems clearer to mask them > at add time, so that the user gets sensible errors; for instance, adding two > different values which mask to the same thing will give the same error as > adding the same value twice. > > Another option we discounted was that each entry could have its own > mask. This didn't make sense because they're not strictly ordered like > netmasks, so multiple entries could be equally applicable, and no hashing > is possible. If 12000000/ff000000 and 00340000/00ff0000 are in the set, > but one is nomatch, and a packet has mark 12345678, which entry should > take effect? I see - good arguments, keep the original operations then. > > A small thing, but I'd prefer if the mark value were printed/saved in hex > > instead of decimal, similarly to iptables. Better introduce a new print > > function for it. > > Sure, will implement this on Friday Best regards, Jozsef - E-mail : kadlec@blackhole.kfki.hu, kadlecsik.jozsef@wigner.mta.hu PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences H-1525 Budapest 114, POB. 49, Hungary ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/1] add markmask for hash:ip,mark data type 2014-01-09 21:02 ` Jozsef Kadlecsik @ 2014-01-17 18:45 ` Vytas Dauksa 2014-01-23 19:28 ` Jozsef Kadlecsik 0 siblings, 1 reply; 8+ messages in thread From: Vytas Dauksa @ 2014-01-17 18:45 UTC (permalink / raw) To: Jozsef Kadlecsik; +Cc: netfilter-devel [-- Attachment #1: Type: text/plain, Size: 2471 bytes --] as promised attaching third patch, which prints mark and markmask in hexadecimal. On 9 January 2014 21:02, Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> wrote: > On Thu, 9 Jan 2014, Vytas Dauksa wrote: > >> > Why it's important that the kernel should mask the mark value, when the >> > user could add the intended value directly? The only case where it's >> > required when entries added/deleted by the SET target. It's more natural >> > for me if the markmask value has a meaning and effect for kernel side >> > add/del operations only, and ignored for user add/del/test and kernel >> > tests. What's your opinion? >> >> The kernel must apply the mask at test time - that's the whole reason >> for it. In our use case the desired mask is 0xff000000, because those >> bits identify the protocol, and the other bits are for an unrelated purpose. >> Because the other bits could be set to anything, without a mask there >> might have to be 2^24 entries for the other possible values. >> >> If the kernel applies a mask on test, but values added by the user aren't >> masked, those entries would never match. It seems clearer to mask them >> at add time, so that the user gets sensible errors; for instance, adding two >> different values which mask to the same thing will give the same error as >> adding the same value twice. >> >> Another option we discounted was that each entry could have its own >> mask. This didn't make sense because they're not strictly ordered like >> netmasks, so multiple entries could be equally applicable, and no hashing >> is possible. If 12000000/ff000000 and 00340000/00ff0000 are in the set, >> but one is nomatch, and a packet has mark 12345678, which entry should >> take effect? > > I see - good arguments, keep the original operations then. > >> > A small thing, but I'd prefer if the mark value were printed/saved in hex >> > instead of decimal, similarly to iptables. Better introduce a new print >> > function for it. >> >> Sure, will implement this on Friday > > Best regards, > Jozsef > - > E-mail : kadlec@blackhole.kfki.hu, kadlecsik.jozsef@wigner.mta.hu > PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt > Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences > H-1525 Budapest 114, POB. 49, Hungary -- Vytas Dauksa Junior Developer vytas.dauksa@smoothwall.net Smoothwall Ltd Phone: +44 (0) 8701 999500 www.smoothwall.net [-- Attachment #2: ipset_print_mark_in_hex.patch --] [-- Type: text/x-patch, Size: 24313 bytes --] From 2d448ff0ae8b2487c496a54808cdc1d811d57e40 Mon Sep 17 00:00:00 2001 From: Vytas Dauksa <vytas.dauksa@smoothwall.net> Date: Fri, 17 Jan 2014 18:39:16 +0000 Subject: [PATCH] print mark & mark mask in hex rather then decimal modified ipset_print_mark to print in hex rather then decimal and altered accordingly test cases. --- lib/ipset_hash_ipmark.c | 2 +- lib/print.c | 6 +- tests/hash:ip,mark.t | 70 ++++++++-------- tests/hash:ip,mark.t.list0 | 10 +-- tests/hash:ip,mark.t.list1 | 2 +- tests/hash:ip6,mark.t | 188 +++++++++++++++++++++---------------------- tests/hash:ip6,mark.t.list0 | 10 +-- tests/hash:ip6,mark.t.list1 | 2 +- tests/ipmarkhash.t | 46 +++++------ tests/ipmarkhash.t.list0 | 10 +-- tests/ipmarkhash.t.list1 | 10 +-- 11 files changed, 178 insertions(+), 178 deletions(-) diff --git a/lib/ipset_hash_ipmark.c b/lib/ipset_hash_ipmark.c index fdea32f..922e6c0 100644 --- a/lib/ipset_hash_ipmark.c +++ b/lib/ipset_hash_ipmark.c @@ -28,7 +28,7 @@ static const struct ipset_arg hash_ipmark_create_args0[] = { }, { .name = { "markmask", NULL }, .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_MARKMASK, - .parse = ipset_parse_uint32, .print = ipset_print_number, + .parse = ipset_parse_uint32, .print = ipset_print_mark, }, { .name = { "hashsize", NULL }, .has_arg = IPSET_MANDATORY_ARG, .opt = IPSET_OPT_HASHSIZE, diff --git a/lib/print.c b/lib/print.c index 8e2924e..72533ac 100644 --- a/lib/print.c +++ b/lib/print.c @@ -514,12 +514,12 @@ ipset_print_mark(char *buf, unsigned int len, assert(buf); assert(len > 0); assert(data); - assert(opt == IPSET_OPT_MARK); + assert(opt == IPSET_OPT_MARK || opt == IPSET_OPT_MARKMASK); - mark = ipset_data_get(data, IPSET_OPT_MARK); + mark = ipset_data_get(data, opt); assert(mark); - size = snprintf(buf, len, "%u", *mark); + size = snprintf(buf, len, "%08llx", *mark); SNPRINTF_FAILURE(size, len, offset); return offset; diff --git a/tests/hash:ip,mark.t b/tests/hash:ip,mark.t index ad76274..f6bd6ee 100644 --- a/tests/hash:ip,mark.t +++ b/tests/hash:ip,mark.t @@ -1,31 +1,31 @@ # Create a set with timeout 0 ipset create test hash:ip,mark timeout 5 # Add partly zero valued element -0 ipset add test 2.0.0.1,0 +0 ipset add test 2.0.0.1,0x0 # Test partly zero valued element -0 ipset test test 2.0.0.1,0 +0 ipset test test 2.0.0.1,0x0 # Delete partly zero valued element -0 ipset del test 2.0.0.1,0 +0 ipset del test 2.0.0.1,0x0 # Add first random value -0 ipset add test 2.0.0.1,5 +0 ipset add test 2.0.0.1,0x5 # Add second random value -0 ipset add test 2.1.0.0,128 +0 ipset add test 2.1.0.0,0x80 # Test first random value -0 ipset test test 2.0.0.1,5 +0 ipset test test 2.0.0.1,0x5 # Test second random value -0 ipset test test 2.1.0.0,128 +0 ipset test test 2.1.0.0,0x80 # Test value not added to the set -1 ipset test test 2.0.0.1,4 +1 ipset test test 2.0.0.1,0x4 # Delete value not added to the set -1 ipset del test 2.0.0.1,6 +1 ipset del test 2.0.0.1,0x6 # Test value before first random value -1 ipset test test 2.0.0.0,5 +1 ipset test test 2.0.0.0,0x5 # Test value after second random value -1 ipset test test 2.1.0.1,128 +1 ipset test test 2.1.0.1,0x80 # Try to add value before first random value -0 ipset add test 2.0.0.0,5 +0 ipset add test 2.0.0.0,0x5 # Try to add value after second random value -0 ipset add test 2.1.0.1,128 +0 ipset add test 2.1.0.1,0x80 # List set 0 ipset list test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 # Check listing @@ -39,9 +39,9 @@ # Flush test set 0 ipset flush test # Add multiple elements in one step -0 ipset add test 1.1.1.1-1.1.1.18,80 +0 ipset add test 1.1.1.1-1.1.1.18,0x50 # Delete multiple elements in one step -0 ipset del test 1.1.1.2-1.1.1.3,80 +0 ipset del test 1.1.1.2-1.1.1.3,0x50 # Check number of elements after multi-add/multi-del 0 n=`ipset save test|wc -l` && test $n -eq 17 # Delete test set @@ -49,21 +49,21 @@ # Create set to add a range 0 ipset new test hash:ip,mark hashsize 64 # Add a range which forces a resizing -0 ipset add test 10.0.0.0-10.0.3.255,80 +0 ipset add test 10.0.0.0-10.0.3.255,0x50 # Check that correct number of elements are added 0 n=`ipset list test|grep '^10.0'|wc -l` && test $n -eq 1024 # Flush set 0 ipset flush test # Add an single element -0 ipset add test 10.0.0.1,80 +0 ipset add test 10.0.0.1,0x50 # Check number of elements 0 n=`ipset save test|wc -l` && test $n -eq 2 # Delete the single element -0 ipset del test 10.0.0.1,80 +0 ipset del test 10.0.0.1,0x50 # Check number of elements 0 n=`ipset save test|wc -l` && test $n -eq 1 # Add an IP range -0 ipset add test 10.0.0.1-10.0.0.10,80 +0 ipset add test 10.0.0.1-10.0.0.10,0x50 # Check number of elements 0 n=`ipset save test|wc -l` && test $n -eq 11 # Delete the IP range @@ -77,21 +77,21 @@ # Counters: create set 0 ipset n test hash:ip,mark counters # Counters: add element with packet, byte counters -0 ipset a test 2.0.0.1,80 packets 5 bytes 3456 +0 ipset a test 2.0.0.1,0x50 packets 5 bytes 3456 # Counters: check element -0 ipset t test 2.0.0.1,80 +0 ipset t test 2.0.0.1,0x50 # Counters: check counters 0 ./check_counters test 2.0.0.1 5 3456 # Counters: delete element -0 ipset d test 2.0.0.1,80 +0 ipset d test 2.0.0.1,0x50 # Counters: test deleted element -1 ipset t test 2.0.0.1,80 +1 ipset t test 2.0.0.1,0x50 # Counters: add element with packet, byte counters -0 ipset a test 2.0.0.20,453 packets 12 bytes 9876 +0 ipset a test 2.0.0.20,0x1c5 packets 12 bytes 9876 # Counters: check counters 0 ./check_counters test 2.0.0.20 12 9876 # Counters: update counters -0 ipset -! a test 2.0.0.20,453 packets 13 bytes 12479 +0 ipset -! a test 2.0.0.20,0x1c5 packets 13 bytes 12479 # Counters: check counters 0 ./check_counters test 2.0.0.20 13 12479 # Counters: destroy set @@ -99,34 +99,34 @@ # Counters and timeout: create set 0 ipset n test hash:ip,mark counters timeout 600 # Counters and timeout: add element with packet, byte counters -0 ipset a test 2.0.0.1,80 packets 5 bytes 3456 +0 ipset a test 2.0.0.1,0x50 packets 5 bytes 3456 # Counters and timeout: check element -0 ipset t test 2.0.0.1,80 +0 ipset t test 2.0.0.1,0x50 # Counters and timeout: check counters 0 ./check_extensions test 2.0.0.1 600 5 3456 # Counters and timeout: delete element -0 ipset d test 2.0.0.1,80 +0 ipset d test 2.0.0.1,0x50 # Counters and timeout: test deleted element -1 ipset t test 2.0.0.1,80 +1 ipset t test 2.0.0.1,0x50 # Counters and timeout: add element with packet, byte counters -0 ipset a test 2.0.0.20,453 packets 12 bytes 9876 +0 ipset a test 2.0.0.20,0x1c5 packets 12 bytes 9876 # Counters and timeout: check counters 0 ./check_extensions test 2.0.0.20 600 12 9876 # Counters and timeout: update counters -0 ipset -! a test 2.0.0.20,453 packets 13 bytes 12479 +0 ipset -! a test 2.0.0.20,0x1c5 packets 13 bytes 12479 # Counters and timeout: check counters 0 ./check_extensions test 2.0.0.20 600 13 12479 # Counters and timeout: update timeout -0 ipset -! a test 2.0.0.20,453 timeout 700 +0 ipset -! a test 2.0.0.20,0x1c5 timeout 700 # Counters and timeout: check counters 0 ./check_extensions test 2.0.0.20 700 13 12479 # Counters and timeout: destroy set 0 ipset x test -# Create a set with 65502 ( 0x0000FFDE ) markmask +# Create a set with 0x0000FFDE markmask 0 ipset create test hash:ip,mark markmask 0x0000FFDE -# Add first value with 86111010 ( 0x0521F322 ) mark +# Add first value with 0x0521F322 mark 0 ipset add test 19.16.1.254,0x0521F322 -# Test last entry mark was modified to 62210 ( 0x0000F302 ) +# Test last entry mark was modified to 0x0000F302 0 ipset test test 19.16.1.254,0x0000F302 # Test that mask is applied for tests as well 0 ipset test test 19.16.1.254,0x0521F322 diff --git a/tests/hash:ip,mark.t.list0 b/tests/hash:ip,mark.t.list0 index d83b206..3c62c65 100644 --- a/tests/hash:ip,mark.t.list0 +++ b/tests/hash:ip,mark.t.list0 @@ -1,10 +1,10 @@ Name: test Type: hash:ip,mark -Header: family inet markmask 4294967295 hashsize 1024 maxelem 65536 timeout x +Header: family inet markmask ffffffff hashsize 1024 maxelem 65536 timeout x Size in memory: 8836 References: 0 Members: -2.0.0.0,5 timeout x -2.0.0.1,5 timeout x -2.1.0.0,128 timeout x -2.1.0.1,128 timeout x +2.0.0.0,00000005 timeout x +2.0.0.1,00000005 timeout x +2.1.0.0,00000080 timeout x +2.1.0.1,00000080 timeout x diff --git a/tests/hash:ip,mark.t.list1 b/tests/hash:ip,mark.t.list1 index 400f999..03c1c47 100644 --- a/tests/hash:ip,mark.t.list1 +++ b/tests/hash:ip,mark.t.list1 @@ -1,6 +1,6 @@ Name: test Type: hash:ip,mark -Header: family inet markmask 4294967295 hashsize 1024 maxelem 65536 timeout 5 +Header: family inet markmask ffffffff hashsize 1024 maxelem 65536 timeout 5 Size in memory: 8836 References: 0 Members: diff --git a/tests/hash:ip6,mark.t b/tests/hash:ip6,mark.t index 5c243fa..d4f9200 100644 --- a/tests/hash:ip6,mark.t +++ b/tests/hash:ip6,mark.t @@ -1,31 +1,31 @@ # Create a set with timeout 0 ipset create test hash:ip,mark family inet6 timeout 5 # Add partly zero valued element -0 ipset add test 2:0:0::1,0 +0 ipset add test 2:0:0::1,0x0 # Test partly zero valued element -0 ipset test test 2:0:0::1,0 +0 ipset test test 2:0:0::1,0x0 # Delete partly zero valued element -0 ipset del test 2:0:0::1,0 +0 ipset del test 2:0:0::1,0x0 # Add first random value -0 ipset add test 2:0:0::1,5 +0 ipset add test 2:0:0::1,0x5 # Add second random value -0 ipset add test 2:1:0::0,128 +0 ipset add test 2:1:0::0,0x80 # Test first random value -0 ipset test test 2:0:0::1,5 +0 ipset test test 2:0:0::1,0x5 # Test second random value -0 ipset test test 2:1:0::0,128 +0 ipset test test 2:1:0::0,0x80 # Test value not added to the set -1 ipset test test 2:0:0::1,4 +1 ipset test test 2:0:0::1,0x4 # Delete value not added to the set -1 ipset del test 2:0:0::1,6 +1 ipset del test 2:0:0::1,0x6 # Test value before first random value -1 ipset test test 2:0:0::0,5 +1 ipset test test 2:0:0::0,0x5 # Test value after second random value -1 ipset test test 2:1:0::1,128 +1 ipset test test 2:1:0::1,0x80 # Try to add value before first random value -0 ipset add test 2:0:0::0,5 +0 ipset add test 2:0:0::0,0x5 # Try to add value after second random value -0 ipset add test 2:1:0::1,128 +0 ipset add test 2:1:0::1,0x80 # List set 0 ipset list test | grep -v Revision: | sed 's/timeout ./timeout x/' > .foo0 && ./sort.sh .foo0 # Check listing @@ -41,135 +41,135 @@ # Create set to add a range 0 ipset new test hash:ip,mark -6 hashsize 64 # Add a random value 1 -0 ipset add test 1::1,800000 +0 ipset add test 1::1,0xc3500 # Add a random value 2 -0 ipset add test 1::1,8900000 +0 ipset add test 1::1,0x87cda0 # Add a random value 3 -0 ipset add test 1::3,8900000 +0 ipset add test 1::3,0x87cda0 # Add a random value 4 -0 ipset add test 1::4,8900000 +0 ipset add test 1::4,0x87cda0 # Add a random value 5 -0 ipset add test 1::5,8900000 +0 ipset add test 1::5,0x87cda0 # Add a random value 6 -0 ipset add test 1::6,8900000 +0 ipset add test 1::6,0x87cda0 # Add a random value 7 -0 ipset add test 1::7,8900000 +0 ipset add test 1::7,0x87cda0 # Add a random value 8 -0 ipset add test 1::8,8900000 +0 ipset add test 1::8,0x87cda0 # Add a random value 9 -0 ipset add test 1::9,8900000 +0 ipset add test 1::9,0x87cda0 # Add a random value 10 -0 ipset add test 1::101,8900000 +0 ipset add test 1::101,0x87cda0 # Add a random value 11 -0 ipset add test 1::11,8900000 +0 ipset add test 1::11,0x87cda0 # Add a random value 12 -0 ipset add test 1::12,8900000 +0 ipset add test 1::12,0x87cda0 # Add a random value 13 -0 ipset add test 1::13,8900000 +0 ipset add test 1::13,0x87cda0 # Add a random value 14 -0 ipset add test 1::14,8900000 +0 ipset add test 1::14,0x87cda0 # Add a random value 15 -0 ipset add test 1::15,8900000 +0 ipset add test 1::15,0x87cda0 # Add a random value 16 -0 ipset add test 1::16,8900000 +0 ipset add test 1::16,0x87cda0 # Add a random value 17 -0 ipset add test 1::17,8900000 +0 ipset add test 1::17,0x87cda0 # Add a random value 18 -0 ipset add test 1::18,8900000 +0 ipset add test 1::18,0x87cda0 # Add a random value 19 -0 ipset add test 1::19,8900000 +0 ipset add test 1::19,0x87cda0 # Add a random value 20 -0 ipset add test 1::20,8900000 +0 ipset add test 1::20,0x87cda0 # Add a random value 21 -0 ipset add test 1::21,8900000 +0 ipset add test 1::21,0x87cda0 # Add a random value 22 -0 ipset add test 1::22,8900000 +0 ipset add test 1::22,0x87cda0 # Add a random value 23 -0 ipset add test 1::23,8900000 +0 ipset add test 1::23,0x87cda0 # Add a random value 24 -0 ipset add test 1::24,8900000 +0 ipset add test 1::24,0x87cda0 # Add a random value 25 -0 ipset add test 1::25,8900000 +0 ipset add test 1::25,0x87cda0 # Add a random value 26 -0 ipset add test 1::26,8900000 +0 ipset add test 1::26,0x87cda0 # Add a random value 27 -0 ipset add test 1::27,8900000 +0 ipset add test 1::27,0x87cda0 # Add a random value 28 -0 ipset add test 1::28,8900000 +0 ipset add test 1::28,0x87cda0 # Add a random value 29 -0 ipset add test 1::29,8900000 +0 ipset add test 1::29,0x87cda0 # Add a random value 30 -0 ipset add test 1::301,8900000 +0 ipset add test 1::301,0x87cda0 # Add a random value 31 -0 ipset add test 1::31,8900000 +0 ipset add test 1::31,0x87cda0 # Add a random value 32 -0 ipset add test 1::32,8900000 +0 ipset add test 1::32,0x87cda0 # Add a random value 33 -0 ipset add test 1::33,8900000 +0 ipset add test 1::33,0x87cda0 # Add a random value 34 -0 ipset add test 1::34,8900000 +0 ipset add test 1::34,0x87cda0 # Add a random value 35 -0 ipset add test 1::35,8900000 +0 ipset add test 1::35,0x87cda0 # Add a random value 36 -0 ipset add test 1::36,8900000 +0 ipset add test 1::36,0x87cda0 # Add a random value 37 -0 ipset add test 1::37,8900000 +0 ipset add test 1::37,0x87cda0 # Add a random value 38 -0 ipset add test 1::38,8900000 +0 ipset add test 1::38,0x87cda0 # Add a random value 39 -0 ipset add test 1::39,8900000 +0 ipset add test 1::39,0x87cda0 # Add a random value 40 -0 ipset add test 1::401,8900000 +0 ipset add test 1::401,0x87cda0 # Add a random value 41 -0 ipset add test 1::41,8900000 +0 ipset add test 1::41,0x87cda0 # Add a random value 42 -0 ipset add test 1::42,8900000 +0 ipset add test 1::42,0x87cda0 # Add a random value 43 -0 ipset add test 1::43,8900000 +0 ipset add test 1::43,0x87cda0 # Add a random value 44 -0 ipset add test 1::44,8900000 +0 ipset add test 1::44,0x87cda0 # Add a random value 45 -0 ipset add test 1::45,8900000 +0 ipset add test 1::45,0x87cda0 # Add a random value 46 -0 ipset add test 1::46,8900000 +0 ipset add test 1::46,0x87cda0 # Add a random value 47 -0 ipset add test 1::47,8900000 +0 ipset add test 1::47,0x87cda0 # Add a random value 48 -0 ipset add test 1::48,8900000 +0 ipset add test 1::48,0x87cda0 # Add a random value 49 -0 ipset add test 1::49,8900000 +0 ipset add test 1::49,0x87cda0 # Add a random value 50 -0 ipset add test 1::501,8900000 +0 ipset add test 1::501,0x87cda0 # Add a random value 51 -0 ipset add test 1::51,8900000 +0 ipset add test 1::51,0x87cda0 # Add a random value 52 -0 ipset add test 1::52,8900000 +0 ipset add test 1::52,0x87cda0 # Add a random value 53 -0 ipset add test 1::53,8900000 +0 ipset add test 1::53,0x87cda0 # Add a random value 54 -0 ipset add test 1::54,8900000 +0 ipset add test 1::54,0x87cda0 # Add a random value 55 -0 ipset add test 1::55,8900000 +0 ipset add test 1::55,0x87cda0 # Add a random value 56 -0 ipset add test 1::56,8900000 +0 ipset add test 1::56,0x87cda0 # Add a random value 57 -0 ipset add test 1::57,8900000 +0 ipset add test 1::57,0x87cda0 # Add a random value 58 -0 ipset add test 1::58,8900000 +0 ipset add test 1::58,0x87cda0 # Add a random value 59 -0 ipset add test 1::59,8900000 +0 ipset add test 1::59,0x87cda0 # Add a random value 60 -0 ipset add test 1::601,8900000 +0 ipset add test 1::601,0x87cda0 # Add a random value 61 -0 ipset add test 1::61,8900000 +0 ipset add test 1::61,0x87cda0 # Add a random value 62 -0 ipset add test 1::62,8900000 +0 ipset add test 1::62,0x87cda0 # Add a random value 63 -0 ipset add test 1::63,8900000 +0 ipset add test 1::63,0x87cda0 # Add a random value 64 -0 ipset add test 1::64,8900000 +0 ipset add test 1::64,0x87cda0 # Add a random value 65, that forces a resizing -0 ipset add test 1::65,8900000 +0 ipset add test 1::65,0x87cda0 # Check that correct number of elements are added 0 n=`ipset list test|grep 1::|wc -l` && test $n -eq 65 # Destroy set @@ -179,21 +179,21 @@ # Counters: create set 0 ipset n test hash:ip,mark -6 counters # Counters: add element with packet, byte counters -0 ipset a test 2:0:0::1,80 packets 5 bytes 3456 +0 ipset a test 2:0:0::1,0x50 packets 5 bytes 3456 # Counters: check element -0 ipset t test 2:0:0::1,80 +0 ipset t test 2:0:0::1,0x50 # Counters: check counters 0 ./check_counters test 2::1 5 3456 # Counters: delete element -0 ipset d test 2:0:0::1,80 +0 ipset d test 2:0:0::1,0x50 # Counters: test deleted element -1 ipset t test 2:0:0::1,80 +1 ipset t test 2:0:0::1,0x50 # Counters: add element with packet, byte counters -0 ipset a test 2:0:0::20,453 packets 12 bytes 9876 +0 ipset a test 2:0:0::20,0x1c5 packets 12 bytes 9876 # Counters: check counters 0 ./check_counters test 2::20 12 9876 # Counters: update counters -0 ipset -! a test 2:0:0::20,453 packets 13 bytes 12479 +0 ipset -! a test 2:0:0::20,0x1c5 packets 13 bytes 12479 # Counters: check counters 0 ./check_counters test 2::20 13 12479 # Counters: destroy set @@ -201,34 +201,34 @@ # Counters and timeout: create set 0 ipset n test hash:ip,mark -6 counters timeout 600 # Counters and timeout: add element with packet, byte counters -0 ipset a test 2:0:0::1,80 packets 5 bytes 3456 +0 ipset a test 2:0:0::1,0x50 packets 5 bytes 3456 # Counters and timeout: check element -0 ipset t test 2:0:0::1,80 +0 ipset t test 2:0:0::1,0x50 # Counters and timeout: check counters 0 ./check_extensions test 2::1 600 5 3456 # Counters and timeout: delete element -0 ipset d test 2:0:0::1,80 +0 ipset d test 2:0:0::1,0x50 # Counters and timeout: test deleted element -1 ipset t test 2:0:0::1,80 +1 ipset t test 2:0:0::1,0x50 # Counters and timeout: add element with packet, byte counters -0 ipset a test 2:0:0::20,453 packets 12 bytes 9876 +0 ipset a test 2:0:0::20,0x1c5 packets 12 bytes 9876 # Counters and timeout: check counters 0 ./check_extensions test 2::20 600 12 9876 # Counters and timeout: update counters -0 ipset -! a test 2:0:0::20,453 packets 13 bytes 12479 +0 ipset -! a test 2:0:0::20,0x1c5 packets 13 bytes 12479 # Counters and timeout: check counters 0 ./check_extensions test 2::20 600 13 12479 # Counters and timeout: update timeout -0 ipset -! a test 2:0:0::20,453 timeout 700 +0 ipset -! a test 2:0:0::20,0x1c5 timeout 700 # Counters and timeout: check counters 0 ./check_extensions test 2::20 700 13 12479 # Counters and timeout: destroy set 0 ipset x test -# Create a set with 65502 ( 0x0000FFDE ) markmask +# Create a set with 0x0000FFDE markmask 0 ipset create test hash:ip,mark family inet6 markmask 0x0000FFDE -# Add first value with 86111010 ( 0x0521F322 ) mark +# Add first value with 0x0521F322 mark 0 ipset add test 2:1::1,0x0521F322 -# Test last entry mark was modified to 62210 ( 0x0000F302 ) +# Test last entry mark was modified to 0x0000F302 0 ipset test test 2:1::1,0x0000F302 # Test that mask is applied for tests as well 0 ipset test test 2:1::1,0x0521F322 diff --git a/tests/hash:ip6,mark.t.list0 b/tests/hash:ip6,mark.t.list0 index 0cd930b..75b654a 100644 --- a/tests/hash:ip6,mark.t.list0 +++ b/tests/hash:ip6,mark.t.list0 @@ -1,10 +1,10 @@ Name: test Type: hash:ip,mark -Header: family inet6 markmask 4294967295 hashsize 1024 maxelem 65536 timeout x +Header: family inet6 markmask ffffffff hashsize 1024 maxelem 65536 timeout x Size in memory: 9316 References: 0 Members: -2:1::,128 timeout x -2:1::1,128 timeout x -2::,5 timeout x -2::1,5 timeout x +2:1::,00000080 timeout x +2:1::1,00000080 timeout x +2::,00000005 timeout x +2::1,00000005 timeout x diff --git a/tests/hash:ip6,mark.t.list1 b/tests/hash:ip6,mark.t.list1 index 44bc1da..52221f5 100644 --- a/tests/hash:ip6,mark.t.list1 +++ b/tests/hash:ip6,mark.t.list1 @@ -1,6 +1,6 @@ Name: test Type: hash:ip,mark -Header: family inet6 markmask 4294967295 hashsize 1024 maxelem 65536 timeout 5 +Header: family inet6 markmask ffffffff hashsize 1024 maxelem 65536 timeout 5 Size in memory: 9316 References: 0 Members: diff --git a/tests/ipmarkhash.t b/tests/ipmarkhash.t index 30301fb..e96bbfa 100644 --- a/tests/ipmarkhash.t +++ b/tests/ipmarkhash.t @@ -5,31 +5,31 @@ # Create a set 0 ipset -N test ipmarkhash # Add partly zero valued element -0 ipset -A test 2.0.0.1,0 +0 ipset -A test 2.0.0.1,0x0 # Test partly zero valued element -0 ipset -T test 2.0.0.1,0 +0 ipset -T test 2.0.0.1,0x0 # Delete partly zero valued element -0 ipset -D test 2.0.0.1,0 +0 ipset -D test 2.0.0.1,0x0 # Add first random value -0 ipset -A test 2.0.0.1,5 +0 ipset -A test 2.0.0.1,0x5 # Add second random value -0 ipset -A test 2.1.0.0,128 +0 ipset -A test 2.1.0.0,0x80 # Test first random value -0 ipset -T test 2.0.0.1,5 +0 ipset -T test 2.0.0.1,0x5 # Test second random value -0 ipset -T test 2.1.0.0,128 +0 ipset -T test 2.1.0.0,0x80 # Test value not added to the set -1 ipset -T test 2.0.0.1,4 +1 ipset -T test 2.0.0.1,0x4 # Delete value not added to the set -1 ipset -D test 2.0.0.1,6 +1 ipset -D test 2.0.0.1,0x6 # Test value before first random value -1 ipset -T test 2.0.0.0,5 +1 ipset -T test 2.0.0.0,0x5 # Test value after second random value -1 ipset -T test 2.1.0.1,128 +1 ipset -T test 2.1.0.1,0x80 # Try to add value before first random value -0 ipset -A test 2.0.0.0,5 +0 ipset -A test 2.0.0.0,0x5 # Try to add value after second random value -0 ipset -A test 2.1.0.1,128 +0 ipset -A test 2.1.0.1,0x80 # List set 0 ipset -L test | grep -v Revision: > .foo0 && ./sort.sh .foo0 # Check listing @@ -41,25 +41,25 @@ # Create a set from a network (network ignored) 0 ipset -N test ipmarkhash --network 2.0.0.0/16 # Add first random value -0 ipset -A test 2.0.0.0,5 +0 ipset -A test 2.0.0.0,0x5 # Add second random value -0 ipset -A test 2.0.255.255,128 +0 ipset -A test 2.0.255.255,0x80 # Test first random value -0 ipset -T test 2.0.0.0,5 +0 ipset -T test 2.0.0.0,0x5 # Test second random value -0 ipset -T test 2.0.255.255,128 +0 ipset -T test 2.0.255.255,0x80 # Test value not added to the set -1 ipset -T test 2.0.0.0,4 +1 ipset -T test 2.0.0.0,0x4 # Delete value not added to the set -1 ipset -D test 2.0.0.0,6 +1 ipset -D test 2.0.0.0,0x6 # Test value before first random value -1 ipset -T test 1.255.255.255,5 +1 ipset -T test 1.255.255.255,0x5 # Test value after second random value -1 ipset -T test 2.1.0.0,128 +1 ipset -T test 2.1.0.0,0x80 # Try to add value before first random value -0 ipset -A test 1.255.255.255,5 +0 ipset -A test 1.255.255.255,0x5 # Try to add value after second random value -0 ipset -A test 2.1.0.0,128 +0 ipset -A test 2.1.0.0,0x80 # List set 0 ipset -L test | grep -v Revision: > .foo0 && ./sort.sh .foo0 # Check listing diff --git a/tests/ipmarkhash.t.list0 b/tests/ipmarkhash.t.list0 index 4ada53a..6370ce4 100644 --- a/tests/ipmarkhash.t.list0 +++ b/tests/ipmarkhash.t.list0 @@ -1,10 +1,10 @@ Name: test Type: hash:ip,mark -Header: family inet markmask 4294967295 hashsize 1024 maxelem 65536 +Header: family inet markmask ffffffff hashsize 1024 maxelem 65536 Size in memory: 8516 References: 0 Members: -2.0.0.0,5 -2.0.0.1,5 -2.1.0.0,128 -2.1.0.1,128 +2.0.0.0,00000005 +2.0.0.1,00000005 +2.1.0.0,00000080 +2.1.0.1,00000080 diff --git a/tests/ipmarkhash.t.list1 b/tests/ipmarkhash.t.list1 index 74d2869..01f7b6e 100644 --- a/tests/ipmarkhash.t.list1 +++ b/tests/ipmarkhash.t.list1 @@ -1,10 +1,10 @@ Name: test Type: hash:ip,mark -Header: family inet markmask 4294967295 hashsize 1024 maxelem 65536 +Header: family inet markmask ffffffff hashsize 1024 maxelem 65536 Size in memory: 8468 References: 0 Members: -1.255.255.255,5 -2.0.0.0,5 -2.0.255.255,128 -2.1.0.0,128 +1.255.255.255,00000005 +2.0.0.0,00000005 +2.0.255.255,00000080 +2.1.0.0,00000080 -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/1] add markmask for hash:ip,mark data type 2014-01-17 18:45 ` Vytas Dauksa @ 2014-01-23 19:28 ` Jozsef Kadlecsik 0 siblings, 0 replies; 8+ messages in thread From: Jozsef Kadlecsik @ 2014-01-23 19:28 UTC (permalink / raw) To: Vytas Dauksa; +Cc: netfilter-devel [-- Attachment #1: Type: TEXT/PLAIN, Size: 3026 bytes --] On Fri, 17 Jan 2014, Vytas Dauksa wrote: > as promised attaching third patch, which prints mark and markmask in > hexadecimal. Patch is applied with a small modification: the prefix "0x" was missing at printing/saving mark/mask values. Best regards, Jozsef > On 9 January 2014 21:02, Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> wrote: > > On Thu, 9 Jan 2014, Vytas Dauksa wrote: > > > >> > Why it's important that the kernel should mask the mark value, when the > >> > user could add the intended value directly? The only case where it's > >> > required when entries added/deleted by the SET target. It's more natural > >> > for me if the markmask value has a meaning and effect for kernel side > >> > add/del operations only, and ignored for user add/del/test and kernel > >> > tests. What's your opinion? > >> > >> The kernel must apply the mask at test time - that's the whole reason > >> for it. In our use case the desired mask is 0xff000000, because those > >> bits identify the protocol, and the other bits are for an unrelated purpose. > >> Because the other bits could be set to anything, without a mask there > >> might have to be 2^24 entries for the other possible values. > >> > >> If the kernel applies a mask on test, but values added by the user aren't > >> masked, those entries would never match. It seems clearer to mask them > >> at add time, so that the user gets sensible errors; for instance, adding two > >> different values which mask to the same thing will give the same error as > >> adding the same value twice. > >> > >> Another option we discounted was that each entry could have its own > >> mask. This didn't make sense because they're not strictly ordered like > >> netmasks, so multiple entries could be equally applicable, and no hashing > >> is possible. If 12000000/ff000000 and 00340000/00ff0000 are in the set, > >> but one is nomatch, and a packet has mark 12345678, which entry should > >> take effect? > > > > I see - good arguments, keep the original operations then. > > > >> > A small thing, but I'd prefer if the mark value were printed/saved in hex > >> > instead of decimal, similarly to iptables. Better introduce a new print > >> > function for it. > >> > >> Sure, will implement this on Friday > > > > Best regards, > > Jozsef > > - > > E-mail : kadlec@blackhole.kfki.hu, kadlecsik.jozsef@wigner.mta.hu > > PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt > > Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences > > H-1525 Budapest 114, POB. 49, Hungary > > > > -- > Vytas Dauksa > Junior Developer > vytas.dauksa@smoothwall.net > > Smoothwall Ltd > Phone: +44 (0) 8701 999500 > www.smoothwall.net > - E-mail : kadlec@blackhole.kfki.hu, kadlecsik.jozsef@wigner.mta.hu PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences H-1525 Budapest 114, POB. 49, Hungary ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 0/1] add hash:ip,mark data type to ipset 2013-12-17 14:01 ` [PATCH 0/1] add hash:ip,mark data type to ipset Vytas Dauksa 2013-12-17 14:01 ` [PATCH 1/1] add markmask for hash:ip,mark data type Vytas Dauksa @ 2014-01-08 21:13 ` Jozsef Kadlecsik 1 sibling, 0 replies; 8+ messages in thread From: Jozsef Kadlecsik @ 2014-01-08 21:13 UTC (permalink / raw) To: Vytas Dauksa; +Cc: netfilter-devel On Tue, 17 Dec 2013, Vytas Dauksa wrote: > Introduce packet mark support with new ip,mark hash set. This includes > userspace and kernelspace code, hash:ip,mark set tests and man page > updates. > > The intended use of ip,mark set is similar to the ip:port type, but for > protocols which don't use a predictable port number. Instead of port > number it matches a firewall mark determined by a layer 7 filtering > program like opendpi. > > As well as allowing or blocking traffic it will also be used for > accounting packets and bytes sent for each protocol. [...] Patch is applied, thanks your work. Best regards, Jozsef - E-mail : kadlec@blackhole.kfki.hu, kadlecsik.jozsef@wigner.mta.hu PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences H-1525 Budapest 114, POB. 49, Hungary ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2014-01-23 19:28 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <alpine.DEB.2.10.1312032006500.32285 () blackhole ! kfki ! hu>
2013-12-17 14:01 ` [PATCH 0/1] add hash:ip,mark data type to ipset Vytas Dauksa
2013-12-17 14:01 ` [PATCH 1/1] add markmask for hash:ip,mark data type Vytas Dauksa
2014-01-08 21:22 ` Jozsef Kadlecsik
2014-01-09 11:09 ` Vytas Dauksa
2014-01-09 21:02 ` Jozsef Kadlecsik
2014-01-17 18:45 ` Vytas Dauksa
2014-01-23 19:28 ` Jozsef Kadlecsik
2014-01-08 21:13 ` [PATCH 0/1] add hash:ip,mark data type to ipset Jozsef Kadlecsik
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).